diff --git a/.gitignore b/.gitignore
index b1e4ec06c7..500d63a6c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ spring-*/src/main/java/META-INF/MANIFEST.MF
 *.iml
 *.ipr
 *.iws
+.idea
 out
 test-output
 atlassian-ide-plugin.xml
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..c0ca085f71
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,14 @@
+Juergen Hoeller <jhoeller@vmware.com> jhoeller <jhoeller@vmware.com>
+<rstoyanchev@gopivotal.com> <rstoyanchev@vmware.com>
+<pwebb@gopivotal.com> <pwebb@vmware.com>
+<cbeams@gopivotal.com> <cbeams@vmware.com>
+<cbeams@gopivotal.com> <cbeams@gmail.com>
+<apoutsma@gopivotal.com> <apoutsma@vmware.com>
+<apoutsma@gopivotal.com> <poutsma@mac.com>
+<ogierke@gopivotal.com> <ogierke@vmware.com>
+<dsyer@gopivotal.com> <david_syer@hotmail.com>
+<dsyer@gopivotal.com> <dsyer@vmware.com>
+<aclement@gopivotal.com> <andrew.clement@gmail.com>
+<aclement@gopivotal.com> <aclement@vmware.com>
+<dmitry.katsubo@gmail.com> <dmitry.katsubo@gmai.com>
+Nick Williams <nicholas@nicholaswilliams.net> Nicholas Williams <nicholas@nicholaswilliams.net> 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 02d0bc12e2..7cdf6550dc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,14 +19,6 @@ in our [JIRA issue tracker][] to see if you can find something similar. If not,
 please create a new issue before submitting a pull request unless the change is
 truly trivial, e.g. typo fixes, removing compiler warnings, etc.
 
-## Discuss non-trivial contribution ideas with committers
-
-If you're considering anything more than correcting a typo or fixing a minor
-bug, please discuss it on the [spring-framework-contrib][] mailing list before
-submitting a pull request. We're happy to provide guidance, but please spend an
-hour or two researching the subject on your own including searching the mailing
-list for prior discussions.
-
 ## Sign the Contributor License Agreement
 
 If you have not previously done so, please fill out and submit the
diff --git a/build.gradle b/build.gradle
index 3f6d91ff22..cc5eb03d62 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,16 @@
 buildscript {
 	repositories {
-		maven { url "http://repo.springsource.org/plugins-release" }
+		maven { url "https://repo.spring.io/plugins-release" }
 	}
 	dependencies {
-		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.3")
-		classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.6")
+		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
+		classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")
+	}
+}
+
+ext {
+	moduleProjects  = subprojects.findAll {
+		!it.name.equals('spring-build-src') && !it.name.equals('spring-framework-bom')
 	}
 }
 
@@ -12,10 +18,10 @@ configure(allprojects) { project ->
 	group = "org.springframework"
 	version = qualifyVersionIfNecessary(version)
 
-	ext.aspectjVersion  = "1.7.2"
+	ext.aspectjVersion  = "1.7.4"
 	ext.hsqldbVersion   = "1.8.0.10"
 	ext.junitVersion    = "4.11"
-	ext.slf4jVersion    = "1.6.1"
+	ext.slf4jVersion    = "1.6.6"
 	ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
 
 	apply plugin: "propdeps"
@@ -58,10 +64,17 @@ configure(allprojects) { project ->
 	test {
 		systemProperty("java.awt.headless", "true")
 		systemProperty("testGroups", project.properties.get("testGroups"))
+		scanForTestClasses = false
+		// Do not include "**/*Test.class" since some *Test classes are broken.
+		include(["**/*Tests.class"])
+		// Since we set scanForTestClasses to false, we need to filter out inner
+		// classes with the "$" pattern; otherwise, using -Dtest.single=MyTests to
+		// run MyTests by itself will fail if MyTests contains any inner classes. 
+		exclude(["**/Abstract*.class", '**/*$*'])
 	}
 
 	repositories {
-		maven { url "http://repo.springsource.org/libs-release" }
+		maven { url "https://repo.spring.io/libs-release" }
 	}
 
 	dependencies {
@@ -71,25 +84,28 @@ configure(allprojects) { project ->
 	}
 
 	ext.javadocLinks = [
-		"http://docs.oracle.com/javase/6/docs/api",
-		"http://docs.oracle.com/javaee/6/api",
-		"http://portals.apache.org/pluto/portlet-2.0-apidocs/",
-		"http://commons.apache.org/proper/commons-lang/javadocs/api-release/",
-		"http://commons.apache.org/proper/commons-codec/apidocs/",
+		"http://docs.oracle.com/javase/7/docs/api/",
+		"http://docs.oracle.com/javaee/6/api/",
+		"http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ
+		"http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/",
+		"http://glassfish.java.net/nonav/docs/v3/api/",
 		"http://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
 		"http://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
+		"http://commons.apache.org/proper/commons-lang/javadocs/api-2.5/",
+		"http://commons.apache.org/proper/commons-codec/apidocs/",
+		"http://commons.apache.org/proper/commons-dbcp/apidocs/",
+		"http://portals.apache.org/pluto/portlet-2.0-apidocs/",
+		"http://tiles.apache.org/tiles-request/apidocs/",
+		"http://tiles.apache.org/framework/apidocs/",
 		"http://aopalliance.sourceforge.net/doc/",
-		"http://glassfish.java.net/nonav/docs/v3/api/",
-		"http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // commonj
-		"http://quartz-scheduler.org/api/2.1.5/",
 		"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
-		"http://hc.apache.org/httpclient-3.x/apidocs/",
-		"http://fasterxml.github.com/jackson-core/javadoc/2.0.0/",
-		"http://jackson.codehaus.org/1.4.2/javadoc/",
-		"http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/",
-		"http://ibatis.apache.org/docs/java/dev/",
-		"http://tiles.apache.org/framework/apidocs/",
-		"http://commons.apache.org/proper/commons-dbcp/apidocs/",
+		"http://ehcache.org/apidocs/",
+		"http://quartz-scheduler.org/api/2.2.0/",
+		"http://jackson.codehaus.org/1.9.4/javadoc/",
+		"http://fasterxml.github.com/jackson-core/javadoc/2.3.0/",
+		"http://fasterxml.github.com/jackson-databind/javadoc/2.3.0/",
+		"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs",
+		"http://ibatis.apache.org/docs/java/dev/"
 	] as String[]
 }
 
@@ -118,6 +134,9 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
 		options.author = true
 		options.header = project.name
 		options.links(project.ext.javadocLinks)
+		if (JavaVersion.current().isJava8Compatible()) {
+			options.addStringOption('Xdoclint:none', '-quiet')
+		}
 
 		// suppress warnings due to cross-module @see and @link references;
 		// note that global 'api' task does display all warnings.
@@ -125,10 +144,10 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
 		logging.captureStandardOutput LogLevel.INFO // suppress "## warnings" message
 	}
 
-	task sourcesJar(type: Jar, dependsOn:classes) {
-		classifier = "sources"
-		from sourceSets.main.allJava.srcDirs
-		include "**/*.java", "**/*.aj"
+	task sourcesJar(type: Jar, dependsOn: classes) {
+		classifier = 'sources'
+		from sourceSets.main.allSource
+		// don't include or exclude anything explicitly by default. See SPR-12085.
 	}
 
 	task javadocJar(type: Jar) {
@@ -148,7 +167,7 @@ project("spring-build-src") {
 
 	dependencies {
 		compile gradleApi()
-		groovy localGroovy()
+		compile localGroovy()
 	}
 
 	configurations.archives.artifacts.clear()
@@ -157,14 +176,14 @@ project("spring-build-src") {
 project("spring-core") {
 	description = "Spring Core"
 
-	// As of Spring 3.2 spring-core repackages both asm 4.0 and cglib 3.0 and inlines both
-	// into the spring-core jar. cglib 3.0 itself depends on asm 4.0, and is therefore
+	// As of Spring 3.2.9, spring-core repackages asm 5.0 and cglib 3.1, inlining both
+	// into the spring-core jar. cglib 3.1 itself depends on asm 4+, and is therefore
 	// further transformed by the JarJar task to depend on org.springframework.asm; this
 	// avoids including two different copies of asm unnecessarily. If however future cglib
 	// versions drift from the version of asm used by Spring internally, this duplication
 	// will become necessary.
-	def asmVersion = "4.0"
-	def cglibVersion = "3.0"
+	def asmVersion = "5.0.4"
+	def cglibVersion = "3.1"
 
 	configurations {
 		jarjar
@@ -219,10 +238,11 @@ project("spring-core") {
 		cglib("cglib:cglib:${cglibVersion}@jar")
 		jarjar("com.googlecode.jarjar:jarjar:1.3")
 
+		compile(files(cglibRepackJar))
 		compile(files(asmRepackJar))
-		compile("commons-logging:commons-logging:1.1.1")
+		compile("commons-logging:commons-logging:1.1.3")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
-		optional("net.sf.jopt-simple:jopt-simple:3.0")
+		optional("net.sf.jopt-simple:jopt-simple:3.3")
 		optional("log4j:log4j:1.2.17")
 		testCompile("xmlunit:xmlunit:1.3")
 		testCompile("org.codehaus.woodstox:wstx-asl:3.2.7") {
@@ -245,30 +265,33 @@ project("spring-core") {
 
 project("spring-beans") {
 	description = "Spring Beans"
+
 	dependencies {
 		compile(project(":spring-core"))
 		compile(files(project(":spring-core").cglibRepackJar))
-		provided("javax.el:el-api:1.0")
-		provided("javax.inject:javax.inject:1")
+		optional("javax.el:el-api:1.0")
+		optional("javax.inject:javax.inject:1")
 		testCompile("log4j:log4j:1.2.17")
 	}
 }
 
 project("spring-aop") {
 	description = "Spring AOP"
+
 	dependencies {
+		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
 		compile(files(project(":spring-core").cglibRepackJar))
-		compile(project(":spring-beans"))
 		compile("aopalliance:aopalliance:1.0")
-		optional("com.jamonapi:jamon:2.4")
-		optional("commons-pool:commons-pool:1.5.3")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
+		optional("commons-pool:commons-pool:1.5.7")
+		optional("com.jamonapi:jamon:2.4")
 	}
 }
 
 project("spring-expression") {
 	description = "Spring Expression Language (SpEL)"
+
 	dependencies {
 		compile(project(":spring-core"))
 	}
@@ -276,17 +299,19 @@ project("spring-expression") {
 
 project("spring-instrument") {
 	description = "Spring Instrument"
-	dependencies {
-		compile(project(":spring-core"))
-	}
+
 	jar {
 		manifest.attributes["Premain-Class"] =
 			"org.springframework.instrument.InstrumentationSavingAgent"
+		manifest.attributes["Can-Redefine-Classes"] = "true"
+		manifest.attributes["Can-Retransform-Classes"] = "true"
+		manifest.attributes["Can-Set-Native-Method-Prefix"] = "false"
 	}
 }
 
 project("spring-instrument-tomcat") {
 	description = "Spring Instrument Tomcat"
+
 	dependencies {
 		provided("org.apache.tomcat:catalina:6.0.16")
 	}
@@ -294,31 +319,34 @@ project("spring-instrument-tomcat") {
 
 project("spring-context") {
 	description = "Spring Context"
+
 	dependencies {
-		optional(project(":spring-instrument"))
 		compile(project(":spring-aop"))
 		compile(project(":spring-beans"))
 		compile(project(":spring-expression"))
 		compile(project(":spring-core"))
 		compile(files(project(":spring-core").cglibRepackJar))
-		optional("backport-util-concurrent:backport-util-concurrent:3.0")
-		optional("javax.ejb:ejb-api:3.0")
+		optional(project(":spring-instrument"))
 		optional("javax.inject:javax.inject:1")
+		optional("javax.ejb:ejb-api:3.0")
 		optional("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
+		optional("backport-util-concurrent:backport-util-concurrent:3.0")
 		optional("javax.persistence:persistence-api:1.0")
 		optional("javax.validation:validation-api:1.0.0.GA")
-		optional("org.beanshell:bsh:2.0b4")
-		optional("org.codehaus.groovy:groovy-all:1.8.8")
-		optional("org.jruby:jruby:1.6.5.1")
-		optional("joda-time:joda-time:2.1")
-		optional("org.slf4j:slf4j-api:${slf4jVersion}")
-		optional("org.hibernate:hibernate-validator:4.3.0.Final")
+		optional("org.hibernate:hibernate-validator:4.3.1.Final")
+		optional("joda-time:joda-time:2.2")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
-		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
-		testCompile("commons-dbcp:commons-dbcp:1.2.2")
+		optional("org.codehaus.groovy:groovy-all:1.8.9")
+		optional("org.beanshell:bsh:2.0b4")
+		optional("org.jruby:jruby:1.7.12")
 		testCompile("javax.inject:javax.inject-tck:1")
+		testCompile("commons-dbcp:commons-dbcp:1.3")
+		testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
 	}
 
+	// pick up RmiInvocationWrapperRTD.xml in src/main
+	sourceSets.main.resources.srcDirs += "src/main/java"
+
 	test {
 		jvmArgs = ["-disableassertions:org.aspectj.weaver.UnresolvedType"] // SPR-7989
 	}
@@ -326,18 +354,19 @@ project("spring-context") {
 
 project("spring-tx") {
 	description = "Spring Transaction"
+
 	dependencies {
-		optional(project(":spring-context")) // for JCA, @EnableTransactionManagement
-		optional(project(":spring-aop"))
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
-		compile("aopalliance:aopalliance:1.0")
-		provided("com.ibm.websphere:uow:6.0.2.17")
-		optional("javax.resource:connector-api:1.5")
+		optional(project(":spring-aop"))
+		optional(project(":spring-context"))  // for JCA, @EnableTransactionManagement
+		optional("aopalliance:aopalliance:1.0")
 		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
+		optional("javax.resource:connector-api:1.5")
 		optional("javax.ejb:ejb-api:3.0")
-		testCompile("javax.persistence:persistence-api:1.0")
+		optional("com.ibm.websphere:uow:6.0.2.17")
 		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
+		testCompile("javax.persistence:persistence-api:1.0")
 	}
 }
 
@@ -355,16 +384,24 @@ project("spring-oxm") {
 	dependencies {
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
-		optional(project(":spring-context")) // for Jaxb2Marshaller
-		compile("commons-lang:commons-lang:2.5")
-		optional("com.thoughtworks.xstream:xstream:1.3.1")
-		optional("com.sun.xml.bind:jaxb-impl:2.1.7")
-		optional("org.jibx:jibx-run:1.2.3")
-		optional("org.apache.xmlbeans:xmlbeans:2.4.0")
-		optional("org.codehaus.castor:castor-xml:1.3.2")
-		testCompile("org.codehaus.jettison:jettison:1.0.1")
+		optional("org.codehaus.castor:castor-xml:1.3.3")  {
+			exclude group: 'stax', module: 'stax-api'
+			exclude group: "org.springframework", module: "spring-context"
+		}
+		optional("org.apache.xmlbeans:xmlbeans:2.6.0") {
+			exclude group: 'stax', module: 'stax-api'
+		}
+		optional("com.thoughtworks.xstream:xstream:1.4.7") {
+			exclude group: 'xpp3', module: 'xpp3_min'
+			exclude group: 'xmlpull', module: 'xmlpull'
+		}
+		optional("org.jibx:jibx-run:1.2.5")
+		testCompile(project(":spring-context"))
 		testCompile("xmlunit:xmlunit:1.3")
 		testCompile("xmlpull:xmlpull:1.1.3.4a")
+		testCompile("org.codehaus.jettison:jettison:1.0.1") {
+			exclude group: 'stax', module: 'stax-api'
+		}
 		testCompile(files(genCastor.classesDir).builtBy(genCastor))
 		testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
 		testCompile(files(genXmlbeans.classesDir).builtBy(genXmlbeans))
@@ -373,61 +410,64 @@ project("spring-oxm") {
 
 project("spring-jms") {
 	description = "Spring JMS"
+
 	dependencies {
 		compile(project(":spring-core"))
 		compile(project(":spring-beans"))
 		compile(project(":spring-aop"))
 		compile(project(":spring-context"))
 		compile(project(":spring-tx"))
-		optional(project(":spring-oxm"))
-		compile("aopalliance:aopalliance:1.0")
 		provided("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
+		optional(project(":spring-oxm"))
+		optional("aopalliance:aopalliance:1.0")
 		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 		optional("javax.resource:connector-api:1.5")
-		optional("org.codehaus.jackson:jackson-mapper-asl:1.4.2")
-		optional("com.fasterxml.jackson.core:jackson-databind:2.0.1")
+		optional("org.codehaus.jackson:jackson-mapper-asl:1.7.9")
+		optional("com.fasterxml.jackson.core:jackson-databind:2.0.6")
 	}
 }
 
 project("spring-jdbc") {
 	description = "Spring JDBC"
+
 	dependencies {
-		compile(project(":spring-core"))
 		compile(project(":spring-beans"))
-		optional(project(":spring-context")) // for JndiDataSourceLookup
+		compile(project(":spring-core"))
 		compile(project(":spring-tx"))
+		optional(project(":spring-context"))  // for JndiDataSourceLookup
+		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 		optional("c3p0:c3p0:0.9.1.2")
 		optional("hsqldb:hsqldb:${hsqldbVersion}")
-		optional("com.h2database:h2:1.0.71")
+		optional("com.h2database:h2:1.0.79")
 		optional("org.apache.derby:derby:10.5.3.0_1")
 		optional("org.apache.derby:derbyclient:10.5.3.0_1")
-		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 	}
 }
 
 project("spring-context-support") {
 	description = "Spring Context Support"
+
 	dependencies {
 		compile(project(":spring-core"))
 		compile(project(":spring-beans"))
 		compile(project(":spring-context"))
-		optional(project(":spring-jdbc")) // for Quartz support
-		optional(project(":spring-tx")) // for Quartz support
-		optional("javax.mail:mail:1.4")
+		provided("javax.activation:activation:1.1")
+		optional(project(":spring-jdbc"))  // for Quartz support
+		optional(project(":spring-tx"))  // for Quartz support
+		optional("javax.mail:mail:1.4.7")
 		optional("javax.cache:cache-api:0.5")
-		optional("net.sf.ehcache:ehcache-core:2.0.0")
-		optional("opensymphony:quartz:1.6.2")
+		optional("net.sf.ehcache:ehcache-core:2.0.1")
+		optional("org.quartz-scheduler:quartz:1.7.3")
 		optional("org.codehaus.fabric3.api:commonj:1.1.0")
 		optional("velocity:velocity:1.5")
-		optional("org.freemarker:freemarker:2.3.15")
+		optional("org.freemarker:freemarker:2.3.20")
 		optional("com.lowagie:itext:2.1.7")
-		optional("jasperreports:jasperreports:2.0.5")
-		optional("org.slf4j:slf4j-api:${slf4jVersion}")
-		provided("javax.activation:activation:1.1")
-		testCompile("org.apache.poi:poi:3.0.2-FINAL")
-		testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
-		testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
+		optional("net.sf.jasperreports:jasperreports:3.7.6")
+		testCompile("org.apache.poi:poi:3.6")
+		testCompile("commons-beanutils:commons-beanutils:1.8.0")  // for Velocity/JasperReports
+		testCompile("commons-digester:commons-digester:1.8.1")  // for Velocity/JasperReports
 		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
+		testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
 	}
 
 	// pick up **/*.types files in src/main
@@ -436,29 +476,30 @@ project("spring-context-support") {
 
 project("spring-web") {
 	description = "Spring Web"
+
 	dependencies {
-		compile(project(":spring-core"))
-		compile(project(":spring-beans")) // for MultiPartFilter
-		compile(project(":spring-aop")) // for JaxWsPortProxyFactoryBean
+		compile(project(":spring-aop"))  // for JaxWsPortProxyFactoryBean
+		compile(project(":spring-beans"))  // for MultipartFilter
 		compile(project(":spring-context"))
-		optional(project(":spring-oxm")) // for MarshallingHttpMessageConverter
-		compile("aopalliance:aopalliance:1.0")
-		optional("com.caucho:hessian:3.2.1")
-		optional("rome:rome:1.0")
+		compile(project(":spring-core"))
+		provided("javax.servlet:javax.servlet-api:3.0.1")
+		provided("javax.activation:activation:1.1")
+		optional(project(":spring-oxm"))  // for MarshallingHttpMessageConverter
+		optional("javax.servlet.jsp:jsp-api:2.1")
+		optional("javax.portlet:portlet-api:2.0")
 		optional("javax.el:el-api:1.0")
 		optional("javax.faces:jsf-api:1.2_08")
-		provided("javax.portlet:portlet-api:2.0")
-		provided("javax.servlet:javax.servlet-api:3.0.1")
-		provided("javax.servlet.jsp:jsp-api:2.1")
 		optional("javax.xml:jaxrpc-api:1.1")
-		provided("javax.xml.soap:saaj-api:1.3")
-		provided("javax.activation:activation:1.1")
-		optional("commons-fileupload:commons-fileupload:1.2")
+		optional("javax.xml.soap:saaj-api:1.3")
+		optional("aopalliance:aopalliance:1.0")
+		optional("com.caucho:hessian:3.2.1")
+		optional("commons-fileupload:commons-fileupload:1.3.1")
 		optional("commons-io:commons-io:1.3")
 		optional("commons-httpclient:commons-httpclient:3.1")
-		optional("org.apache.httpcomponents:httpclient:4.2")
-		optional("org.codehaus.jackson:jackson-mapper-asl:1.4.2")
-		optional("com.fasterxml.jackson.core:jackson-databind:2.0.1")
+		optional("org.apache.httpcomponents:httpclient:4.2.6")
+		optional("org.codehaus.jackson:jackson-mapper-asl:1.7.9")
+		optional("com.fasterxml.jackson.core:jackson-databind:2.0.6")
+		optional("rome:rome:1.0")
 		optional("taglibs:standard:1.1.2")
 		optional("org.eclipse.jetty:jetty-servlet:8.1.5.v20120716") {
 			exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
@@ -479,85 +520,85 @@ project("spring-orm") {
 	description = "Spring Object/Relational Mapping"
 
 	compileTestJava {
-		// necessary to avoid java.lang.VerifyError on toplink compilation
-		// TODO: remove this block when we remove toplink
+		// necessary to avoid java.lang.VerifyError on TopLink compilation
 		sourceCompatibility=1.6
 		targetCompatibility=1.6
 	}
 
 	dependencies {
-		compile("aopalliance:aopalliance:1.0")
+		compile(project(":spring-beans"))
+		compile(project(":spring-core"))
+		compile(project(":spring-jdbc"))
+		compile(project(":spring-tx"))
+		optional(project(":spring-aop"))
+		optional(project(":spring-context"))
+		optional(project(":spring-web"))
+		optional("aopalliance:aopalliance:1.0")
+		optional("javax.persistence:persistence-api:1.0")
+		optional("org.eclipse.persistence:org.eclipse.persistence.core:1.0.1")
+		optional("org.eclipse.persistence:org.eclipse.persistence.jpa:1.0.1")
 		optional("org.hibernate:hibernate-core:3.3.2.GA")
 		optional("org.hibernate:hibernate-annotations:3.4.0.GA")
 		optional("org.hibernate:hibernate-entitymanager:3.4.0.GA")
 		optional("org.apache.openjpa:openjpa:1.1.0")
-		optional("org.eclipse.persistence:org.eclipse.persistence.core:1.0.1")
-		optional("org.eclipse.persistence:org.eclipse.persistence.jpa:1.0.1")
 		optional("toplink.essentials:toplink-essentials:2.0-41b")
 		optional("javax.jdo:jdo-api:3.0")
 		optional("org.apache.ibatis:ibatis-sqlmap:2.3.4.726")
-		optional("javax.persistence:persistence-api:1.0")
-		provided("javax.servlet:servlet-api:2.5")
+		optional("javax.servlet:servlet-api:2.5")
 		testCompile("javax.servlet:javax.servlet-api:3.0.1")
-		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
-		testCompile("commons-dbcp:commons-dbcp:1.2.2")
 		testCompile("org.eclipse.persistence:org.eclipse.persistence.asm:1.0.1")
 		testCompile("org.eclipse.persistence:org.eclipse.persistence.antlr:1.0.1")
+		testCompile("commons-dbcp:commons-dbcp:1.3")
 		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
-		compile(project(":spring-core"))
-		compile(project(":spring-beans"))
-		optional(project(":spring-aop"))
-		optional(project(":spring-context"))
-		compile(project(":spring-tx"))
-		compile(project(":spring-jdbc"))
-		optional(project(":spring-web"))
+		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 	}
 }
 
 project("spring-orm-hibernate4") {
 	description = "Spring Object/Relational Mapping - Hibernate 4 support"
 	merge.into = project(":spring-orm")
+
 	dependencies {
-		provided(project(":spring-tx"))
 		provided(project(":spring-jdbc"))
-		optional("org.hibernate:hibernate-core:4.1.0.Final")
-		optional("org.hibernate:hibernate-entitymanager:4.1.0.Final")
+		provided(project(":spring-tx"))
 		optional(project(":spring-web"))
+		optional("org.hibernate:hibernate-core:4.2.21.Final")
+		optional("org.hibernate:hibernate-entitymanager:4.2.21.Final")
 		optional("javax.servlet:servlet-api:2.5")
 	}
 }
 
 project("spring-webmvc") {
 	description = "Spring Web MVC"
+
 	dependencies {
+		compile(project(":spring-beans"))
+		compile(project(":spring-context"))
 		compile(project(":spring-core"))
 		compile(project(":spring-expression"))
-		compile(project(":spring-beans"))
 		compile(project(":spring-web"))
-		compile(project(":spring-context"))
-		optional(project(":spring-context-support")) // for Velocity support
-		optional(project(":spring-oxm")) // for MarshallingView
-		optional("org.apache.tiles:tiles-api:2.1.2")
-		optional("org.apache.tiles:tiles-core:2.1.2")
-		optional("org.apache.tiles:tiles-jsp:2.1.2")
-		optional("org.apache.tiles:tiles-servlet:2.1.2")
+		provided("javax.servlet:javax.servlet-api:3.0.1")
+		optional(project(":spring-context-support"))  // for Velocity support
+		optional(project(":spring-oxm"))  // for MarshallingView
+		optional("javax.servlet.jsp:jsp-api:2.1")
+		optional("javax.servlet:jstl:1.2")
+		optional("net.sourceforge.jexcelapi:jxl:2.6.12")
+		optional("org.apache.poi:poi:3.6")
+		optional("velocity:velocity:1.5")
 		optional("velocity-tools:velocity-tools-view:1.4")
-		optional("net.sourceforge.jexcelapi:jxl:2.6.3")
-		optional("org.apache.poi:poi:3.0.2-FINAL")
+		optional("org.freemarker:freemarker:2.3.20")
 		optional("com.lowagie:itext:2.1.7")
-		optional("jasperreports:jasperreports:2.0.5") {
+		optional("net.sf.jasperreports:jasperreports:3.7.6") {
 			exclude group: "xml-apis", module: "xml-apis"
 		}
+		optional("org.codehaus.jackson:jackson-mapper-asl:1.7.9")
+		optional("com.fasterxml.jackson.core:jackson-databind:2.0.6")
 		optional("rome:rome:1.0")
-		optional("velocity:velocity:1.5")
-		optional("org.freemarker:freemarker:2.3.15")
-		optional("org.codehaus.jackson:jackson-mapper-asl:1.4.2")
-		optional("com.fasterxml.jackson.core:jackson-databind:2.0.1")
-		provided("javax.servlet:jstl:1.2")
-		provided("javax.servlet:javax.servlet-api:3.0.1")
-		provided("javax.servlet.jsp:jsp-api:2.1")
+		optional("org.apache.tiles:tiles-api:2.1.2")
+		optional("org.apache.tiles:tiles-core:2.1.2")
+		optional("org.apache.tiles:tiles-jsp:2.1.2")
+		optional("org.apache.tiles:tiles-servlet:2.1.2")
 		testCompile(project(":spring-aop"))
-		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 		testCompile("rhino:js:1.7R1")
 		testCompile("xmlunit:xmlunit:1.3")
 		testCompile("dom4j:dom4j:1.6.1") {
@@ -575,10 +616,11 @@ project("spring-webmvc") {
 			exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
 		}
 		testCompile("javax.validation:validation-api:1.0.0.GA")
-		testCompile("commons-fileupload:commons-fileupload:1.2")
+		testCompile("org.hibernate:hibernate-validator:4.3.1.Final")
+		testCompile("org.apache.httpcomponents:httpclient:4.2.6")
+		testCompile("commons-fileupload:commons-fileupload:1.3.1")
 		testCompile("commons-io:commons-io:1.3")
-		testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
-		testCompile("org.apache.httpcomponents:httpclient:4.2")
+		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 	}
 
 	// pick up DispatcherServlet.properties in src/main
@@ -588,45 +630,47 @@ project("spring-webmvc") {
 project("spring-webmvc-tiles3") {
 	description = "Spring Framework Tiles3 Integration"
 	merge.into = project(":spring-webmvc")
+
 	dependencies {
 		provided(project(":spring-context"))
 		provided(project(":spring-web"))
-		provided("javax.el:el-api:1.0")
-		provided("javax.servlet:jstl:1.2")
-		provided("javax.servlet.jsp:jsp-api:2.1")
-		optional("org.apache.tiles:tiles-request-api:1.0.1")
-		optional("org.apache.tiles:tiles-api:3.0.1")
-		optional("org.apache.tiles:tiles-core:3.0.1") {
+		provided("javax.servlet:javax.servlet-api:3.0.1")
+		optional("javax.servlet.jsp:jsp-api:2.1")
+		optional("javax.servlet:jstl:1.2")
+		optional("javax.el:el-api:1.0")
+		optional("org.apache.tiles:tiles-api:3.0.4")
+		optional("org.apache.tiles:tiles-core:3.0.4") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		optional("org.apache.tiles:tiles-servlet:3.0.1") {
+		optional("org.apache.tiles:tiles-servlet:3.0.4") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		optional("org.apache.tiles:tiles-jsp:3.0.1") {
+		optional("org.apache.tiles:tiles-jsp:3.0.4") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		optional("org.apache.tiles:tiles-extras:3.0.1") {
+		optional("org.apache.tiles:tiles-el:3.0.4") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		optional("org.apache.tiles:tiles-el:3.0.1") {
+		optional("org.apache.tiles:tiles-extras:3.0.4") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
+			exclude group: "org.springframework", module: "spring-web"
 		}
-		provided("javax.servlet:javax.servlet-api:3.0.1")
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 	}
 }
 
 project("spring-webmvc-portlet") {
 	description = "Spring Web Portlet"
+
 	dependencies {
-		provided("javax.servlet:servlet-api:2.5")
-		provided("javax.portlet:portlet-api:2.0")
-		compile(project(":spring-core"))
 		compile(project(":spring-beans"))
 		compile(project(":spring-context"))
+		compile(project(":spring-core"))
 		compile(project(":spring-web"))
 		compile(project(":spring-webmvc"))
-		optional("commons-fileupload:commons-fileupload:1.2")
+		provided("javax.servlet:servlet-api:2.5")
+		provided("javax.portlet:portlet-api:2.0")
+		optional("commons-fileupload:commons-fileupload:1.3.1")
 	}
 
 	// pick up DispatcherPortlet.properties in src/main
@@ -636,23 +680,9 @@ project("spring-webmvc-portlet") {
 project("spring-test") {
 	description = "Spring TestContext Framework"
 
-	task testNG(type: Test) {
-		useTestNG()
-		// "TestCase" classes are run by other test classes, not the build.
-		exclude "**/*TestCase.class"
-		// Generate TestNG reports alongside JUnit reports.
-		testReport true
-	}
-
-	test {
-		dependsOn testNG
-		useJUnit()
-		// "TestCase" classes are run by other test classes, not the build.
-		exclude(["**/*TestCase.class", "**/*TestSuite.class"])
-	}
-
 	dependencies {
 		compile(project(":spring-core"))
+		provided("javax.activation:activation:1.1")
 		optional(project(":spring-beans"))
 		optional(project(":spring-context"))
 		optional(project(":spring-jdbc"))
@@ -660,20 +690,42 @@ project("spring-test") {
 		optional(project(":spring-orm"))
 		optional(project(":spring-web"))
 		optional(project(":spring-webmvc"))
-		optional(project(":spring-webmvc-portlet"), )
+		optional(project(":spring-webmvc-portlet"))
 		optional("junit:junit:${junitVersion}")
-		optional("org.testng:testng:6.5.2")
+		optional("org.testng:testng:6.8.8")
+		optional("javax.inject:javax.inject:1")
 		optional("javax.servlet:servlet-api:2.5")
 		optional("javax.servlet.jsp:jsp-api:2.1")
+		optional("javax.servlet:jstl:1.2")
 		optional("javax.portlet:portlet-api:2.0")
 		optional("javax.persistence:persistence-api:1.0")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 		testCompile("org.hibernate:hibernate-core:3.3.2.GA")
-		provided("javax.inject:javax.inject:1")
-		provided("javax.activation:activation:1.1")
-		provided("javax.servlet:jstl:1.2")
-		testCompile "org.slf4j:slf4j-jcl:${slf4jVersion}"
 		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
+		testCompile "org.slf4j:slf4j-jcl:${slf4jVersion}"
+	}
+
+	task testNG(type: Test) {
+		useTestNG()
+		// forkEvery 1
+		scanForTestClasses = false
+		include "**/testng/**/*.*"
+		exclude "**/FailingBeforeAndAfterMethodsTests.class"
+		// "TestCase" classes are run by other test classes, not the build.
+		exclude "**/*TestCase.class"
+		// Generate TestNG reports alongside JUnit reports.
+		getReports().getHtml().setEnabled(true)
+		// show standard out and standard error of the test JVM(s) on the console
+		// testLogging.showStandardStreams = true
+	}
+
+	test {
+		dependsOn testNG
+		useJUnit()
+		exclude "**/testng/**/*.*"
+		include "**/testng/FailingBeforeAndAfterMethodsTests"
+		// "TestCase" classes are run by other test classes, not the build.
+		exclude(["**/*TestCase.class", "**/*TestSuite.class"])
 	}
 }
 
@@ -681,33 +733,30 @@ project("spring-test-mvc") {
 	description = "Spring Test MVC Framework"
 	merge.into = project(":spring-test")
 	dependencies {
-		optional(project(":spring-context"))
 		provided(project(":spring-webmvc"))
 		provided("javax.servlet:javax.servlet-api:3.0.1")
+		provided("javax.activation:activation:1.1")
+		optional(project(":spring-context"))
 		optional("org.hamcrest:hamcrest-core:1.3")
 		optional("com.jayway.jsonpath:json-path:0.8.1")
 		optional("xmlunit:xmlunit:1.3")
-		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
-		testCompile("javax.servlet:jstl:1.2")
-		testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
-		testCompile("org.codehaus.jackson:jackson-mapper-asl:1.4.2")
-		testCompile("com.fasterxml.jackson.core:jackson-databind:2.0.1")
 		testCompile(project(":spring-context-support"))
 		testCompile(project(":spring-oxm"))
-		testCompile("com.thoughtworks.xstream:xstream:1.3.1")
-		testCompile("cglib:cglib-nodep:2.2")
+		testCompile("javax.servlet:jstl:1.2")
+		testCompile("javax.mail:mail:1.4.7")
+		testCompile("org.hibernate:hibernate-validator:4.3.1.Final")
+		testCompile("com.thoughtworks.xstream:xstream:1.4.7")
+		testCompile("org.codehaus.jackson:jackson-mapper-asl:1.7.9")
+		testCompile("com.fasterxml.jackson.core:jackson-databind:2.0.6")
 		testCompile("rome:rome:1.0")
-		testCompile("javax.activation:activation:1.1")
-		testCompile("javax.mail:mail:1.4")
-		testCompile("javax.xml.bind:jaxb-api:2.2.6")
-		testCompile("org.apache.tiles:tiles-request-api:1.0.1")
-		testCompile("org.apache.tiles:tiles-api:3.0.1")
-		testCompile("org.apache.tiles:tiles-core:3.0.1") {
+		testCompile("org.apache.tiles:tiles-api:3.0.4")
+		testCompile("org.apache.tiles:tiles-core:3.0.4") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		testCompile("org.apache.tiles:tiles-servlet:3.0.1") {
+		testCompile("org.apache.tiles:tiles-servlet:3.0.4") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
+		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 	}
 }
 
@@ -730,23 +779,24 @@ project("spring-struts") {
 project("spring-aspects") {
 	description = "Spring Aspects"
 	apply from: "aspects.gradle"
+
 	dependencies {
-		optional(project(":spring-beans")) // for @Configurable support
-		optional(project(":spring-aop")) // for @Async support
-		optional(project(":spring-context")) // for @Enable* support
-		compile(project(":spring-context-support")) // for JavaMail support
-		optional(project(":spring-tx")) // for JPA, @Transactional support
-		optional(project(":spring-orm")) // for JPA exception translation support
 		aspects(project(":spring-orm"))
-		provided("javax.persistence:persistence-api:1.0")
-		testCompile("javax.mail:mail:1.4")
 		ajc("org.aspectj:aspectjtools:${aspectjVersion}")
 		rt("org.aspectj:aspectjrt:${aspectjVersion}")
 		compile("org.aspectj:aspectjweaver:${aspectjVersion}")
-		testCompile(project(":spring-core")) // for CodeStyleAspect
-		compile(project(":spring-beans")) // for "p" namespace visibility
+		provided("javax.persistence:persistence-api:1.0")
+		optional(project(":spring-aop"))  // for @Async support
+		optional(project(":spring-beans"))  // for @Configurable support
+		optional(project(":spring-context"))  // for @Enable* support
+		optional(project(":spring-context-support"))  // for JavaMail support
+		optional(project(":spring-orm"))  // for JPA exception translation support
+		optional(project(":spring-tx"))  // for JPA, @Transactional support
+		testCompile(project(":spring-core"))  // for CodeStyleAspect
 		testCompile(project(":spring-test"))
+		testCompile("javax.mail:mail:1.4.7")
 	}
+
 	eclipse.project {
 		natures += "org.eclipse.ajdt.ui.ajnature"
 		buildCommands = [new org.gradle.plugins.ide.eclipse.model.
@@ -754,12 +804,48 @@ project("spring-aspects") {
 	}
 }
 
+project("spring-framework-bom") {
+	description = "Spring Framework (Bill of Materials)"
+
+	configurations.archives.artifacts.clear()
+	artifacts {
+		// work around GRADLE-2406 by attaching text artifact
+		archives(file("spring-framework-bom.txt"))
+	}
+
+	install {
+		repositories.mavenInstaller {
+			pom.whenConfigured {
+				packaging = "pom"
+				withXml {
+					asNode().children().last() + {
+						delegate.dependencyManagement {
+							delegate.dependencies {
+								parent.subprojects.sort { "$it.name" }.each { p ->
+									if (p.hasProperty("merge") && p.merge.into == null && p != project) {
+										delegate.dependency {
+											delegate.groupId(p.group)
+											delegate.artifactId(p.name)
+											delegate.version(p.version)
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 configure(rootProject) {
 	description = "Spring Framework"
 
 	apply plugin: "docbook-reference"
 	apply plugin: "groovy"
-	apply plugin: "detect-split-packages"
+
+	// apply plugin: "detect-split-packages"
 	apply from: "${gradleScriptDir}/jdiff.gradle"
 
 	reference {
@@ -767,31 +853,33 @@ configure(rootProject) {
 		pdfFilename = "spring-framework-reference.pdf"
 	}
 
-	detectSplitPackages {
-		projectsToScan -= project(":spring-instrument-tomcat")
-	}
+	// TODO: DetectSplitPackagesPlugin fails in line 154 due to method not found on java.io.File.
+	// TODO: Possibly related to user rights or OS differences on OpenJDK 8; works fine on JDK 7.
+	// detectSplitPackages {
+	//	projectsToScan -= project(":spring-instrument-tomcat")
+	// }
 
 	// don't publish the default jar for the root project
 	configurations.archives.artifacts.clear()
 
 	dependencies { // for integration tests
-		testCompile(project(":spring-core"))
-		testCompile(project(":spring-beans"))
 		testCompile(project(":spring-aop"))
-		testCompile(project(":spring-expression"))
+		testCompile(project(":spring-beans"))
 		testCompile(project(":spring-context"))
-		testCompile(project(":spring-tx"))
+		testCompile(project(":spring-core"))
+		testCompile(project(":spring-expression"))
 		testCompile(project(":spring-jdbc"))
+		testCompile(project(":spring-orm"))
 		testCompile(project(":spring-test"))
+		testCompile(project(":spring-tx"))
 		testCompile(project(":spring-web"))
 		testCompile(project(":spring-webmvc-portlet"))
-		testCompile(project(":spring-orm"))
-		testCompile("org.hibernate:hibernate-core:4.1.0.Final")
 		testCompile("javax.servlet:servlet-api:2.5")
 		testCompile("javax.portlet:portlet-api:2.0")
 		testCompile("javax.inject:javax.inject:1")
 		testCompile("javax.resource:connector-api:1.5")
 		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
+		testCompile("org.hibernate:hibernate-core:4.2.21.Final")
 		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
 	}
 
@@ -812,6 +900,9 @@ configure(rootProject) {
 		options.stylesheetFile = file("src/api/stylesheet.css")
 		options.splitIndex = true
 		options.links(project.ext.javadocLinks)
+		if (JavaVersion.current().isJava8Compatible()) {
+			options.addStringOption('Xdoclint:none', '-quiet')
+		}
 
 		source subprojects.collect { project ->
 			project.sourceSets.main.allJava
@@ -822,7 +913,7 @@ configure(rootProject) {
 
 		doFirst {
 			classpath = files(
-				// ensure servlet 3.x and Hibernate 4.x have precedence on the Javadoc
+				// ensure Servlet 3.x and Hibernate 4.x have precedence on the javadoc
 				// classpath over their respective 2.5 and 3.x variants
 				project(":spring-webmvc").sourceSets.main.compileClasspath.files.find { it =~ "servlet-api" },
 				rootProject.sourceSets.test.compileClasspath.files.find { it =~ "hibernate-core" },
@@ -833,7 +924,7 @@ configure(rootProject) {
 		}
 	}
 
-	task docsZip(type: Zip) {
+	task docsZip(type: Zip, dependsOn: 'reference') {
 		group = "Distribution"
 		baseName = "spring-framework"
 		classifier = "docs"
@@ -859,8 +950,8 @@ configure(rootProject) {
 		classifier = "schema"
 		description = "Builds -${classifier} archive containing all " +
 			"XSDs for deployment at http://springframework.org/schema."
-
-		subprojects.each { subproject ->
+		duplicatesStrategy 'exclude'
+		moduleProjects.each { subproject ->
 			def Properties schemas = new Properties();
 
 			subproject.sourceSets.main.resources.find {
@@ -906,7 +997,7 @@ configure(rootProject) {
 			into "${baseDir}/schema"
 		}
 
-		subprojects.each { subproject ->
+		moduleProjects.each { subproject ->
 			into ("${baseDir}/libs") {
 				from subproject.jar
 				if (subproject.tasks.findByPath("sourcesJar")) {
@@ -959,7 +1050,7 @@ configure(rootProject) {
 
 	task wrapper(type: Wrapper) {
 		description = "Generates gradlew[.bat] scripts"
-		gradleVersion = "1.3"
+		gradleVersion = "2.5"
 
 		doLast() {
 			def gradleOpts = "-XX:MaxPermSize=1024m -Xmx1024m"
diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/DetectSplitPackagesPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/DetectSplitPackagesPlugin.groovy
index ddafa956ef..dc554fb229 100644
--- a/buildSrc/src/main/groovy/org/springframework/build/gradle/DetectSplitPackagesPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/DetectSplitPackagesPlugin.groovy
@@ -49,7 +49,7 @@ import org.gradle.api.tasks.TaskAction
 public class DetectSplitPackagesPlugin implements Plugin<Project> {
 	public void apply(Project project) {
 		def tasks = project.tasks
-		Task detectSplitPackages = tasks.add("detectSplitPackages", DetectSplitPackagesTask.class)
+		Task detectSplitPackages = tasks.create("detectSplitPackages", DetectSplitPackagesTask.class)
 		if (tasks.asMap.containsKey("check")) {
 			tasks.getByName("check").dependsOn detectSplitPackages
 		}
diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
index 4143780702..40bbce0282 100644
--- a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
@@ -21,20 +21,17 @@ import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ProjectDependency;
 import org.gradle.api.artifacts.maven.Conf2ScopeMapping
 import org.gradle.api.plugins.MavenPlugin
-import org.gradle.api.tasks.*
 import org.gradle.plugins.ide.eclipse.EclipsePlugin
-import org.gradle.plugins.ide.eclipse.model.EclipseClasspath;
 import org.gradle.plugins.ide.idea.IdeaPlugin
 import org.gradle.api.invocation.*
 
-
 /**
  * Gradle plugin that allows projects to merged together. Primarily developed to
- * allow Spring to support multiple multiple incompatible versions of third-party
+ * allow Spring to support multiple incompatible versions of third-party
  * dependencies (for example Hibernate v3 and v4).
  * <p>
  * The 'merge' extension should be used to define how projects are merged, for example:
- * <pre>
+ * <pre class="code">
  * configure(subprojects) {
  *     apply plugin: MergePlugin
  * }
@@ -67,22 +64,22 @@ class MergePlugin implements Plugin<Project> {
 		project.plugins.apply(IdeaPlugin)
 
 		MergeModel model = project.extensions.create("merge", MergeModel)
-		project.configurations.add("merging")
-		Configuration runtimeMerge = project.configurations.add("runtimeMerge")
+		project.configurations.create("merging")
+		Configuration runtimeMerge = project.configurations.create("runtimeMerge")
 
 		// Ensure the IDE can reference merged projects
-		project.eclipse.classpath.plusConfigurations += [runtimeMerge]
-		project.idea.module.scopes.PROVIDED.plus += runtimeMerge
+		project.eclipse.classpath.plusConfigurations += [ runtimeMerge ]
+		project.idea.module.scopes.PROVIDED.plus += [ runtimeMerge ]
 
 		// Hook to perform the actual merge logic
 		project.afterEvaluate{
-			if(it.merge.into != null) {
+			if (it.merge.into != null) {
 				setup(it)
 			}
 		}
 
 		// Hook to build runtimeMerge dependencies
-		if(!attachedProjectsEvaluated) {
+		if (!attachedProjectsEvaluated) {
 			project.gradle.projectsEvaluated{
 				postProcessProjects(it)
 			}
@@ -102,7 +99,7 @@ class MergePlugin implements Plugin<Project> {
 		// invoking a task will invoke the task with the same name on 'into' project
 		["sourcesJar", "jar", "javadocJar", "javadoc", "install", "artifactoryPublish"].each {
 			def task = project.tasks.findByPath(it)
-			if(task) {
+			if (task) {
 				task.enabled = false
 				task.dependsOn(project.merge.into.tasks.findByPath(it))
 			}
@@ -120,8 +117,8 @@ class MergePlugin implements Plugin<Project> {
 	private void setupMaven(Project project) {
 		project.configurations.each { configuration ->
 			Conf2ScopeMapping mapping = project.conf2ScopeMappings.getMapping([configuration])
-			if(mapping.scope) {
-				Configuration intoConfiguration = project.merge.into.configurations.add(
+			if (mapping.scope) {
+				Configuration intoConfiguration = project.merge.into.configurations.create(
 					project.name + "-" + configuration.name)
 				configuration.excludeRules.each {
 					configuration.exclude([
@@ -131,12 +128,13 @@ class MergePlugin implements Plugin<Project> {
 				configuration.dependencies.each {
 					def intoCompile = project.merge.into.configurations.getByName("compile")
 					// Protect against changing a compile scope dependency (SPR-10218)
-					if(!intoCompile.dependencies.contains(it)) {
+					if (!intoCompile.dependencies.contains(it)) {
 						intoConfiguration.dependencies.add(it)
 					}
 				}
+				def index = project.parent.childProjects.findIndexOf {p -> p.getValue() == project}
 				project.merge.into.install.repositories.mavenInstaller.pom.scopeMappings.addMapping(
-					mapping.priority + 100, intoConfiguration, mapping.scope)
+					mapping.priority + 100 + index, intoConfiguration, mapping.scope)
 			}
 		}
 	}
diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
index 1d6134ab59..2423bb0242 100644
--- a/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ProjectDependency;
 
-
 /**
  * Gradle plugin that automatically updates testCompile dependencies to include
  * the test source sets of project dependencies.
@@ -41,11 +40,10 @@ class TestSourceSetDependenciesPlugin implements Plugin<Project> {
 		}
 	}
 
-	private void collectProjectDependencies(Set<ProjectDependency> projectDependencies,
-			Project project) {
-		for(def configurationName in ["compile", "optional", "provided", "testCompile"]) {
+	private void collectProjectDependencies(Set<ProjectDependency> projectDependencies, Project project) {
+		for (def configurationName in ["compile", "optional", "provided", "testCompile"]) {
 			Configuration configuration = project.getConfigurations().findByName(configurationName)
-			if(configuration) {
+			if (configuration) {
 				configuration.dependencies.findAll { it instanceof ProjectDependency }.each {
 					projectDependencies.add(it)
 					collectProjectDependencies(projectDependencies, it.dependencyProject)
diff --git a/gradle.properties b/gradle.properties
index 4c5915ce80..b0b0c2dcbe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=3.2.3.BUILD-SNAPSHOT
+version=3.2.19.BUILD-SNAPSHOT
diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index 3f73282254..66fc228301 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -41,6 +41,17 @@ eclipse.classpath.file.whenMerged { classpath ->
 	}
 }
 
+// Ensure project dependencies come after 3rd-party libs (SPR-11836)
+// https://jira.spring.io/browse/SPR-11836
+eclipse.classpath.file.whenMerged { classpath ->
+	classpath.entries.findAll { it instanceof ProjectDependency }.each {
+		// delete from original position
+		classpath.entries.remove(it)
+		// append to end of classpath
+		classpath.entries.add(it)
+	}
+}
+
 // Allow projects to be used as WPT modules
 eclipse.project.natures "org.eclipse.wst.common.project.facet.core.nature"
 
diff --git a/gradle/publish-maven.gradle b/gradle/publish-maven.gradle
index d47098b4f1..bcc7f4aeb8 100644
--- a/gradle/publish-maven.gradle
+++ b/gradle/publish-maven.gradle
@@ -43,7 +43,7 @@ def customizePom(pom, gradleProject) {
 				developer {
 					id = "jhoeller"
 					name = "Juergen Hoeller"
-					email = "jhoeller@vmware.com"
+					email = "jhoeller@gopivotal.com"
 				}
 			}
 		}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b6b646b0c0..0087cd3b18 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8281bd16ba..cdab2f66f1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 28 09:14:59 PST 2012
+#Wed Apr 30 13:06:57 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
diff --git a/settings.gradle b/settings.gradle
index 8c99e5a179..5a93a86fec 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,6 +22,7 @@ include "spring-web"
 include "spring-webmvc"
 include "spring-webmvc-portlet"
 include "spring-webmvc-tiles3"
+include "spring-framework-bom"
 
 // Exposes gradle buildSrc for IDE support
 include "buildSrc"
diff --git a/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java
index ffefed7eee..ed228bfa20 100644
--- a/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 import java.lang.reflect.Method;
 
 /**
- * A specialized type of MethodMatcher that takes into account introductions when
- * matching methods. If there are no introductions on the target class, a method
- * matcher may be able to optimize matching more effectively for example.
+ * A specialized type of {@link MethodMatcher} that takes into account introductions
+ * when matching methods. If there are no introductions on the target class,
+ * a method matcher may be able to optimize matching more effectively for example.
  *
  * @author Adrian Colyer
  * @since 2.0
@@ -39,6 +39,6 @@ public interface IntroductionAwareMethodMatcher extends MethodMatcher {
 	 * asking is the subject on one or more introductions; {@code false} otherwise
 	 * @return whether or not this method matches statically
 	 */
-	boolean matches(Method method, Class targetClass, boolean hasIntroductions);
+	boolean matches(Method method, Class<?> targetClass, boolean hasIntroductions);
 
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java
index 6ba69a833d..9f68b07424 100644
--- a/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java
+++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java
@@ -34,6 +34,6 @@ public interface IntroductionInfo {
 	 * Return the additional interfaces introduced by this Advisor or Advice.
 	 * @return the introduced interfaces
 	 */
-	Class[] getInterfaces();
+	Class<?>[] getInterfaces();
 
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
index 515358c3e3..06a85f1d02 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,9 +120,9 @@ public static JoinPoint currentJoinPoint() {
 	/** Non-null if after returning advice binds the return value */
 	private String returningName = null;
 
-	private Class discoveredReturningType = Object.class;
+	private Class<?> discoveredReturningType = Object.class;
 
-	private Class discoveredThrowingType = Object.class;
+	private Class<?> discoveredThrowingType = Object.class;
 
 	/**
 	 * Index for thisJoinPoint argument (currently only
@@ -238,7 +238,7 @@ public void setArgumentNames(String argNames) {
 		setArgumentNamesFromStringArray(tokens);
 	}
 
-	public void setArgumentNamesFromStringArray(String[] args) {
+	public void setArgumentNamesFromStringArray(String... args) {
 		this.argumentNames = new String[args.length];
 		for (int i = 0; i < args.length; i++) {
 			this.argumentNames[i] = StringUtils.trimWhitespace(args[i]);
@@ -251,7 +251,7 @@ public void setArgumentNamesFromStringArray(String[] args) {
 		if (argumentNames != null) {
 			if (aspectJAdviceMethod.getParameterTypes().length == argumentNames.length + 1) {
 				// May need to add implicit join point arg name...
-				Class firstArgType = aspectJAdviceMethod.getParameterTypes()[0];
+				Class<?> firstArgType = aspectJAdviceMethod.getParameterTypes()[0];
 				if (firstArgType == JoinPoint.class ||
 						firstArgType == ProceedingJoinPoint.class ||
 						firstArgType == JoinPoint.StaticPart.class) {
@@ -290,7 +290,7 @@ protected void setReturningNameNoCheck(String name) {
 		}
 	}
 
-	protected Class getDiscoveredReturningType() {
+	protected Class<?> getDiscoveredReturningType() {
 		return this.discoveredReturningType;
 	}
 
@@ -324,7 +324,7 @@ protected void setThrowingNameNoCheck(String name) {
 		}
 	}
 
-	protected Class getDiscoveredThrowingType() {
+	protected Class<?> getDiscoveredThrowingType() {
 		return this.discoveredThrowingType;
 	}
 
@@ -362,7 +362,7 @@ public synchronized final void calculateArgumentBindings() {
 		}
 
 		int numUnboundArgs = this.adviceInvocationArgumentCount;
-		Class[] parameterTypes = this.aspectJAdviceMethod.getParameterTypes();
+		Class<?>[] parameterTypes = this.aspectJAdviceMethod.getParameterTypes();
 		if (maybeBindJoinPoint(parameterTypes[0]) || maybeBindProceedingJoinPoint(parameterTypes[0])) {
 			numUnboundArgs--;
 		}
@@ -378,7 +378,7 @@ else if (maybeBindJoinPointStaticPart(parameterTypes[0])) {
 		this.argumentsIntrospected = true;
 	}
 
-	private boolean maybeBindJoinPoint(Class candidateParameterType) {
+	private boolean maybeBindJoinPoint(Class<?> candidateParameterType) {
 		if (candidateParameterType.equals(JoinPoint.class)) {
 			this.joinPointArgumentIndex = 0;
 			return true;
@@ -388,7 +388,7 @@ private boolean maybeBindJoinPoint(Class candidateParameterType) {
 		}
 	}
 
-	private boolean maybeBindProceedingJoinPoint(Class candidateParameterType) {
+	private boolean maybeBindProceedingJoinPoint(Class<?> candidateParameterType) {
 		if (candidateParameterType.equals(ProceedingJoinPoint.class)) {
 			if (!supportsProceedingJoinPoint()) {
 				throw new IllegalArgumentException("ProceedingJoinPoint is only supported for around advice");
@@ -405,7 +405,7 @@ protected boolean supportsProceedingJoinPoint() {
 		return false;
 	}
 
-	private boolean maybeBindJoinPointStaticPart(Class candidateParameterType) {
+	private boolean maybeBindJoinPointStaticPart(Class<?> candidateParameterType) {
 		if (candidateParameterType.equals(JoinPoint.StaticPart.class)) {
 			this.joinPointStaticPartArgumentIndex = 0;
 			return true;
@@ -509,8 +509,8 @@ private void configurePointcutParameters(int argumentIndexOffset) {
 			numParametersToRemove++;
 		}
 		String[] pointcutParameterNames = new String[this.argumentNames.length - numParametersToRemove];
-		Class[] pointcutParameterTypes = new Class[pointcutParameterNames.length];
-		Class[] methodParameterTypes = this.aspectJAdviceMethod.getParameterTypes();
+		Class<?>[] pointcutParameterTypes = new Class<?>[pointcutParameterNames.length];
+		Class<?>[] methodParameterTypes = this.aspectJAdviceMethod.getParameterTypes();
 
 		int index = 0;
 		for (int i = 0; i < this.argumentNames.length; i++) {
@@ -678,7 +678,7 @@ public AdviceExcludingMethodMatcher(Method adviceMethod) {
 			this.adviceMethod = adviceMethod;
 		}
 
-		public boolean matches(Method method, Class targetClass) {
+		public boolean matches(Method method, Class<?> targetClass) {
 			return !this.adviceMethod.equals(method);
 		}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
index e14f254612..402dfb9ebc 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -29,7 +30,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.aspectj.weaver.BCException;
 import org.aspectj.weaver.patterns.NamePattern;
-import org.aspectj.weaver.reflect.ReflectionWorld;
 import org.aspectj.weaver.reflect.ReflectionWorld.ReflectionWorldException;
 import org.aspectj.weaver.reflect.ShadowMatchImpl;
 import org.aspectj.weaver.tools.ContextBasedMatcher;
@@ -42,6 +42,7 @@
 import org.aspectj.weaver.tools.PointcutParser;
 import org.aspectj.weaver.tools.PointcutPrimitive;
 import org.aspectj.weaver.tools.ShadowMatch;
+
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.IntroductionAwareMethodMatcher;
 import org.springframework.aop.MethodMatcher;
@@ -55,6 +56,7 @@
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
@@ -98,14 +100,16 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 
 	private static final Log logger = LogFactory.getLog(AspectJExpressionPointcut.class);
 
-	private Class pointcutDeclarationScope;
+	private Class<?> pointcutDeclarationScope;
 
 	private String[] pointcutParameterNames = new String[0];
 
-	private Class[] pointcutParameterTypes = new Class[0];
+	private Class<?>[] pointcutParameterTypes = new Class<?>[0];
 
 	private BeanFactory beanFactory;
 
+	private transient ClassLoader pointcutClassLoader;
+
 	private transient PointcutExpression pointcutExpression;
 
 	private transient Map<Method, ShadowMatch> shadowMatchCache = new ConcurrentHashMap<Method, ShadowMatch>(32);
@@ -123,7 +127,7 @@ public AspectJExpressionPointcut() {
 	 * @param paramNames the parameter names for the pointcut
 	 * @param paramTypes the parameter types for the pointcut
 	 */
-	public AspectJExpressionPointcut(Class declarationScope, String[] paramNames, Class[] paramTypes) {
+	public AspectJExpressionPointcut(Class<?> declarationScope, String[] paramNames, Class<?>[] paramTypes) {
 		this.pointcutDeclarationScope = declarationScope;
 		if (paramNames.length != paramTypes.length) {
 			throw new IllegalStateException(
@@ -137,21 +141,21 @@ public AspectJExpressionPointcut(Class declarationScope, String[] paramNames, Cl
 	/**
 	 * Set the declaration scope for the pointcut.
 	 */
-	public void setPointcutDeclarationScope(Class pointcutDeclarationScope) {
+	public void setPointcutDeclarationScope(Class<?> pointcutDeclarationScope) {
 		this.pointcutDeclarationScope = pointcutDeclarationScope;
 	}
 
 	/**
 	 * Set the parameter names for the pointcut.
 	 */
-	public void setParameterNames(String[] names) {
+	public void setParameterNames(String... names) {
 		this.pointcutParameterNames = names;
 	}
 
 	/**
 	 * Set the parameter types for the pointcut.
 	 */
-	public void setParameterTypes(Class[] types) {
+	public void setParameterTypes(Class<?>... types) {
 		this.pointcutParameterTypes = types;
 	}
 
@@ -180,20 +184,13 @@ private void checkReadyToMatch() {
 			throw new IllegalStateException("Must set property 'expression' before attempting to match");
 		}
 		if (this.pointcutExpression == null) {
-			this.pointcutExpression = buildPointcutExpression();
+			this.pointcutClassLoader = (this.beanFactory instanceof ConfigurableBeanFactory ?
+					((ConfigurableBeanFactory) this.beanFactory).getBeanClassLoader() :
+					ClassUtils.getDefaultClassLoader());
+			this.pointcutExpression = buildPointcutExpression(this.pointcutClassLoader);
 		}
 	}
 
-	/**
-	 * Build the underlying AspectJ pointcut expression.
-	 */
-	private PointcutExpression buildPointcutExpression() {
-		ClassLoader cl = (this.beanFactory instanceof ConfigurableBeanFactory ? ((ConfigurableBeanFactory) this.beanFactory)
-				.getBeanClassLoader() : Thread.currentThread()
-				.getContextClassLoader());
-		return buildPointcutExpression(cl);
-	}
-
 	/**
 	 * Build the underlying AspectJ pointcut expression.
 	 */
@@ -202,11 +199,9 @@ private PointcutExpression buildPointcutExpression(ClassLoader classLoader) {
 		PointcutParameter[] pointcutParameters = new PointcutParameter[this.pointcutParameterNames.length];
 		for (int i = 0; i < pointcutParameters.length; i++) {
 			pointcutParameters[i] = parser.createPointcutParameter(
-					this.pointcutParameterNames[i],
-					this.pointcutParameterTypes[i]);
+					this.pointcutParameterNames[i], this.pointcutParameterTypes[i]);
 		}
-		return parser.parsePointcutExpression(
-				replaceBooleanOperators(getExpression()),
+		return parser.parsePointcutExpression(replaceBooleanOperators(getExpression()),
 				this.pointcutDeclarationScope, pointcutParameters);
 	}
 
@@ -244,30 +239,28 @@ public PointcutExpression getPointcutExpression() {
 		return this.pointcutExpression;
 	}
 
-	public boolean matches(Class targetClass) {
+	public boolean matches(Class<?> targetClass) {
 		checkReadyToMatch();
 		try {
-			return this.pointcutExpression.couldMatchJoinPointsInType(targetClass);
-		} catch (ReflectionWorldException e) {
-			logger.debug("PointcutExpression matching rejected target class", e);
 			try {
-				// Actually this is still a "maybe" - treat the pointcut as dynamic if we
-				// don't know enough yet
-				return getFallbackPointcutExpression(targetClass).couldMatchJoinPointsInType(targetClass);
-			} catch (BCException ex) {
-				logger.debug(
-						"Fallback PointcutExpression matching rejected target class",
-						ex);
-				return false;
+				return this.pointcutExpression.couldMatchJoinPointsInType(targetClass);
+			}
+			catch (ReflectionWorldException ex) {
+				logger.debug("PointcutExpression matching rejected target class - trying fallback expression", ex);
+				// Actually this is still a "maybe" - treat the pointcut as dynamic if we don't know enough yet
+				PointcutExpression fallbackExpression = getFallbackPointcutExpression(targetClass);
+				if (fallbackExpression != null) {
+					return fallbackExpression.couldMatchJoinPointsInType(targetClass);
+				}
 			}
 		}
 		catch (BCException ex) {
 			logger.debug("PointcutExpression matching rejected target class", ex);
-			return false;
 		}
+		return false;
 	}
 
-	public boolean matches(Method method, Class targetClass, boolean beanHasIntroductions) {
+	public boolean matches(Method method, Class<?> targetClass, boolean beanHasIntroductions) {
 		checkReadyToMatch();
 		Method targetMethod = AopUtils.getMostSpecificMethod(method, targetClass);
 		ShadowMatch shadowMatch = getShadowMatch(targetMethod, method);
@@ -283,11 +276,19 @@ else if (shadowMatch.neverMatches()) {
 		}
 		else {
 			// the maybe case
-			return (beanHasIntroductions || matchesIgnoringSubtypes(shadowMatch) || matchesTarget(shadowMatch, targetClass));
+			if (beanHasIntroductions) {
+				return true;
+			}
+			// A match test returned maybe - if there are any subtype sensitive variables
+			// involved in the test (this, target, at_this, at_target, at_annotation) then
+			// we say this is not a match as in Spring there will never be a different
+			// runtime subtype.
+			RuntimeTestWalker walker = getRuntimeTestWalker(shadowMatch);
+			return (!walker.testsSubtypeSensitiveVars() || walker.testTargetInstanceOfResidue(targetClass));
 		}
 	}
 
-	public boolean matches(Method method, Class targetClass) {
+	public boolean matches(Method method, Class<?> targetClass) {
 		return matches(method, targetClass, false);
 	}
 
@@ -296,7 +297,7 @@ public boolean isRuntime() {
 		return this.pointcutExpression.mayNeedDynamicTest();
 	}
 
-	public boolean matches(Method method, Class targetClass, Object[] args) {
+	public boolean matches(Method method, Class<?> targetClass, Object[] args) {
 		checkReadyToMatch();
 		ShadowMatch shadowMatch = getShadowMatch(AopUtils.getMostSpecificMethod(method, targetClass), method);
 		ShadowMatch originalShadowMatch = getShadowMatch(method, method);
@@ -318,64 +319,67 @@ public boolean matches(Method method, Class targetClass, Object[] args) {
 		catch (IllegalStateException ex) {
 			// No current invocation...
 			// TODO: Should we really proceed here?
-			logger.debug("Couldn't access current invocation - matching with limited context: " + ex);
-		}
-
-		JoinPointMatch joinPointMatch = shadowMatch.matchesJoinPoint(thisObject, targetObject, args);
-
-		/*
-		 * Do a final check to see if any this(TYPE) kind of residue match. For
-		 * this purpose, we use the original method's (proxy method's) shadow to
-		 * ensure that 'this' is correctly checked against. Without this check,
-		 * we get incorrect match on this(TYPE) where TYPE matches the target
-		 * type but not 'this' (as would be the case of JDK dynamic proxies).
-		 * <p>See SPR-2979 for the original bug.
-		 */
-		if (pmi != null) {  // there is a current invocation
-			RuntimeTestWalker originalMethodResidueTest = getRuntimeTestWalker(originalShadowMatch);
-			if (!originalMethodResidueTest.testThisInstanceOfResidue(thisObject.getClass())) {
-				return false;
+			if (logger.isDebugEnabled()) {
+				logger.debug("Could not access current invocation - matching with limited context: " + ex);
 			}
 		}
-		if (joinPointMatch.matches() && pmi != null) {
-			bindParameters(pmi, joinPointMatch);
+
+		try {
+			JoinPointMatch joinPointMatch = shadowMatch.matchesJoinPoint(thisObject, targetObject, args);
+
+			/*
+			 * Do a final check to see if any this(TYPE) kind of residue match. For
+			 * this purpose, we use the original method's (proxy method's) shadow to
+			 * ensure that 'this' is correctly checked against. Without this check,
+			 * we get incorrect match on this(TYPE) where TYPE matches the target
+			 * type but not 'this' (as would be the case of JDK dynamic proxies).
+			 * <p>See SPR-2979 for the original bug.
+			 */
+			if (pmi != null) {  // there is a current invocation
+				RuntimeTestWalker originalMethodResidueTest = getRuntimeTestWalker(originalShadowMatch);
+				if (!originalMethodResidueTest.testThisInstanceOfResidue(thisObject.getClass())) {
+					return false;
+				}
+				if (joinPointMatch.matches()) {
+					bindParameters(pmi, joinPointMatch);
+				}
+			}
+
+			return joinPointMatch.matches();
+		}
+		catch (Throwable ex) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Failed to evaluate join point for arguments " + Arrays.asList(args) +
+						" - falling back to non-match", ex);
+			}
+			return false;
 		}
-		return joinPointMatch.matches();
 	}
 
-
 	protected String getCurrentProxiedBeanName() {
 		return ProxyCreationContext.getCurrentProxiedBeanName();
 	}
 
 
 	/**
-	 * Get a new pointcut expression based on a target class's loader, rather
-	 * than the default.
+	 * Get a new pointcut expression based on a target class's loader rather than the default.
 	 */
-	private PointcutExpression getFallbackPointcutExpression(
-			Class<?> targetClass) {
-		ClassLoader classLoader = targetClass.getClassLoader();
-		return classLoader == null ? this.pointcutExpression : buildPointcutExpression(classLoader);
-	}
-
-	/**
-	 * A match test returned maybe - if there are any subtype sensitive variables
-	 * involved in the test (this, target, at_this, at_target, at_annotation) then
-	 * we say this is not a match as in Spring there will never be a different
-	 * runtime subtype.
-	 */
-	private boolean matchesIgnoringSubtypes(ShadowMatch shadowMatch) {
-		return !(getRuntimeTestWalker(shadowMatch).testsSubtypeSensitiveVars());
-	}
-
-	private boolean matchesTarget(ShadowMatch shadowMatch, Class targetClass) {
-		return getRuntimeTestWalker(shadowMatch).testTargetInstanceOfResidue(targetClass);
+	private PointcutExpression getFallbackPointcutExpression(Class<?> targetClass) {
+		try {
+			ClassLoader classLoader = targetClass.getClassLoader();
+			if (classLoader != null && classLoader != this.pointcutClassLoader) {
+				return buildPointcutExpression(classLoader);
+			}
+		}
+		catch (Throwable ex) {
+			logger.debug("Failed to create fallback PointcutExpression", ex);
+		}
+		return null;
 	}
 
 	private RuntimeTestWalker getRuntimeTestWalker(ShadowMatch shadowMatch) {
 		if (shadowMatch instanceof DefensiveShadowMatch) {
-			return new RuntimeTestWalker(((DefensiveShadowMatch)shadowMatch).primary);
+			return new RuntimeTestWalker(((DefensiveShadowMatch) shadowMatch).primary);
 		}
 		return new RuntimeTestWalker(shadowMatch);
 	}
@@ -396,44 +400,51 @@ private ShadowMatch getShadowMatch(Method targetMethod, Method originalMethod) {
 		if (shadowMatch == null) {
 			synchronized (this.shadowMatchCache) {
 				// Not found - now check again with full lock...
+				PointcutExpression fallbackExpression = null;
 				Method methodToMatch = targetMethod;
-				PointcutExpression fallbackPointcutExpression = null;
-				shadowMatch = this.shadowMatchCache.get(methodToMatch);
+				shadowMatch = this.shadowMatchCache.get(targetMethod);
 				if (shadowMatch == null) {
 					try {
-						shadowMatch = this.pointcutExpression.matchesMethodExecution(targetMethod);
+						shadowMatch = this.pointcutExpression.matchesMethodExecution(methodToMatch);
 					}
-					catch (ReflectionWorld.ReflectionWorldException ex) {
+					catch (ReflectionWorldException ex) {
 						// Failed to introspect target method, probably because it has been loaded
-						// in a special ClassLoader. Let's try the original method instead...
+						// in a special ClassLoader. Let's try the declaring ClassLoader instead...
 						try {
-							fallbackPointcutExpression = getFallbackPointcutExpression(methodToMatch.getDeclaringClass());
-							shadowMatch = fallbackPointcutExpression.matchesMethodExecution(methodToMatch);
-						} catch (ReflectionWorld.ReflectionWorldException e) {
-							if (targetMethod == originalMethod) {
-								shadowMatch = new ShadowMatchImpl(org.aspectj.util.FuzzyBoolean.NO, null, null, null);
+							fallbackExpression = getFallbackPointcutExpression(methodToMatch.getDeclaringClass());
+							if (fallbackExpression != null) {
+								shadowMatch = fallbackExpression.matchesMethodExecution(methodToMatch);
 							}
-							else {
-								try {
-									shadowMatch = this.pointcutExpression.matchesMethodExecution(originalMethod);
-								}
-								catch (ReflectionWorld.ReflectionWorldException ex2) {
-									// Could neither introspect the target class nor the proxy class ->
-									// let's simply consider this method as non-matching.
-									methodToMatch = originalMethod;
-									fallbackPointcutExpression = getFallbackPointcutExpression(methodToMatch.getDeclaringClass());
-									try {
-										shadowMatch = fallbackPointcutExpression.matchesMethodExecution(methodToMatch);
-									} catch (ReflectionWorld.ReflectionWorldException e2) {
-										shadowMatch = new ShadowMatchImpl(org.aspectj.util.FuzzyBoolean.NO, null, null, null);
-									}
+						}
+						catch (ReflectionWorldException ex2) {
+							fallbackExpression = null;
+						}
+					}
+					if (shadowMatch == null && targetMethod != originalMethod) {
+						methodToMatch = originalMethod;
+						try {
+							shadowMatch = this.pointcutExpression.matchesMethodExecution(methodToMatch);
+						}
+						catch (ReflectionWorldException ex3) {
+							// Could neither introspect the target class nor the proxy class ->
+							// let's try the original method's declaring class before we give up...
+							try {
+								fallbackExpression = getFallbackPointcutExpression(methodToMatch.getDeclaringClass());
+								if (fallbackExpression != null) {
+									shadowMatch = fallbackExpression.matchesMethodExecution(methodToMatch);
 								}
 							}
+							catch (ReflectionWorldException ex4) {
+								fallbackExpression = null;
+							}
 						}
 					}
-					if (shadowMatch.maybeMatches() && fallbackPointcutExpression!=null) {
+					if (shadowMatch == null) {
+						shadowMatch = new ShadowMatchImpl(org.aspectj.util.FuzzyBoolean.NO, null, null, null);
+					}
+					else if (shadowMatch.maybeMatches() && fallbackExpression != null) {
 						shadowMatch = new DefensiveShadowMatch(shadowMatch,
-								fallbackPointcutExpression.matchesMethodExecution(methodToMatch));
+								fallbackExpression.matchesMethodExecution(methodToMatch));
 					}
 					this.shadowMatchCache.put(targetMethod, shadowMatch);
 				}
@@ -551,7 +562,7 @@ public boolean mayNeedDynamicTest() {
 			return false;
 		}
 
-		private FuzzyBoolean contextMatch(Class targetType) {
+		private FuzzyBoolean contextMatch(Class<?> targetType) {
 			String advisedBeanName = getCurrentProxiedBeanName();
 			if (advisedBeanName == null) {  // no proxy creation in progress
 				// abstain; can't return YES, since that will make pointcut with negation fail
@@ -601,9 +612,11 @@ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFound
 		this.shadowMatchCache = new ConcurrentHashMap<Method, ShadowMatch>(32);
 	}
 
+
 	private static class DefensiveShadowMatch implements ShadowMatch {
 
 		private final ShadowMatch primary;
+
 		private final ShadowMatch other;
 
 		public DefensiveShadowMatch(ShadowMatch primary, ShadowMatch other) {
@@ -612,31 +625,30 @@ public DefensiveShadowMatch(ShadowMatch primary, ShadowMatch other) {
 		}
 
 		public boolean alwaysMatches() {
-			return primary.alwaysMatches();
+			return this.primary.alwaysMatches();
 		}
 
 		public boolean maybeMatches() {
-			return primary.maybeMatches();
+			return this.primary.maybeMatches();
 		}
 
 		public boolean neverMatches() {
-			return primary.neverMatches();
+			return this.primary.neverMatches();
 		}
 
-		public JoinPointMatch matchesJoinPoint(Object thisObject,
-				Object targetObject, Object[] args) {
+		public JoinPointMatch matchesJoinPoint(Object thisObject, Object targetObject, Object[] args) {
 			try {
-				return primary.matchesJoinPoint(thisObject, targetObject, args);
-			} catch (ReflectionWorldException e) {
-				return other.matchesJoinPoint(thisObject, targetObject, args);
+				return this.primary.matchesJoinPoint(thisObject, targetObject, args);
+			}
+			catch (ReflectionWorldException ex) {
+				return this.other.matchesJoinPoint(thisObject, targetObject, args);
 			}
 		}
 
 		public void setMatchingContext(MatchingContext aMatchContext) {
-			primary.setMatchingContext(aMatchContext);
-			other.setMatchingContext(aMatchContext);
+			this.primary.setMatchingContext(aMatchContext);
+			this.other.setMatchingContext(aMatchContext);
 		}
-
 	}
 
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java
index 70b6575076..09f2017b39 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,24 +39,24 @@ public void setExpression(String expression) {
 		this.pointcut.setExpression(expression);
 	}
 
-	public void setLocation(String location) {
-		this.pointcut.setLocation(location);
-	}
-
-	public void setParameterTypes(Class[] types) {
-		this.pointcut.setParameterTypes(types);
+	public String getExpression() {
+		return this.pointcut.getExpression();
 	}
 
-	public void setParameterNames(String[] names) {
-		this.pointcut.setParameterNames(names);
+	public void setLocation(String location) {
+		this.pointcut.setLocation(location);
 	}
 
 	public String getLocation() {
 		return this.pointcut.getLocation();
 	}
 
-	public String getExpression() {
-		return this.pointcut.getExpression();
+	public void setParameterTypes(Class<?>[] types) {
+		this.pointcut.setParameterTypes(types);
+	}
+
+	public void setParameterNames(String... names) {
+		this.pointcut.setParameterNames(names);
 	}
 
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java
index 678c87baeb..018c2dc1c7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java
@@ -45,43 +45,41 @@ public class AspectJWeaverMessageHandler implements IMessageHandler {
 
 	private static final String AJ_ID = "[AspectJ] ";
 
-	private static final Log LOGGER = LogFactory.getLog("AspectJ Weaver");
+	private static final Log logger = LogFactory.getLog("AspectJ Weaver");
 
 
 	public boolean handleMessage(IMessage message) throws AbortException {
 		Kind messageKind = message.getKind();
-
 		if (messageKind == IMessage.DEBUG) {
-			if (LOGGER.isDebugEnabled() || LOGGER.isTraceEnabled()) {
-				LOGGER.debug(makeMessageFor(message));
+			if (logger.isDebugEnabled()) {
+				logger.debug(makeMessageFor(message));
 				return true;
 			}
 		}
-		else if ((messageKind == IMessage.INFO) || (messageKind == IMessage.WEAVEINFO)) {
-			if (LOGGER.isInfoEnabled()) {
-				LOGGER.info(makeMessageFor(message));
+		else if (messageKind == IMessage.INFO || messageKind == IMessage.WEAVEINFO) {
+			if (logger.isInfoEnabled()) {
+				logger.info(makeMessageFor(message));
 				return true;
 			}
 		}
 		else if (messageKind == IMessage.WARNING) {
-			if (LOGGER.isWarnEnabled()) {
-				LOGGER.warn(makeMessageFor(message));
+			if (logger.isWarnEnabled()) {
+				logger.warn(makeMessageFor(message));
 				return true;
 			}
 		}
 		else if (messageKind == IMessage.ERROR) {
-			if (LOGGER.isErrorEnabled()) {
-				LOGGER.error(makeMessageFor(message));
+			if (logger.isErrorEnabled()) {
+				logger.error(makeMessageFor(message));
 				return true;
 			}
 		}
 		else if (messageKind == IMessage.ABORT) {
-			if (LOGGER.isFatalEnabled()) {
-				LOGGER.fatal(makeMessageFor(message));
+			if (logger.isFatalEnabled()) {
+				logger.fatal(makeMessageFor(message));
 				return true;
 			}
 		}
-
 		return false;
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java
index 27618c9b46..b437755ec1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java
@@ -34,7 +34,7 @@
  */
 public class DeclareParentsAdvisor implements IntroductionAdvisor {
 
-	private final Class introducedInterface;
+	private final Class<?> introducedInterface;
 
 	private final ClassFilter typePatternClassFilter;
 
@@ -47,7 +47,7 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor {
 	 * @param typePattern type pattern the introduction is restricted to
 	 * @param defaultImpl the default implementation class
 	 */
-	public DeclareParentsAdvisor(Class interfaceType, String typePattern, Class defaultImpl) {
+	public DeclareParentsAdvisor(Class<?> interfaceType, String typePattern, Class<?> defaultImpl) {
 		this(interfaceType, typePattern, defaultImpl,
 			 new DelegatePerTargetObjectIntroductionInterceptor(defaultImpl, interfaceType));
 	}
@@ -58,7 +58,7 @@ public DeclareParentsAdvisor(Class interfaceType, String typePattern, Class defa
 	 * @param typePattern type pattern the introduction is restricted to
 	 * @param delegateRef the delegate implementation object
 	 */
-	public DeclareParentsAdvisor(Class interfaceType, String typePattern, Object delegateRef) {
+	public DeclareParentsAdvisor(Class<?> interfaceType, String typePattern, Object delegateRef) {
 		this(interfaceType, typePattern, delegateRef.getClass(),
 			 new DelegatingIntroductionInterceptor(delegateRef));
 	}
@@ -71,13 +71,13 @@ public DeclareParentsAdvisor(Class interfaceType, String typePattern, Object del
 	 * @param implementationClass implementation class
 	 * @param advice delegation advice
 	 */
-	private DeclareParentsAdvisor(Class interfaceType, String typePattern, Class implementationClass, Advice advice) {
+	private DeclareParentsAdvisor(Class<?> interfaceType, String typePattern, Class<?> implementationClass, Advice advice) {
 		this.introducedInterface = interfaceType;
 		ClassFilter typePatternFilter = new TypePatternClassFilter(typePattern);
 
 		// Excludes methods implemented.
 		ClassFilter exclusion = new ClassFilter() {
-			public boolean matches(Class clazz) {
+			public boolean matches(Class<?> clazz) {
 				return !(introducedInterface.isAssignableFrom(clazz));
 			}
 		};
@@ -103,8 +103,8 @@ public Advice getAdvice() {
 		return this.advice;
 	}
 
-	public Class[] getInterfaces() {
-		return new Class[] {this.introducedInterface};
+	public Class<?>[] getInterfaces() {
+		return new Class<?>[] {this.introducedInterface};
 	}
 
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java
index fa470759cd..0b20e8dc6e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 
 import java.lang.reflect.Field;
 
+import org.aspectj.weaver.ReferenceType;
+import org.aspectj.weaver.ReferenceTypeDelegate;
 import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.ast.And;
 import org.aspectj.weaver.ast.Call;
@@ -30,6 +32,7 @@
 import org.aspectj.weaver.ast.Or;
 import org.aspectj.weaver.ast.Test;
 import org.aspectj.weaver.internal.tools.MatchingContextBasedTest;
+import org.aspectj.weaver.reflect.ReflectionBasedReferenceTypeDelegate;
 import org.aspectj.weaver.reflect.ReflectionVar;
 import org.aspectj.weaver.reflect.ShadowMatchImpl;
 import org.aspectj.weaver.tools.ShadowMatch;
@@ -55,25 +58,36 @@
  */
 class RuntimeTestWalker {
 
-	private final Test runtimeTest;
+	private static final Field residualTestField;
 
+	private static final Field varTypeField;
 
-	public RuntimeTestWalker(ShadowMatch shadowMatch) {
-		ShadowMatchImpl shadowMatchImplementation = (ShadowMatchImpl) shadowMatch;
+	private static final Field myClassField;
+
+
+	static {
 		try {
-			Field testField = shadowMatchImplementation.getClass().getDeclaredField("residualTest");
-			ReflectionUtils.makeAccessible(testField);
-			this.runtimeTest = (Test) testField.get(shadowMatch);
+			residualTestField = ShadowMatchImpl.class.getDeclaredField("residualTest");
+			varTypeField = ReflectionVar.class.getDeclaredField("varType");
+			myClassField = ReflectionBasedReferenceTypeDelegate.class.getDeclaredField("myClass");
 		}
-		catch (NoSuchFieldException noSuchFieldEx) {
+		catch (NoSuchFieldException ex) {
 			throw new IllegalStateException("The version of aspectjtools.jar / aspectjweaver.jar " +
-					"on the classpath is incompatible with this version of Spring: Expected field " +
-					"'runtimeTest' is not present on ShadowMatchImpl class.");
+					"on the classpath is incompatible with this version of Spring: " + ex);
+		}
+	}
+
+
+	private final Test runtimeTest;
+
+
+	public RuntimeTestWalker(ShadowMatch shadowMatch) {
+		try {
+			ReflectionUtils.makeAccessible(residualTestField);
+			this.runtimeTest = (Test) residualTestField.get(shadowMatch);
 		}
-		catch (IllegalAccessException illegalAccessEx) {
-			// Famous last words... but I don't see how this can happen given the
-			// makeAccessible call above
-			throw new IllegalStateException("Unable to access ShadowMatchImpl.residualTest field");
+		catch (IllegalAccessException ex) {
+			throw new IllegalStateException(ex);
 		}
 	}
 
@@ -87,12 +101,12 @@ public boolean testsSubtypeSensitiveVars() {
 				new SubtypeSensitiveVarTypeTestVisitor().testsSubtypeSensitiveVars(this.runtimeTest));
 	}
 
-	public boolean testThisInstanceOfResidue(Class thisClass) {
+	public boolean testThisInstanceOfResidue(Class<?> thisClass) {
 		return (this.runtimeTest != null &&
 				new ThisInstanceOfResidueTestVisitor(thisClass).thisInstanceOfMatches(this.runtimeTest));
 	}
 
-	public boolean testTargetInstanceOfResidue(Class targetClass) {
+	public boolean testTargetInstanceOfResidue(Class<?> targetClass) {
 		return (this.runtimeTest != null &&
 				new TargetInstanceOfResidueTestVisitor(targetClass).targetInstanceOfMatches(this.runtimeTest));
 	}
@@ -140,19 +154,11 @@ public void visit(MatchingContextBasedTest matchingContextTest) {
 
 		protected int getVarType(ReflectionVar v) {
 			try {
-				Field varTypeField = ReflectionVar.class.getDeclaredField("varType");
 				ReflectionUtils.makeAccessible(varTypeField);
 				return (Integer) varTypeField.get(v);
 			}
-			catch (NoSuchFieldException noSuchFieldEx) {
-				throw new IllegalStateException("the version of aspectjtools.jar / aspectjweaver.jar " +
-						"on the classpath is incompatible with this version of Spring:- expected field " +
-						"'varType' is not present on ReflectionVar class");
-			}
-			catch (IllegalAccessException illegalAccessEx) {
-				// Famous last words... but I don't see how this can happen given the
-				// makeAccessible call above
-				throw new IllegalStateException("Unable to access ReflectionVar.varType field");
+			catch (IllegalAccessException ex) {
+				throw new IllegalStateException(ex);
 			}
 		}
 	}
@@ -160,11 +166,13 @@ protected int getVarType(ReflectionVar v) {
 
 	private static abstract class InstanceOfResidueTestVisitor extends TestVisitorAdapter {
 
-		private Class matchClass;
+		private final Class<?> matchClass;
+
 		private boolean matches;
-		private int matchVarType;
 
-		public InstanceOfResidueTestVisitor(Class matchClass, boolean defaultMatches, int matchVarType) {
+		private final int matchVarType;
+
+		public InstanceOfResidueTestVisitor(Class<?> matchClass, boolean defaultMatches, int matchVarType) {
 			this.matchClass = matchClass;
 			this.matches = defaultMatches;
 			this.matchVarType = matchVarType;
@@ -172,19 +180,34 @@ public InstanceOfResidueTestVisitor(Class matchClass, boolean defaultMatches, in
 
 		public boolean instanceOfMatches(Test test) {
 			test.accept(this);
-			return matches;
+			return this.matches;
 		}
 
 		@Override
 		public void visit(Instanceof i) {
-			ResolvedType type = (ResolvedType) i.getType();
 			int varType = getVarType((ReflectionVar) i.getVar());
 			if (varType != this.matchVarType) {
 				return;
 			}
+			Class<?> typeClass = null;
+			ResolvedType type = (ResolvedType) i.getType();
+			if (type instanceof ReferenceType) {
+				ReferenceTypeDelegate delegate = ((ReferenceType) type).getDelegate();
+				if (delegate instanceof ReflectionBasedReferenceTypeDelegate) {
+					try {
+						ReflectionUtils.makeAccessible(myClassField);
+						typeClass = (Class<?>) myClassField.get(delegate);
+					}
+					catch (IllegalAccessException ex) {
+						throw new IllegalStateException(ex);
+					}
+				}
+			}
 			try {
-				Class typeClass = ClassUtils.forName(type.getName(), this.matchClass.getClassLoader());
-				// Don't use ReflectionType.isAssignableFrom() as it won't be aware of (Spring) mixins
+				// Don't use ResolvedType.isAssignableFrom() as it won't be aware of (Spring) mixins
+				if (typeClass == null) {
+					typeClass = ClassUtils.forName(type.getName(), this.matchClass.getClassLoader());
+				}
 				this.matches = typeClass.isAssignableFrom(this.matchClass);
 			}
 			catch (ClassNotFoundException ex) {
@@ -199,7 +222,7 @@ public void visit(Instanceof i) {
 	 */
 	private static class TargetInstanceOfResidueTestVisitor extends InstanceOfResidueTestVisitor {
 
-		public TargetInstanceOfResidueTestVisitor(Class targetClass) {
+		public TargetInstanceOfResidueTestVisitor(Class<?> targetClass) {
 			super(targetClass, false, TARGET_VAR);
 		}
 
@@ -214,7 +237,7 @@ public boolean targetInstanceOfMatches(Test test) {
 	 */
 	private static class ThisInstanceOfResidueTestVisitor extends InstanceOfResidueTestVisitor {
 
-		public ThisInstanceOfResidueTestVisitor(Class thisClass) {
+		public ThisInstanceOfResidueTestVisitor(Class<?> thisClass) {
 			super(thisClass, true, THIS_VAR);
 		}
 
@@ -228,8 +251,11 @@ public boolean thisInstanceOfMatches(Test test) {
 	private static class SubtypeSensitiveVarTypeTestVisitor extends TestVisitorAdapter {
 
 		private final Object thisObj = new Object();
+
 		private final Object targetObj = new Object();
+
 		private final Object[] argsObjs = new Object[0];
+
 		private boolean testsSubtypeSensitiveVars = false;
 
 		public boolean testsSubtypeSensitiveVars(Test aTest) {
@@ -240,8 +266,8 @@ public boolean testsSubtypeSensitiveVars(Test aTest) {
 		@Override
 		public void visit(Instanceof i) {
 			ReflectionVar v = (ReflectionVar) i.getVar();
-			Object varUnderTest = v.getBindingAtJoinPoint(thisObj,targetObj,argsObjs);
-			if ((varUnderTest == thisObj) || (varUnderTest == targetObj)) {
+			Object varUnderTest = v.getBindingAtJoinPoint(this.thisObj, this.targetObj, this.argsObjs);
+			if (varUnderTest == this.thisObj || varUnderTest == this.targetObj) {
 				this.testsSubtypeSensitiveVars = true;
 			}
 		}
@@ -251,7 +277,7 @@ public void visit(HasAnnotation hasAnn) {
 			// If you thought things were bad before, now we sink to new levels of horror...
 			ReflectionVar v = (ReflectionVar) hasAnn.getVar();
 			int varType = getVarType(v);
-				if ((varType == AT_THIS_VAR) || (varType == AT_TARGET_VAR) || (varType == AT_ANNOTATION_VAR)) {
+			if (varType == AT_THIS_VAR || varType == AT_TARGET_VAR || varType == AT_ANNOTATION_VAR) {
 				this.testsSubtypeSensitiveVars = true;
 			}
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java
index 9eff81682b..dce613ef5d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ public void setIncludePatterns(List<String> patterns) {
 	}
 
 	public void setAspectJAdvisorFactory(AspectJAdvisorFactory aspectJAdvisorFactory) {
-		Assert.notNull(this.aspectJAdvisorFactory, "AspectJAdvisorFactory must not be null");
+		Assert.notNull(aspectJAdvisorFactory, "AspectJAdvisorFactory must not be null");
 		this.aspectJAdvisorFactory = aspectJAdvisorFactory;
 	}
 
@@ -89,7 +89,7 @@ protected List<Advisor> findCandidateAdvisors() {
 	}
 
 	@Override
-	protected boolean isInfrastructureClass(Class beanClass) {
+	protected boolean isInfrastructureClass(Class<?> beanClass) {
 		// Previously we setProxyTargetClass(true) in the constructor, but that has too
 		// broad an impact. Instead we now override isInfrastructureClass to avoid proxying
 		// aspects. I'm not entirely happy with that as there is no good reason not
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java
index 81a6c2a3ad..02de8995ac 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,11 @@
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.beans.factory.support.AbstractBeanFactory;
 import org.springframework.core.Ordered;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.annotation.Order;
+import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -65,7 +68,9 @@ public BeanFactoryAspectInstanceFactory(BeanFactory beanFactory, String name) {
 	 * @param name the name of the bean
 	 * @param type the type that should be introspected by AspectJ
 	 */
-	public BeanFactoryAspectInstanceFactory(BeanFactory beanFactory, String name, Class type) {
+	public BeanFactoryAspectInstanceFactory(BeanFactory beanFactory, String name, Class<?> type) {
+		Assert.notNull(beanFactory, "BeanFactory must not be null");
+		Assert.notNull(name, "Bean name must not be null");
 		this.beanFactory = beanFactory;
 		this.name = name;
 		this.aspectMetadata = new AspectMetadata(type, name);
@@ -77,18 +82,31 @@ public Object getAspectInstance() {
 	}
 
 	public ClassLoader getAspectClassLoader() {
-		if (this.beanFactory instanceof ConfigurableBeanFactory) {
-			return ((ConfigurableBeanFactory) this.beanFactory).getBeanClassLoader();
-		}
-		else {
-			return ClassUtils.getDefaultClassLoader();
-		}
+		return (this.beanFactory instanceof ConfigurableBeanFactory ?
+				((ConfigurableBeanFactory) this.beanFactory).getBeanClassLoader() :
+				ClassUtils.getDefaultClassLoader());
 	}
 
 	public AspectMetadata getAspectMetadata() {
 		return this.aspectMetadata;
 	}
 
+	public Object getAspectCreationMutex() {
+		if (this.beanFactory != null) {
+			if (this.beanFactory.isSingleton(this.name)) {
+				// Rely on singleton semantics provided by the factory -> no local lock.
+				return null;
+			}
+			else if (this.beanFactory instanceof AbstractBeanFactory) {
+				// No singleton guarantees from the factory -> let's lock locally but
+				// reuse the factory's singleton lock, just in case a lazy dependency
+				// of our advice bean happens to trigger the singleton lock implicitly...
+				return ((AbstractBeanFactory) this.beanFactory).getSingletonMutex();
+			}
+		}
+		return this;
+	}
+
 	/**
 	 * Determine the order for this factory's target aspect, either
 	 * an instance-specific order expressed through implementing the
@@ -105,7 +123,7 @@ public int getOrder() {
 			if (Ordered.class.isAssignableFrom(type) && this.beanFactory.isSingleton(this.name)) {
 				return ((Ordered) this.beanFactory.getBean(this.name)).getOrder();
 			}
-			Order order = type.getAnnotation(Order.class);
+			Order order = AnnotationUtils.findAnnotation(type, Order.class);
 			if (order != null) {
 				return order.value();
 			}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/LazySingletonAspectInstanceFactoryDecorator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/LazySingletonAspectInstanceFactoryDecorator.java
index 39d28fff7e..df5a628b5e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/LazySingletonAspectInstanceFactoryDecorator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/LazySingletonAspectInstanceFactoryDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,11 +42,20 @@ public LazySingletonAspectInstanceFactoryDecorator(MetadataAwareAspectInstanceFa
 	}
 
 
-	public synchronized Object getAspectInstance() {
+	public Object getAspectInstance() {
 		if (this.materialized == null) {
-			synchronized (this) {
-				if (this.materialized == null) {
-					this.materialized = this.maaif.getAspectInstance();
+			Object mutex = this;
+			if (this.maaif instanceof BeanFactoryAspectInstanceFactory) {
+				mutex = ((BeanFactoryAspectInstanceFactory) this.maaif).getAspectCreationMutex();
+			}
+			if (mutex == null) {
+				this.materialized = this.maaif.getAspectInstance();
+			}
+			else {
+				synchronized (mutex) {
+					if (this.materialized == null) {
+						this.materialized = this.maaif.getAspectInstance();
+					}
 				}
 			}
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java
index bb623b372b..0117030dc2 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import org.springframework.aop.aspectj.SimpleAspectInstanceFactory;
 import org.springframework.core.Ordered;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.annotation.Order;
 
 /**
@@ -58,7 +59,7 @@ public final AspectMetadata getAspectMetadata() {
 	 */
 	@Override
 	protected int getOrderForAspectClass(Class<?> aspectClass) {
-		Order order = aspectClass.getAnnotation(Order.class);
+		Order order = AnnotationUtils.findAnnotation(aspectClass, Order.class);
 		if (order != null) {
 			return order.value();
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java
index ef9014a144..6c079dbfa6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import org.springframework.aop.aspectj.SingletonAspectInstanceFactory;
 import org.springframework.core.Ordered;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.annotation.Order;
 
 /**
@@ -59,7 +60,7 @@ public final AspectMetadata getAspectMetadata() {
 	 */
 	@Override
 	protected int getOrderForAspectClass(Class<?> aspectClass) {
-		Order order = aspectClass.getAnnotation(Order.class);
+		Order order = AnnotationUtils.findAnnotation(aspectClass, Order.class);
 		if (order != null) {
 			return order.value();
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java
index 01b0fe856c..c15baa504d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig
 	 */
 	private int order = Ordered.LOWEST_PRECEDENCE;
 
-	private final Map<Class, Boolean> eligibleBeans = new ConcurrentHashMap<Class, Boolean>(64);
+	private final Map<Class<?>, Boolean> eligibleBeans = new ConcurrentHashMap<Class<?>, Boolean>(64);
 
 
 	/**
@@ -87,9 +87,11 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
 			// Ignore AOP infrastructure such as scoped proxies.
 			return bean;
 		}
-		if (isEligible(bean, beanName)) {
-			if (bean instanceof Advised) {
-				Advised advised = (Advised) bean;
+
+		if (bean instanceof Advised) {
+			Advised advised = (Advised) bean;
+			if (!advised.isFrozen() && isEligible(AopUtils.getTargetClass(bean))) {
+				// Add our local Advisor to the existing proxy's Advisor chain...
 				if (this.beforeExistingAdvisors) {
 					advised.addAdvisor(0, this.advisor);
 				}
@@ -98,32 +100,47 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
 				}
 				return bean;
 			}
-			else {
-				ProxyFactory proxyFactory = new ProxyFactory(bean);
-				// Copy our properties (proxyTargetClass etc) inherited from ProxyConfig.
-				proxyFactory.copyFrom(this);
-				proxyFactory.addAdvisor(this.advisor);
-				return proxyFactory.getProxy(this.beanClassLoader);
-			}
 		}
-		else {
-			// No async proxy needed.
-			return bean;
+
+		if (isEligible(bean, beanName)) {
+			ProxyFactory proxyFactory = new ProxyFactory(bean);
+			// Copy our properties (proxyTargetClass etc) inherited from ProxyConfig.
+			proxyFactory.copyFrom(this);
+			proxyFactory.addAdvisor(this.advisor);
+			return proxyFactory.getProxy(this.beanClassLoader);
 		}
+
+		// No async proxy needed.
+		return bean;
 	}
 
 	/**
 	 * Check whether the given bean is eligible for advising with this
 	 * post-processor's {@link Advisor}.
-	 * <p>Implements caching of {@code canApply} results per bean target class.
+	 * <p>Delegates to {@link #isEligible(Class)} for target class checking.
 	 * Can be overridden e.g. to specifically exclude certain beans by name.
+	 * <p>Note: Only called for regular bean instances but not for existing
+	 * proxy instances which implement {@link Advised} and allow for adding
+	 * the local {@link Advisor} to the existing proxy's {@link Advisor} chain.
+	 * For the latter, {@link #isEligible(Class)} is being called directly,
+	 * with the actual target class behind the existing proxy (as determined
+	 * by {@link AopUtils#getTargetClass(Object)}).
 	 * @param bean the bean instance
 	 * @param beanName the name of the bean
-	 * @see AopUtils#getTargetClass(Object)
-	 * @see AopUtils#canApply(Advisor, Class)
+	 * @see #isEligible(Class)
 	 */
 	protected boolean isEligible(Object bean, String beanName) {
-		Class<?> targetClass = AopUtils.getTargetClass(bean);
+		return isEligible(bean.getClass());
+	}
+
+	/**
+	 * Check whether the given class is eligible for advising with this
+	 * post-processor's {@link Advisor}.
+	 * <p>Implements caching of {@code canApply} results per bean target class.
+	 * @param targetClass the class to check against
+	 * @see AopUtils#canApply(Advisor, Class)
+	 */
+	protected boolean isEligible(Class<?> targetClass) {
 		Boolean eligible = this.eligibleBeans.get(targetClass);
 		if (eligible != null) {
 			return eligible;
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java b/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java
index 3c822cf2da..232e2ebc39 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,13 +52,13 @@ public interface Advised extends TargetClassAware {
 	 * Return the interfaces proxied by the AOP proxy. Will not
 	 * include the target class, which may also be proxied.
 	 */
-	Class[] getProxiedInterfaces();
+	Class<?>[] getProxiedInterfaces();
 
 	/**
 	 * Determine whether the given interface is proxied.
 	 * @param intf the interface to check
 	 */
-	boolean isInterfaceProxied(Class intf);
+	boolean isInterfaceProxied(Class<?> intf);
 
 
 	/**
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
index e5f89177b6..2d6f4b7eb0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -158,7 +158,7 @@ public TargetSource getTargetSource() {
 	 * @see #setTargetSource
 	 * @see #setTarget
 	 */
-	public void setTargetClass(Class targetClass) {
+	public void setTargetClass(Class<?> targetClass) {
 		this.targetSource = EmptyTargetSource.forClass(targetClass);
 	}
 
@@ -194,7 +194,7 @@ public AdvisorChainFactory getAdvisorChainFactory() {
 	/**
 	 * Set the interfaces to be proxied.
 	 */
-	public void setInterfaces(Class[] interfaces) {
+	public void setInterfaces(Class<?>... interfaces) {
 		Assert.notNull(interfaces, "Interfaces must not be null");
 		this.interfaces.clear();
 		for (Class ifc : interfaces) {
@@ -206,7 +206,7 @@ public void setInterfaces(Class[] interfaces) {
 	 * Add a new proxied interface.
 	 * @param intf the additional interface to proxy
 	 */
-	public void addInterface(Class intf) {
+	public void addInterface(Class<?> intf) {
 		Assert.notNull(intf, "Interface must not be null");
 		if (!intf.isInterface()) {
 			throw new IllegalArgumentException("[" + intf.getName() + "] is not an interface");
@@ -224,15 +224,15 @@ public void addInterface(Class intf) {
 	 * @return {@code true} if the interface was removed; {@code false}
 	 * if the interface was not found and hence could not be removed
 	 */
-	public boolean removeInterface(Class intf) {
+	public boolean removeInterface(Class<?> intf) {
 		return this.interfaces.remove(intf);
 	}
 
-	public Class[] getProxiedInterfaces() {
+	public Class<?>[] getProxiedInterfaces() {
 		return this.interfaces.toArray(new Class[this.interfaces.size()]);
 	}
 
-	public boolean isInterfaceProxied(Class intf) {
+	public boolean isInterfaceProxied(Class<?> intf) {
 		for (Class proxyIntf : this.interfaces) {
 			if (intf.isAssignableFrom(proxyIntf)) {
 				return true;
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
index 5801458ff0..8c1e1246b1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,27 +25,28 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.springframework.cglib.core.CodeGenerationException;
-import org.springframework.cglib.proxy.Callback;
-import org.springframework.cglib.proxy.CallbackFilter;
-import org.springframework.cglib.proxy.Dispatcher;
-import org.springframework.cglib.proxy.Enhancer;
-import org.springframework.cglib.proxy.Factory;
-import org.springframework.cglib.proxy.MethodInterceptor;
-import org.springframework.cglib.proxy.MethodProxy;
-import org.springframework.cglib.proxy.NoOp;
-import org.springframework.cglib.transform.impl.UndeclaredThrowableStrategy;
-
 import org.aopalliance.aop.Advice;
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.aop.Advisor;
 import org.springframework.aop.AopInvocationException;
 import org.springframework.aop.PointcutAdvisor;
 import org.springframework.aop.RawTargetAccess;
 import org.springframework.aop.TargetSource;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.cglib.core.CodeGenerationException;
+import org.springframework.cglib.core.SpringNamingPolicy;
+import org.springframework.cglib.proxy.Callback;
+import org.springframework.cglib.proxy.CallbackFilter;
+import org.springframework.cglib.proxy.Dispatcher;
+import org.springframework.cglib.proxy.Enhancer;
+import org.springframework.cglib.proxy.Factory;
+import org.springframework.cglib.proxy.MethodInterceptor;
+import org.springframework.cglib.proxy.MethodProxy;
+import org.springframework.cglib.proxy.NoOp;
+import org.springframework.cglib.transform.impl.MemorySafeUndeclaredThrowableStrategy;
 import org.springframework.core.SmartClassLoader;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -92,7 +93,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 
 
 	/** Logger available to subclasses; static to optimize serialization */
-	protected final static Log logger = LogFactory.getLog(CglibAopProxy.class);
+	protected static final Log logger = LogFactory.getLog(CglibAopProxy.class);
 
 	/** Keeps track of the Classes that we have validated for final methods */
 	private static final Map<Class<?>, Boolean> validatedClasses = new WeakHashMap<Class<?>, Boolean>();
@@ -181,20 +182,20 @@ public Object getProxy(ClassLoader classLoader) {
 				}
 			}
 			enhancer.setSuperclass(proxySuperClass);
-			enhancer.setStrategy(new UndeclaredThrowableStrategy(UndeclaredThrowableException.class));
 			enhancer.setInterfaces(AopProxyUtils.completeProxiedInterfaces(this.advised));
+			enhancer.setNamingPolicy(SpringNamingPolicy.INSTANCE);
+			enhancer.setStrategy(new MemorySafeUndeclaredThrowableStrategy(UndeclaredThrowableException.class));
 			enhancer.setInterceptDuringConstruction(false);
 
 			Callback[] callbacks = getCallbacks(rootClass);
-			enhancer.setCallbacks(callbacks);
-			enhancer.setCallbackFilter(new ProxyCallbackFilter(
-					this.advised.getConfigurationOnlyCopy(), this.fixedInterceptorMap, this.fixedInterceptorOffset));
-
-			Class<?>[] types = new Class[callbacks.length];
+			Class<?>[] types = new Class<?>[callbacks.length];
 			for (int x = 0; x < types.length; x++) {
 				types[x] = callbacks[x].getClass();
 			}
+			enhancer.setCallbackFilter(new ProxyCallbackFilter(
+					this.advised.getConfigurationOnlyCopy(), this.fixedInterceptorMap, this.fixedInterceptorOffset));
 			enhancer.setCallbackTypes(types);
+			enhancer.setCallbacks(callbacks);
 
 			// Generate the proxy class and create a proxy instance.
 			Object proxy;
@@ -253,11 +254,14 @@ private void validateClassIfNecessary(Class<?> proxySuperClass) {
 	 * for each one found.
 	 */
 	private void doValidateClass(Class<?> proxySuperClass) {
-		Method[] methods = proxySuperClass.getMethods();
-		for (Method method : methods) {
-			if (!Object.class.equals(method.getDeclaringClass()) && Modifier.isFinal(method.getModifiers())) {
-				logger.warn("Unable to proxy method [" + method + "] because it is final: " +
-						"All calls to this method via a proxy will be routed directly to the proxy.");
+		if (logger.isWarnEnabled()) {
+			Method[] methods = proxySuperClass.getMethods();
+			for (Method method : methods) {
+				if (!Object.class.equals(method.getDeclaringClass()) && !Modifier.isStatic(method.getModifiers()) &&
+						Modifier.isFinal(method.getModifiers())) {
+					logger.warn("Unable to proxy method [" + method + "] because it is final: " +
+							"All calls to this method via a proxy will NOT be routed to the target instance.");
+				}
 			}
 		}
 	}
@@ -290,13 +294,13 @@ private Callback[] getCallbacks(Class<?> rootClass) throws Exception {
 		Callback targetDispatcher = isStatic ?
 				new StaticDispatcher(this.advised.getTargetSource().getTarget()) : new SerializableNoOp();
 
-		Callback[] mainCallbacks = new Callback[]{
-			aopInterceptor, // for normal advice
-			targetInterceptor, // invoke target without considering advice, if optimized
-			new SerializableNoOp(), // no override for methods mapped to this
-			targetDispatcher, this.advisedDispatcher,
-			new EqualsInterceptor(this.advised),
-			new HashCodeInterceptor(this.advised)
+		Callback[] mainCallbacks = new Callback[] {
+				aopInterceptor,  // for normal advice
+				targetInterceptor,  // invoke target without considering advice, if optimized
+				new SerializableNoOp(),  // no override for methods mapped to this
+				targetDispatcher, this.advisedDispatcher,
+				new EqualsInterceptor(this.advised),
+				new HashCodeInterceptor(this.advised)
 		};
 
 		Callback[] callbacks;
@@ -309,8 +313,7 @@ private Callback[] getCallbacks(Class<?> rootClass) throws Exception {
 			Callback[] fixedCallbacks = new Callback[methods.length];
 			this.fixedInterceptorMap = new HashMap<String, Integer>(methods.length);
 
-			// TODO: small memory optimisation here (can skip creation for
-			// methods with no advice)
+			// TODO: small memory optimisation here (can skip creation for methods with no advice)
 			for (int x = 0; x < methods.length; x++) {
 				List<Object> chain = this.advised.getInterceptorsAndDynamicInterceptionAdvice(methods[x], rootClass);
 				fixedCallbacks[x] = new FixedChainStaticTargetInterceptor(
@@ -337,16 +340,15 @@ private Callback[] getCallbacks(Class<?> rootClass) throws Exception {
 	 */
 	private static Object processReturnType(Object proxy, Object target, Method method, Object retVal) {
 		// Massage return value if necessary
-		if (retVal != null && retVal == target &&
-				!RawTargetAccess.class.isAssignableFrom(method.getDeclaringClass())) {
-			// Special case: it returned "this".
-			// Note that we can't help if the target sets a reference
-			// to itself in another returned object.
+		if (retVal != null && retVal == target && !RawTargetAccess.class.isAssignableFrom(method.getDeclaringClass())) {
+			// Special case: it returned "this". Note that we can't help
+			// if the target sets a reference to itself in another returned object.
 			retVal = proxy;
 		}
 		Class<?> returnType = method.getReturnType();
 		if (retVal == null && returnType != Void.TYPE && returnType.isPrimitive()) {
-				throw new AopInvocationException("Null return value from advice does not match primitive return type for: " + method);
+			throw new AopInvocationException(
+					"Null return value from advice does not match primitive return type for: " + method);
 		}
 		return retVal;
 	}
@@ -592,7 +594,7 @@ public Object intercept(Object proxy, Method method, Object[] args, MethodProxy
 	 */
 	private static class DynamicAdvisedInterceptor implements MethodInterceptor, Serializable {
 
-		private AdvisedSupport advised;
+		private final AdvisedSupport advised;
 
 		public DynamicAdvisedInterceptor(AdvisedSupport advised) {
 			this.advised = advised;
@@ -609,8 +611,8 @@ public Object intercept(Object proxy, Method method, Object[] args, MethodProxy
 					oldProxy = AopContext.setCurrentProxy(proxy);
 					setProxyContext = true;
 				}
-				// May be null Get as late as possible to minimize the time we
-				// "own" the target, in case it comes from a pool.
+				// May be null. Get as late as possible to minimize the time we
+				// "own" the target, in case it comes from a pool...
 				target = getTarget();
 				if (target != null) {
 					targetClass = target.getClass();
@@ -676,10 +678,11 @@ private static class CglibMethodInvocation extends ReflectiveMethodInvocation {
 
 		private final MethodProxy methodProxy;
 
-		private boolean protectedMethod;
+		private final boolean protectedMethod;
 
 		public CglibMethodInvocation(Object proxy, Object target, Method method, Object[] arguments,
 				Class<?> targetClass, List<Object> interceptorsAndDynamicMethodMatchers, MethodProxy methodProxy) {
+
 			super(proxy, target, method, arguments, targetClass, interceptorsAndDynamicMethodMatchers);
 			this.methodProxy = methodProxy;
 			this.protectedMethod = Modifier.isProtected(method.getModifiers());
@@ -798,8 +801,7 @@ public int accept(Method method) {
 					if (logger.isDebugEnabled()) {
 						logger.debug("Method has advice and optimisations are enabled: " + method);
 					}
-					// We know that we are optimising so we can use the
-					// FixedStaticChainInterceptors.
+					// We know that we are optimising so we can use the FixedStaticChainInterceptors.
 					int index = this.fixedInterceptorMap.get(key);
 					return (index + this.fixedInterceptorOffset);
 				}
@@ -815,8 +817,8 @@ public int accept(Method method) {
 				// of the target type. If so we know it never needs to have return type
 				// massage and can use a dispatcher.
 				// If the proxy is being exposed, then must use the interceptor the
-				// correct one is already configured. If the target is not static cannot
-				// use a Dispatcher because the target can not then be released.
+				// correct one is already configured. If the target is not static, then
+				// cannot use a dispatcher because the target cannot be released.
 				if (exposeProxy || !isStatic) {
 					return INVOKE_TARGET;
 				}
@@ -848,7 +850,7 @@ else if (returnType.isPrimitive() || !returnType.isAssignableFrom(targetClass))
 
 		@Override
 		public boolean equals(Object other) {
-			if (other == this) {
+			if (this == other) {
 				return true;
 			}
 			if (!(other instanceof ProxyCallbackFilter)) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java
index 7e10c4c228..75967053d4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,7 +75,7 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
 	 */
 
 	/** We use a static Log to avoid serialization issues */
-	private static Log logger = LogFactory.getLog(JdkDynamicAopProxy.class);
+	private static final Log logger = LogFactory.getLog(JdkDynamicAopProxy.class);
 
 	/** Config used to configure this proxy */
 	private final AdvisedSupport advised;
@@ -114,7 +114,7 @@ public Object getProxy(ClassLoader classLoader) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Creating JDK dynamic proxy: target source is " + this.advised.getTargetSource());
 		}
-		Class[] proxiedInterfaces = AopProxyUtils.completeProxiedInterfaces(this.advised);
+		Class<?>[] proxiedInterfaces = AopProxyUtils.completeProxiedInterfaces(this.advised);
 		findDefinedEqualsAndHashCodeMethods(proxiedInterfaces);
 		return Proxy.newProxyInstance(classLoader, proxiedInterfaces, this);
 	}
@@ -124,8 +124,8 @@ public Object getProxy(ClassLoader classLoader) {
 	 * on the supplied set of interfaces.
 	 * @param proxiedInterfaces the interfaces to introspect
 	 */
-	private void findDefinedEqualsAndHashCodeMethods(Class[] proxiedInterfaces) {
-		for (Class proxiedInterface : proxiedInterfaces) {
+	private void findDefinedEqualsAndHashCodeMethods(Class<?>[] proxiedInterfaces) {
+		for (Class<?> proxiedInterface : proxiedInterfaces) {
 			Method[] methods = proxiedInterface.getDeclaredMethods();
 			for (Method method : methods) {
 				if (AopUtils.isEqualsMethod(method)) {
@@ -153,7 +153,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 		boolean setProxyContext = false;
 
 		TargetSource targetSource = this.advised.targetSource;
-		Class targetClass = null;
+		Class<?> targetClass = null;
 		Object target = null;
 
 		try {
@@ -212,8 +212,10 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 				// is type-compatible. Note that we can't help if the target sets
 				// a reference to itself in another returned object.
 				retVal = proxy;
-			} else if (retVal == null && returnType != Void.TYPE && returnType.isPrimitive()) {
-				throw new AopInvocationException("Null return value from advice does not match primitive return type for: " + method);
+			}
+			else if (retVal == null && returnType != Void.TYPE && returnType.isPrimitive()) {
+				throw new AopInvocationException(
+						"Null return value from advice does not match primitive return type for: " + method);
 			}
 			return retVal;
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java
index 67e89eeefd..db1e19a359 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import org.aopalliance.intercept.Interceptor;
 
 import org.springframework.aop.TargetSource;
-import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -47,9 +46,8 @@ public ProxyFactory() {
 	 * @param target the target object to be proxied
 	 */
 	public ProxyFactory(Object target) {
-		Assert.notNull(target, "Target object must not be null");
-		setInterfaces(ClassUtils.getAllInterfaces(target));
 		setTarget(target);
+		setInterfaces(ClassUtils.getAllInterfaces(target));
 	}
 
 	/**
@@ -57,7 +55,7 @@ public ProxyFactory(Object target) {
 	 * <p>No target, only interfaces. Must add interceptors.
 	 * @param proxyInterfaces the interfaces that the proxy should implement
 	 */
-	public ProxyFactory(Class[] proxyInterfaces) {
+	public ProxyFactory(Class<?>... proxyInterfaces) {
 		setInterfaces(proxyInterfaces);
 	}
 
@@ -69,7 +67,7 @@ public ProxyFactory(Class[] proxyInterfaces) {
 	 * @param proxyInterface the interface that the proxy should implement
 	 * @param interceptor the interceptor that the proxy should invoke
 	 */
-	public ProxyFactory(Class proxyInterface, Interceptor interceptor) {
+	public ProxyFactory(Class<?> proxyInterface, Interceptor interceptor) {
 		addInterface(proxyInterface);
 		addAdvice(interceptor);
 	}
@@ -80,7 +78,7 @@ public ProxyFactory(Class proxyInterface, Interceptor interceptor) {
 	 * @param proxyInterface the interface that the proxy should implement
 	 * @param targetSource the TargetSource that the proxy should invoke
 	 */
-	public ProxyFactory(Class proxyInterface, TargetSource targetSource) {
+	public ProxyFactory(Class<?> proxyInterface, TargetSource targetSource) {
 		addInterface(proxyInterface);
 		setTargetSource(targetSource);
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
index a369f56c82..9781364df0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -133,7 +133,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 	 * @see #setInterfaces
 	 * @see AbstractSingletonProxyFactoryBean#setProxyInterfaces
 	 */
-	public void setProxyInterfaces(Class[] proxyInterfaces) throws ClassNotFoundException {
+	public void setProxyInterfaces(Class<?>[] proxyInterfaces) throws ClassNotFoundException {
 		setInterfaces(proxyInterfaces);
 	}
 
@@ -154,7 +154,7 @@ public void setProxyInterfaces(Class[] proxyInterfaces) throws ClassNotFoundExce
 	 * @see org.aopalliance.aop.Advice
 	 * @see org.springframework.aop.target.SingletonTargetSource
 	 */
-	public void setInterceptorNames(String[] interceptorNames) {
+	public void setInterceptorNames(String... interceptorNames) {
 		this.interceptorNames = interceptorNames;
 	}
 
@@ -263,7 +263,7 @@ public Class<?> getObjectType() {
 				return this.singletonInstance.getClass();
 			}
 		}
-		Class[] ifcs = getProxiedInterfaces();
+		Class<?>[] ifcs = getProxiedInterfaces();
 		if (ifcs.length == 1) {
 			return ifcs[0];
 		}
@@ -292,7 +292,7 @@ public boolean isSingleton() {
 	 * @return the merged interface as Class
 	 * @see java.lang.reflect.Proxy#getProxyClass
 	 */
-	protected Class createCompositeInterface(Class[] interfaces) {
+	protected Class<?> createCompositeInterface(Class<?>[] interfaces) {
 		return ClassUtils.createCompositeInterface(interfaces, this.proxyClassLoader);
 	}
 
@@ -306,7 +306,7 @@ private synchronized Object getSingletonInstance() {
 			this.targetSource = freshTargetSource();
 			if (this.autodetectInterfaces && getProxiedInterfaces().length == 0 && !isProxyTargetClass()) {
 				// Rely on AOP infrastructure to tell us what interfaces to proxy.
-				Class targetClass = getTargetClass();
+				Class<?> targetClass = getTargetClass();
 				if (targetClass == null) {
 					throw new FactoryBeanNotInitializedException("Cannot determine target class for proxy");
 				}
@@ -396,7 +396,7 @@ private void checkInterceptorNames() {
 	 * @return {@code true} if it's an Advisor or Advice
 	 */
 	private boolean isNamedBeanAnAdvisorOrAdvice(String beanName) {
-		Class namedBeanClass = this.beanFactory.getType(beanName);
+		Class<?> namedBeanClass = this.beanFactory.getType(beanName);
 		if (namedBeanClass != null) {
 			return (Advisor.class.isAssignableFrom(namedBeanClass) || Advice.class.isAssignableFrom(namedBeanClass));
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java
index d66adc843c..1c272f7bca 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -198,7 +198,7 @@ public void setAdvisorAdapterRegistry(AdvisorAdapterRegistry advisorAdapterRegis
 	 * Ordering is significant: The TargetSource returned from the first matching
 	 * TargetSourceCreator (that is, the first that returns non-null) will be used.
 	 */
-	public void setCustomTargetSourceCreators(TargetSourceCreator[] targetSourceCreators) {
+	public void setCustomTargetSourceCreators(TargetSourceCreator... targetSourceCreators) {
 		this.customTargetSourceCreators = targetSourceCreators;
 	}
 
@@ -209,7 +209,7 @@ public void setCustomTargetSourceCreators(TargetSourceCreator[] targetSourceCrea
 	 * This is perfectly valid, if "specific" interceptors such as matching
 	 * Advisors are all we want.
 	 */
-	public void setInterceptorNames(String[] interceptorNames) {
+	public void setInterceptorNames(String... interceptorNames) {
 		this.interceptorNames = interceptorNames;
 	}
 
@@ -262,7 +262,9 @@ public Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, Strin
 
 	public Object getEarlyBeanReference(Object bean, String beanName) throws BeansException {
 		Object cacheKey = getCacheKey(bean.getClass(), beanName);
-		this.earlyProxyReferences.put(cacheKey, Boolean.TRUE);
+		if (!this.earlyProxyReferences.containsKey(cacheKey)) {
+			this.earlyProxyReferences.put(cacheKey, Boolean.TRUE);
+		}
 		return wrapIfNecessary(bean, beanName, cacheKey);
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java
index e417f92df0..c484520b89 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,24 +81,32 @@ public List<Advisor> findAdvisorBeans() {
 
 		List<Advisor> advisors = new LinkedList<Advisor>();
 		for (String name : advisorNames) {
-			if (isEligibleBean(name) && !this.beanFactory.isCurrentlyInCreation(name)) {
-				try {
-					advisors.add(this.beanFactory.getBean(name, Advisor.class));
+			if (isEligibleBean(name)) {
+				if (this.beanFactory.isCurrentlyInCreation(name)) {
+					if (logger.isDebugEnabled()) {
+						logger.debug("Skipping currently created advisor '" + name + "'");
+					}
 				}
-				catch (BeanCreationException ex) {
-					Throwable rootCause = ex.getMostSpecificCause();
-					if (rootCause instanceof BeanCurrentlyInCreationException) {
-						BeanCreationException bce = (BeanCreationException) rootCause;
-						if (this.beanFactory.isCurrentlyInCreation(bce.getBeanName())) {
-							if (logger.isDebugEnabled()) {
-								logger.debug("Ignoring currently created advisor '" + name + "': " + ex.getMessage());
+				else {
+					try {
+						advisors.add(this.beanFactory.getBean(name, Advisor.class));
+					}
+					catch (BeanCreationException ex) {
+						Throwable rootCause = ex.getMostSpecificCause();
+						if (rootCause instanceof BeanCurrentlyInCreationException) {
+							BeanCreationException bce = (BeanCreationException) rootCause;
+							if (this.beanFactory.isCurrentlyInCreation(bce.getBeanName())) {
+								if (logger.isDebugEnabled()) {
+									logger.debug("Skipping advisor '" + name +
+											"' with dependency on currently created bean: " + ex.getMessage());
+								}
+								// Ignore: indicates a reference back to the bean we're trying to advise.
+								// We want to find advisors other than the currently created bean itself.
+								continue;
 							}
-							// Ignore: indicates a reference back to the bean we're trying to advise.
-							// We want to find advisors other than the currently created bean itself.
-							continue;
 						}
+						throw ex;
 					}
-					throw ex;
 				}
 			}
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
index e91f9db74a..5ae853dc36 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator {
 	 * @see org.springframework.beans.factory.FactoryBean
 	 * @see org.springframework.beans.factory.BeanFactory#FACTORY_BEAN_PREFIX
 	 */
-	public void setBeanNames(String[] beanNames) {
+	public void setBeanNames(String... beanNames) {
 		Assert.notEmpty(beanNames, "'beanNames' must not be empty");
 		this.beanNames = new ArrayList<String>(beanNames.length);
 		for (String mappedName : beanNames) {
@@ -73,7 +73,7 @@ public void setBeanNames(String[] beanNames) {
 	 * Identify as bean to proxy if the bean name is in the configured list of names.
 	 */
 	@Override
-	protected Object[] getAdvicesAndAdvisorsForBean(Class beanClass, String beanName, TargetSource targetSource) {
+	protected Object[] getAdvicesAndAdvisorsForBean(Class<?> beanClass, String beanName, TargetSource targetSource) {
 		if (this.beanNames != null) {
 			for (String mappedName : this.beanNames) {
 				if (FactoryBean.class.isAssignableFrom(beanClass)) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/LazyInitTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/LazyInitTargetSourceCreator.java
index a32f3a3f2c..55d091394c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/LazyInitTargetSourceCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/LazyInitTargetSourceCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
  * TargetSourceCreator that enforces a LazyInitTargetSource for each bean
  * that is defined as "lazy-init". This will lead to a proxy created for
  * each of those beans, allowing to fetch a reference to such a bean
- * without actually initialized the target bean instance.
+ * without actually initializing the target bean instance.
  *
  * <p>To be registered as custom TargetSourceCreator for an auto-proxy creator,
  * in combination with custom interceptors for specific beans or for the
@@ -60,7 +60,7 @@ protected boolean isPrototypeBased() {
 
 	@Override
 	protected AbstractBeanFactoryBasedTargetSource createBeanFactoryBasedTargetSource(
-			Class beanClass, String beanName) {
+			Class<?> beanClass, String beanName) {
 
 		if (getBeanFactory() instanceof ConfigurableListableBeanFactory) {
 			BeanDefinition definition =
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
index 7fbfbf5604..4b8389f8b6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;
@@ -32,7 +31,7 @@
 
 /**
  * Base class for asynchronous method execution aspects, such as
- * {@link org.springframework.scheduling.annotation.AnnotationAsyncExecutionInterceptor}
+ * {@code org.springframework.scheduling.annotation.AnnotationAsyncExecutionInterceptor}
  * or {@code org.springframework.scheduling.aspectj.AnnotationAsyncExecutionAspect}.
  *
  * <p>Provides support for <i>executor qualification</i> on a method-by-method basis.
@@ -80,14 +79,14 @@ public void setExecutor(Executor defaultExecutor) {
 	/**
 	 * Set the {@link BeanFactory} to be used when looking up executors by qualifier.
 	 */
-	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
 
 	/**
 	 * Determine the specific executor to use when executing the given method.
-	 * @return the executor to use (never {@code null})
+	 * @return the executor to use (or {@code null}, but just if no default executor has been set)
 	 */
 	protected AsyncTaskExecutor determineAsyncExecutor(Method method) {
 		AsyncTaskExecutor executor = this.executors.get(method);
@@ -101,8 +100,7 @@ protected AsyncTaskExecutor determineAsyncExecutor(Method method) {
 						this.beanFactory, Executor.class, qualifier);
 			}
 			else if (executorToUse == null) {
-				throw new IllegalStateException("No executor qualifier specified and no default executor set on " +
-						getClass().getSimpleName() + " either");
+				return null;
 			}
 			executor = (executorToUse instanceof AsyncTaskExecutor ?
 					(AsyncTaskExecutor) executorToUse : new TaskExecutorAdapter(executorToUse));
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
index daa23a3293..52ba3bb7eb 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,11 +62,11 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport
 
 	/**
 	 * Create a new {@code AsyncExecutionInterceptor}.
-	 * @param executor the {@link Executor} (typically a Spring {@link AsyncTaskExecutor}
-	 * or {@link java.util.concurrent.ExecutorService}) to delegate to.
+	 * @param defaultExecutor the {@link Executor} (typically a Spring {@link AsyncTaskExecutor}
+	 * or {@link java.util.concurrent.ExecutorService}) to delegate to
 	 */
-	public AsyncExecutionInterceptor(Executor executor) {
-		super(executor);
+	public AsyncExecutionInterceptor(Executor defaultExecutor) {
+		super(defaultExecutor);
 	}
 
 
@@ -82,7 +82,13 @@ public Object invoke(final MethodInvocation invocation) throws Throwable {
 		Method specificMethod = ClassUtils.getMostSpecificMethod(invocation.getMethod(), targetClass);
 		specificMethod = BridgeMethodResolver.findBridgedMethod(specificMethod);
 
-		Future<?> result = determineAsyncExecutor(specificMethod).submit(
+		AsyncTaskExecutor executor = determineAsyncExecutor(specificMethod);
+		if (executor == null) {
+			throw new IllegalStateException(
+					"No executor specified and no default executor set on AsyncExecutionInterceptor either");
+		}
+
+		Future<?> result = executor.submit(
 				new Callable<Object>() {
 					public Object call() throws Exception {
 						try {
@@ -111,8 +117,8 @@ public Object call() throws Exception {
 	 * Subclasses may override to provide support for extracting qualifier information,
 	 * e.g. via an annotation on the given method.
 	 * @return always {@code null}
-	 * @see #determineAsyncExecutor(Method)
 	 * @since 3.1.2
+	 * @see #determineAsyncExecutor(Method)
 	 */
 	@Override
 	protected String getExecutorQualifier(Method method) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java
index a5d1f50805..f8b19cb71f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -151,7 +151,7 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 	/**
 	 * The {@code Set} of allowed placeholders.
 	 */
-	private static final Set ALLOWED_PLACEHOLDERS =
+	private static final Set<Object> ALLOWED_PLACEHOLDERS =
 			new Constants(CustomizableTraceInterceptor.class).getValues("PLACEHOLDER_");
 
 
@@ -258,7 +258,7 @@ protected Object invokeUnderTrace(MethodInvocation invocation, Log logger) throw
 			return returnValue;
 		}
 		catch (Throwable ex) {
-			if(stopWatch.isRunning()) {
+			if (stopWatch.isRunning()) {
 				stopWatch.stop();
 			}
 			exitThroughException = true;
@@ -268,7 +268,7 @@ protected Object invokeUnderTrace(MethodInvocation invocation, Log logger) throw
 		}
 		finally {
 			if (!exitThroughException) {
-				if(stopWatch.isRunning()) {
+				if (stopWatch.isRunning()) {
 					stopWatch.stop();
 				}
 				writeToLog(logger,
@@ -325,18 +325,19 @@ protected String replacePlaceholders(String message, MethodInvocation methodInvo
 		while (matcher.find()) {
 			String match = matcher.group();
 			if (PLACEHOLDER_METHOD_NAME.equals(match)) {
-				matcher.appendReplacement(output, escape(methodInvocation.getMethod().getName()));
+				matcher.appendReplacement(output, Matcher.quoteReplacement(methodInvocation.getMethod().getName()));
 			}
 			else if (PLACEHOLDER_TARGET_CLASS_NAME.equals(match)) {
 				String className = getClassForLogging(methodInvocation.getThis()).getName();
-				matcher.appendReplacement(output, escape(className));
+				matcher.appendReplacement(output, Matcher.quoteReplacement(className));
 			}
 			else if (PLACEHOLDER_TARGET_CLASS_SHORT_NAME.equals(match)) {
 				String shortName = ClassUtils.getShortName(getClassForLogging(methodInvocation.getThis()));
-				matcher.appendReplacement(output, escape(shortName));
+				matcher.appendReplacement(output, Matcher.quoteReplacement(shortName));
 			}
 			else if (PLACEHOLDER_ARGUMENTS.equals(match)) {
-				matcher.appendReplacement(output, escape(StringUtils.arrayToCommaDelimitedString(methodInvocation.getArguments())));
+				matcher.appendReplacement(output,
+						Matcher.quoteReplacement(StringUtils.arrayToCommaDelimitedString(methodInvocation.getArguments())));
 			}
 			else if (PLACEHOLDER_ARGUMENT_TYPES.equals(match)) {
 				appendArgumentTypes(methodInvocation, matcher, output);
@@ -345,7 +346,7 @@ else if (PLACEHOLDER_RETURN_VALUE.equals(match)) {
 				appendReturnValue(methodInvocation, matcher, output, returnValue);
 			}
 			else if (throwable != null && PLACEHOLDER_EXCEPTION.equals(match)) {
-				matcher.appendReplacement(output, escape(throwable.toString()));
+				matcher.appendReplacement(output, Matcher.quoteReplacement(throwable.toString()));
 			}
 			else if (PLACEHOLDER_INVOCATION_TIME.equals(match)) {
 				matcher.appendReplacement(output, Long.toString(invocationTime));
@@ -379,7 +380,7 @@ else if (returnValue == null) {
 			matcher.appendReplacement(output, "null");
 		}
 		else {
-			matcher.appendReplacement(output, escape(returnValue.toString()));
+			matcher.appendReplacement(output, Matcher.quoteReplacement(returnValue.toString()));
 		}
 	}
 
@@ -394,12 +395,13 @@ else if (returnValue == null) {
 	 * @param output the {@code StringBuffer} containing the output
 	 */
 	private void appendArgumentTypes(MethodInvocation methodInvocation, Matcher matcher, StringBuffer output) {
-		Class[] argumentTypes = methodInvocation.getMethod().getParameterTypes();
+		Class<?>[] argumentTypes = methodInvocation.getMethod().getParameterTypes();
 		String[] argumentTypeShortNames = new String[argumentTypes.length];
 		for (int i = 0; i < argumentTypeShortNames.length; i++) {
 			argumentTypeShortNames[i] = ClassUtils.getShortName(argumentTypes[i]);
 		}
-		matcher.appendReplacement(output, escape(StringUtils.arrayToCommaDelimitedString(argumentTypeShortNames)));
+		matcher.appendReplacement(output,
+				Matcher.quoteReplacement(StringUtils.arrayToCommaDelimitedString(argumentTypeShortNames)));
 	}
 
 	/**
@@ -417,27 +419,4 @@ private void checkForInvalidPlaceholders(String message) throws IllegalArgumentE
 		}
 	}
 
-	/**
-	 * Replaces {@code $} in inner class names with {@code \$}.
-	 * <p>This code is equivalent to JDK 1.5's {@code quoteReplacement}
-	 * method in the Matcher class itself. We're keeping our own version
-	 * here for JDK 1.4 compliance reasons only.
-	 */
-	private String escape(String input) {
-		StringBuilder sb = new StringBuilder();
-		for (int i = 0; i < input.length(); i++) {
-			char c = input.charAt(i);
-			if (c == '\\') {
-				sb.append("\\\\");
-			}
-			else if (c == '$') {
-				sb.append("\\$");
-			}
-			else {
-				sb.append(c);
-			}
-		}
-		return sb.toString();
-	}
-
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java
index 34bc7b9b74..f6eae79e83 100644
--- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java
+++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,7 +90,7 @@ public void setBeanFactory(BeanFactory beanFactory) {
 		pf.copyFrom(this);
 		pf.setTargetSource(this.scopedTargetSource);
 
-		Class beanType = beanFactory.getType(this.targetBeanName);
+		Class<?> beanType = beanFactory.getType(this.targetBeanName);
 		if (beanType == null) {
 			throw new IllegalStateException("Cannot create scoped proxy for bean '" + this.targetBeanName +
 					"': Target type could not be determined at the time of proxy creation.");
@@ -122,10 +122,7 @@ public Class<?> getObjectType() {
 		if (this.proxy != null) {
 			return this.proxy.getClass();
 		}
-		if (this.scopedTargetSource != null) {
-			return this.scopedTargetSource.getTargetClass();
-		}
-		return null;
+		return this.scopedTargetSource.getTargetClass();
 	}
 
 	public boolean isSingleton() {
diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java
index fdd0253d6e..2f2a89887c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public abstract class ScopedProxyUtils {
 
 
 	/**
-	 * Generates a scoped proxy for the supplied target bean, registering the target
+	 * Generate a scoped proxy for the supplied target bean, registering the target
 	 * bean with an internal name and setting 'targetBeanName' on the scoped proxy.
 	 * @param definition the original bean definition
 	 * @param registry the bean definition registry
@@ -50,20 +50,20 @@ public static BeanDefinitionHolder createScopedProxy(BeanDefinitionHolder defini
 
 		String originalBeanName = definition.getBeanName();
 		BeanDefinition targetDefinition = definition.getBeanDefinition();
+		String targetBeanName = getTargetBeanName(originalBeanName);
 
 		// Create a scoped proxy definition for the original bean name,
 		// "hiding" the target bean in an internal target definition.
 		RootBeanDefinition proxyDefinition = new RootBeanDefinition(ScopedProxyFactoryBean.class);
-		proxyDefinition.setOriginatingBeanDefinition(definition.getBeanDefinition());
+		proxyDefinition.setDecoratedDefinition(new BeanDefinitionHolder(targetDefinition, targetBeanName));
+		proxyDefinition.setOriginatingBeanDefinition(targetDefinition);
 		proxyDefinition.setSource(definition.getSource());
 		proxyDefinition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 
-		String targetBeanName = getTargetBeanName(originalBeanName);
 		proxyDefinition.getPropertyValues().add("targetBeanName", targetBeanName);
-
 		if (proxyTargetClass) {
 			targetDefinition.setAttribute(AutoProxyUtils.PRESERVE_TARGET_CLASS_ATTRIBUTE, Boolean.TRUE);
-			// ScopedFactoryBean's "proxyTargetClass" default is TRUE, so we don't need to set it explicitly here.
+			// ScopedProxyFactoryBean's "proxyTargetClass" default is TRUE, so we don't need to set it explicitly here.
 		}
 		else {
 			proxyDefinition.getPropertyValues().add("proxyTargetClass", Boolean.FALSE);
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java
index 3715a9ca70..b6eb42d935 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.support.AbstractBeanFactory;
 import org.springframework.util.Assert;
 
 /**
@@ -45,7 +46,7 @@ public abstract class AbstractBeanFactoryPointcutAdvisor extends AbstractPointcu
 
 	private BeanFactory beanFactory;
 
-	private transient Advice advice;
+	private transient volatile Advice advice;
 
 	private transient volatile Object adviceMonitor = new Object();
 
@@ -71,8 +72,23 @@ public String getAdviceBeanName() {
 
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
+		resetAdviceMonitor();
 	}
 
+	private void resetAdviceMonitor() {
+		if (this.beanFactory instanceof AbstractBeanFactory) {
+			this.adviceMonitor = ((AbstractBeanFactory) this.beanFactory).getSingletonMutex();
+		}
+		else {
+			this.adviceMonitor = new Object();
+		}
+	}
+
+	/**
+	 * Specify a particular instance of the target advice directly,
+	 * avoiding lazy resolution in {@link #getAdvice()}.
+	 * @since 3.1
+	 */
 	public void setAdvice(Advice advice) {
 		synchronized (this.adviceMonitor) {
 			this.advice = advice;
@@ -80,18 +96,42 @@ public void setAdvice(Advice advice) {
 	}
 
 	public Advice getAdvice() {
-		synchronized (this.adviceMonitor) {
-			if (this.advice == null && this.adviceBeanName != null) {
-				Assert.state(this.beanFactory != null, "BeanFactory must be set to resolve 'adviceBeanName'");
-				this.advice = this.beanFactory.getBean(this.adviceBeanName, Advice.class);
+		Advice advice = this.advice;
+		if (advice != null || this.adviceBeanName == null) {
+			return advice;
+		}
+
+		Assert.state(this.beanFactory != null, "BeanFactory must be set to resolve 'adviceBeanName'");
+		if (this.beanFactory.isSingleton(this.adviceBeanName)) {
+			// Rely on singleton semantics provided by the factory.
+			advice = this.beanFactory.getBean(this.adviceBeanName, Advice.class);
+			this.advice = advice;
+			return advice;
+		}
+		else {
+			// No singleton guarantees from the factory -> let's lock locally but
+			// reuse the factory's singleton lock, just in case a lazy dependency
+			// of our advice bean happens to trigger the singleton lock implicitly...
+			synchronized (this.adviceMonitor) {
+				if (this.advice == null) {
+					this.advice = this.beanFactory.getBean(this.adviceBeanName, Advice.class);
+				}
+				return this.advice;
 			}
-			return this.advice;
 		}
 	}
 
 	@Override
 	public String toString() {
-		return getClass().getName() + ": advice bean '" + getAdviceBeanName() + "'";
+		StringBuilder sb = new StringBuilder(getClass().getName());
+		sb.append(": advice ");
+		if (this.adviceBeanName != null) {
+			sb.append("bean '").append(this.adviceBeanName).append("'");
+		}
+		else {
+			sb.append(this.advice);
+		}
+		return sb.toString();
 	}
 
 
@@ -104,7 +144,7 @@ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFound
 		ois.defaultReadObject();
 
 		// Initialize transient fields.
-		this.adviceMonitor = new Object();
+		resetAdviceMonitor();
 	}
 
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
index b7527ca6af..fd712126d8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,17 +29,16 @@
  * <ul>
  * <li>pattern: regular expression for the fully-qualified method names to match.
  * The exact regexp syntax will depend on the subclass (e.g. Perl5 regular expressions)
- * <li>patterns: alternative property taking a String array of patterns. The result will
- * be the union of these patterns.
+ * <li>patterns: alternative property taking a String array of patterns.
+ * The result will be the union of these patterns.
  * </ul>
  *
  * <p>Note: the regular expressions must be a match. For example,
  * {@code .*get.*} will match com.mycom.Foo.getBar().
  * {@code get.*} will not.
  *
- * <p>This base class is serializable. Subclasses should declare all fields transient
- * - the initPatternRepresentation method in this class will be invoked again on the
- * client side on deserialization.
+ * <p>This base class is serializable. Subclasses should declare all fields transient;
+ * the {@link #initPatternRepresentation} method will be invoked again on deserialization.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -51,10 +50,14 @@
 public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPointcut
 		implements Serializable {
 
-	/** Regular expressions to match */
+	/**
+	 * Regular expressions to match.
+	 */
 	private String[] patterns = new String[0];
 
-	/** Regular expressions <strong>not</strong> to match */
+	/**
+	 * Regular expressions <strong>not</strong> to match.
+	 */
 	private String[] excludedPatterns = new String[0];
 
 
@@ -64,15 +67,15 @@ public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPo
 	 * @see #setPatterns
 	 */
 	public void setPattern(String pattern) {
-		setPatterns(new String[] {pattern});
+		setPatterns(pattern);
 	}
 
 	/**
 	 * Set the regular expressions defining methods to match.
-	 * Matching will be the union of all these; if any match,
-	 * the pointcut matches.
+	 * Matching will be the union of all these; if any match, the pointcut matches.
+	 * @see #setPattern
 	 */
-	public void setPatterns(String[] patterns) {
+	public void setPatterns(String... patterns) {
 		Assert.notEmpty(patterns, "'patterns' must not be empty");
 		this.patterns = new String[patterns.length];
 		for (int i = 0; i < patterns.length; i++) {
@@ -94,15 +97,15 @@ public String[] getPatterns() {
 	 * @see #setExcludedPatterns
 	 */
 	public void setExcludedPattern(String excludedPattern) {
-		setExcludedPatterns(new String[] {excludedPattern});
+		setExcludedPatterns(excludedPattern);
 	}
 
 	/**
 	 * Set the regular expressions defining methods to match for exclusion.
-	 * Matching will be the union of all these; if any match,
-	 * the pointcut matches.
+	 * Matching will be the union of all these; if any match, the pointcut matches.
+	 * @see #setExcludedPattern
 	 */
-	public void setExcludedPatterns(String[] excludedPatterns) {
+	public void setExcludedPatterns(String... excludedPatterns) {
 		Assert.notEmpty(excludedPatterns, "'excludedPatterns' must not be empty");
 		this.excludedPatterns = new String[excludedPatterns.length];
 		for (int i = 0; i < excludedPatterns.length; i++) {
@@ -124,7 +127,7 @@ public String[] getExcludedPatterns() {
 	 * of the target class as well as against the method's declaring class,
 	 * plus the name of the method.
 	 */
-	public boolean matches(Method method, Class targetClass) {
+	public boolean matches(Method method, Class<?> targetClass) {
 		return ((targetClass != null && matchesPattern(targetClass.getName() + "." + method.getName())) ||
 				matchesPattern(method.getDeclaringClass().getName() + "." + method.getName()));
 	}
@@ -172,18 +175,18 @@ protected boolean matchesPattern(String signatureString) {
 	protected abstract void initExcludedPatternRepresentation(String[] patterns) throws IllegalArgumentException;
 
 	/**
-	 * Does the pattern at the given index match this string?
-	 * @param pattern {@code String} pattern to match
-	 * @param patternIndex index of pattern from 0
-	 * @return {@code true} if there is a match, else {@code false}.
+	 * Does the pattern at the given index match the given String?
+	 * @param pattern the {@code String} pattern to match
+	 * @param patternIndex index of pattern (starting from 0)
+	 * @return {@code true} if there is a match, {@code false} otherwise
 	 */
 	protected abstract boolean matches(String pattern, int patternIndex);
 
 	/**
-	 * Does the exclusion pattern at the given index match this string?
-	 * @param pattern {@code String} pattern to match.
-	 * @param patternIndex index of pattern starting from 0.
-	 * @return {@code true} if there is a match, else {@code false}.
+	 * Does the exclusion pattern at the given index match the given String?
+	 * @param pattern the {@code String} pattern to match
+	 * @param patternIndex index of pattern (starting from 0)
+	 * @return {@code true} if there is a match, {@code false} otherwise
 	 */
 	protected abstract boolean matchesExclusion(String pattern, int patternIndex);
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java b/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
index fdd985191e..ac4a4ecad9 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -215,7 +215,7 @@ public static boolean canApply(Pointcut pc, Class<?> targetClass, boolean hasInt
 			introductionAwareMethodMatcher = (IntroductionAwareMethodMatcher) methodMatcher;
 		}
 
-		Set<Class> classes = new HashSet<Class>(ClassUtils.getAllInterfacesForClassAsSet(targetClass));
+		Set<Class> classes = new LinkedHashSet<Class>(ClassUtils.getAllInterfacesForClassAsSet(targetClass));
 		classes.add(targetClass);
 		for (Class<?> clazz : classes) {
 			Method[] methods = clazz.getMethods();
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java b/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java
index 1dea2cb113..58b19c9029 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,7 @@
 import org.springframework.util.ObjectUtils;
 
 /**
- * Static utility methods for composing
- * {@link org.springframework.aop.ClassFilter ClassFilters}.
+ * Static utility methods for composing {@link ClassFilter ClassFilters}.
  *
  * @author Rod Johnson
  * @author Rob Harrop
@@ -96,9 +95,9 @@ public UnionClassFilter(ClassFilter[] filters) {
 			this.filters = filters;
 		}
 
-		public boolean matches(Class clazz) {
-			for (int i = 0; i < this.filters.length; i++) {
-				if (this.filters[i].matches(clazz)) {
+		public boolean matches(Class<?> clazz) {
+			for (ClassFilter filter : this.filters) {
+				if (filter.matches(clazz)) {
 					return true;
 				}
 			}
@@ -130,9 +129,9 @@ public IntersectionClassFilter(ClassFilter[] filters) {
 			this.filters = filters;
 		}
 
-		public boolean matches(Class clazz) {
-			for (int i = 0; i < this.filters.length; i++) {
-				if (!this.filters[i].matches(clazz)) {
+		public boolean matches(Class<?> clazz) {
+			for (ClassFilter filter : this.filters) {
+				if (!filter.matches(clazz)) {
 					return false;
 				}
 			}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
index b537a6ab8e..42ae067dcf 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -178,7 +178,6 @@ public MethodMatcher getMethodMatcher() {
 		return this.methodMatcher;
 	}
 
-
 	@Override
 	public boolean equals(Object other) {
 		if (this == other) {
@@ -187,7 +186,6 @@ public boolean equals(Object other) {
 		if (!(other instanceof ComposablePointcut)) {
 			return false;
 		}
-
 		ComposablePointcut that = (ComposablePointcut) other;
 		return ObjectUtils.nullSafeEquals(that.classFilter, this.classFilter) &&
 				ObjectUtils.nullSafeEquals(that.methodMatcher, this.methodMatcher);
@@ -207,8 +205,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		return "ComposablePointcut: ClassFilter [" + this.classFilter +
-				"], MethodMatcher [" + this.methodMatcher + "]";
+		return "ComposablePointcut: " + this.classFilter + ", " +this.methodMatcher;
 	}
 
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
index e1aad6a170..d1af2ec4a7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.aop.support;
 
 import java.io.Serializable;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.aopalliance.aop.Advice;
@@ -43,7 +43,7 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil
 
 	private final Advice advice;
 
-	private final Set<Class> interfaces = new HashSet<Class>();
+	private final Set<Class> interfaces = new LinkedHashSet<Class>();
 
 	private int order = Integer.MAX_VALUE;
 
@@ -68,11 +68,11 @@ public DefaultIntroductionAdvisor(Advice advice, IntroductionInfo introductionIn
 		Assert.notNull(advice, "Advice must not be null");
 		this.advice = advice;
 		if (introductionInfo != null) {
-			Class[] introducedInterfaces = introductionInfo.getInterfaces();
+			Class<?>[] introducedInterfaces = introductionInfo.getInterfaces();
 			if (introducedInterfaces.length == 0) {
 				throw new IllegalArgumentException("IntroductionAdviceSupport implements no interfaces");
 			}
-			for (Class ifc : introducedInterfaces) {
+			for (Class<?> ifc : introducedInterfaces) {
 				addInterface(ifc);
 			}
 		}
@@ -83,7 +83,7 @@ public DefaultIntroductionAdvisor(Advice advice, IntroductionInfo introductionIn
 	 * @param advice the Advice to apply
 	 * @param intf the interface to introduce
 	 */
-	public DefaultIntroductionAdvisor(DynamicIntroductionAdvice advice, Class intf) {
+	public DefaultIntroductionAdvisor(DynamicIntroductionAdvice advice, Class<?> intf) {
 		Assert.notNull(advice, "Advice must not be null");
 		this.advice = advice;
 		addInterface(intf);
@@ -94,7 +94,7 @@ public DefaultIntroductionAdvisor(DynamicIntroductionAdvice advice, Class intf)
 	 * Add the specified interface to the list of interfaces to introduce.
 	 * @param intf the interface to introduce
 	 */
-	public void addInterface(Class intf) {
+	public void addInterface(Class<?> intf) {
 		Assert.notNull(intf, "Interface must not be null");
 		if (!intf.isInterface()) {
 			throw new IllegalArgumentException("Specified class [" + intf.getName() + "] must be an interface");
@@ -102,12 +102,13 @@ public void addInterface(Class intf) {
 		this.interfaces.add(intf);
 	}
 
-	public Class[] getInterfaces() {
-		return this.interfaces.toArray(new Class[this.interfaces.size()]);
+	public Class<?>[] getInterfaces() {
+		return this.interfaces.toArray(new Class<?>[this.interfaces.size()]);
 	}
 
+	@Override
 	public void validateInterfaces() throws IllegalArgumentException {
-		for (Class ifc : this.interfaces) {
+		for (Class<?> ifc : this.interfaces) {
 			if (this.advice instanceof DynamicIntroductionAdvice &&
 					!((DynamicIntroductionAdvice) this.advice).implementsInterface(ifc)) {
 			 throw new IllegalArgumentException("DynamicIntroductionAdvice [" + this.advice + "] " +
@@ -138,7 +139,7 @@ public ClassFilter getClassFilter() {
 		return this;
 	}
 
-	public boolean matches(Class clazz) {
+	public boolean matches(Class<?> clazz) {
 		return true;
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java b/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java
index c8807f7639..73adc67b16 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.lang.reflect.Method;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -43,7 +43,7 @@
 @SuppressWarnings("serial")
 public class IntroductionInfoSupport implements IntroductionInfo, Serializable {
 
-	protected final Set<Class> publishedInterfaces = new HashSet<Class>();
+	protected final Set<Class> publishedInterfaces = new LinkedHashSet<Class>();
 
 	private transient Map<Method, Boolean> rememberedMethods = new ConcurrentHashMap<Method, Boolean>(32);
 
@@ -55,12 +55,12 @@ public class IntroductionInfoSupport implements IntroductionInfo, Serializable {
 	 * <p>Does nothing if the interface is not implemented by the delegate.
 	 * @param intf the interface to suppress
 	 */
-	public void suppressInterface(Class intf) {
+	public void suppressInterface(Class<?> intf) {
 		this.publishedInterfaces.remove(intf);
 	}
 
-	public Class[] getInterfaces() {
-		return this.publishedInterfaces.toArray(new Class[this.publishedInterfaces.size()]);
+	public Class<?>[] getInterfaces() {
+		return this.publishedInterfaces.toArray(new Class<?>[this.publishedInterfaces.size()]);
 	}
 
 	/**
@@ -68,8 +68,8 @@ public Class[] getInterfaces() {
 	 * @param ifc the interface to check
 	 * @return whether the interface is part of this introduction
 	 */
-	public boolean implementsInterface(Class ifc) {
-		for (Class pubIfc : this.publishedInterfaces) {
+	public boolean implementsInterface(Class<?> ifc) {
+		for (Class<?> pubIfc : this.publishedInterfaces) {
 			if (ifc.isInterface() && ifc.isAssignableFrom(pubIfc)) {
 				return true;
 			}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
index be8b5bca7f..3489e1b444 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +25,11 @@
 import org.springframework.util.Assert;
 
 /**
- * Static utility methods for composing
- * {@link org.springframework.aop.MethodMatcher MethodMatchers}.
+ * Static utility methods for composing {@link MethodMatcher MethodMatchers}.
  *
- * <p>A MethodMatcher may be evaluated statically (based on method
- * and target class) or need further evaluation dynamically
- * (based on arguments at the time of method invocation).
+ * <p>A MethodMatcher may be evaluated statically (based on method and target
+ * class) or need further evaluation dynamically (based on arguments at the
+ * time of method invocation).
  *
  * @author Rod Johnson
  * @author Rob Harrop
@@ -88,7 +87,7 @@ public static MethodMatcher intersection(MethodMatcher mm1, MethodMatcher mm2) {
 	 * asking is the subject on one or more introductions; {@code false} otherwise
 	 * @return whether or not this method matches statically
 	 */
-	public static boolean matches(MethodMatcher mm, Method method, Class targetClass, boolean hasIntroductions) {
+	public static boolean matches(MethodMatcher mm, Method method, Class<?> targetClass, boolean hasIntroductions) {
 		Assert.notNull(mm, "MethodMatcher must not be null");
 		return ((mm instanceof IntroductionAwareMethodMatcher &&
 				((IntroductionAwareMethodMatcher) mm).matches(method, targetClass, hasIntroductions)) ||
@@ -102,8 +101,9 @@ public static boolean matches(MethodMatcher mm, Method method, Class targetClass
 	@SuppressWarnings("serial")
 	private static class UnionMethodMatcher implements IntroductionAwareMethodMatcher, Serializable {
 
-		private MethodMatcher mm1;
-		private MethodMatcher mm2;
+		private final MethodMatcher mm1;
+
+		private final MethodMatcher mm2;
 
 		public UnionMethodMatcher(MethodMatcher mm1, MethodMatcher mm2) {
 			Assert.notNull(mm1, "First MethodMatcher must not be null");
@@ -112,21 +112,21 @@ public UnionMethodMatcher(MethodMatcher mm1, MethodMatcher mm2) {
 			this.mm2 = mm2;
 		}
 
-		public boolean matches(Method method, Class targetClass, boolean hasIntroductions) {
+		public boolean matches(Method method, Class<?> targetClass, boolean hasIntroductions) {
 			return (matchesClass1(targetClass) && MethodMatchers.matches(this.mm1, method, targetClass, hasIntroductions)) ||
 					(matchesClass2(targetClass) && MethodMatchers.matches(this.mm2, method, targetClass, hasIntroductions));
 		}
 
-		public boolean matches(Method method, Class targetClass) {
+		public boolean matches(Method method, Class<?> targetClass) {
 			return (matchesClass1(targetClass) && this.mm1.matches(method, targetClass)) ||
 					(matchesClass2(targetClass) && this.mm2.matches(method, targetClass));
 		}
 
-		protected boolean matchesClass1(Class targetClass) {
+		protected boolean matchesClass1(Class<?> targetClass) {
 			return true;
 		}
 
-		protected boolean matchesClass2(Class targetClass) {
+		protected boolean matchesClass2(Class<?> targetClass) {
 			return true;
 		}
 
@@ -134,7 +134,7 @@ public boolean isRuntime() {
 			return this.mm1.isRuntime() || this.mm2.isRuntime();
 		}
 
-		public boolean matches(Method method, Class targetClass, Object[] args) {
+		public boolean matches(Method method, Class<?> targetClass, Object[] args) {
 			return this.mm1.matches(method, targetClass, args) || this.mm2.matches(method, targetClass, args);
 		}
 
@@ -168,6 +168,7 @@ public int hashCode() {
 	private static class ClassFilterAwareUnionMethodMatcher extends UnionMethodMatcher {
 
 		private final ClassFilter cf1;
+
 		private final ClassFilter cf2;
 
 		public ClassFilterAwareUnionMethodMatcher(MethodMatcher mm1, ClassFilter cf1, MethodMatcher mm2, ClassFilter cf2) {
@@ -177,12 +178,12 @@ public ClassFilterAwareUnionMethodMatcher(MethodMatcher mm1, ClassFilter cf1, Me
 		}
 
 		@Override
-		protected boolean matchesClass1(Class targetClass) {
+		protected boolean matchesClass1(Class<?> targetClass) {
 			return this.cf1.matches(targetClass);
 		}
 
 		@Override
-		protected boolean matchesClass2(Class targetClass) {
+		protected boolean matchesClass2(Class<?> targetClass) {
 			return this.cf2.matches(targetClass);
 		}
 
@@ -191,11 +192,17 @@ public boolean equals(Object other) {
 			if (this == other) {
 				return true;
 			}
-			if (!(other instanceof ClassFilterAwareUnionMethodMatcher)) {
+			if (!super.equals(other)) {
 				return false;
 			}
-			ClassFilterAwareUnionMethodMatcher that = (ClassFilterAwareUnionMethodMatcher) other;
-			return (this.cf1.equals(that.cf1) && this.cf2.equals(that.cf2) && super.equals(other));
+			ClassFilter otherCf1 = ClassFilter.TRUE;
+			ClassFilter otherCf2 = ClassFilter.TRUE;
+			if (other instanceof ClassFilterAwareUnionMethodMatcher) {
+				ClassFilterAwareUnionMethodMatcher cfa = (ClassFilterAwareUnionMethodMatcher) other;
+				otherCf1 = cfa.cf1;
+				otherCf2 = cfa.cf2;
+			}
+			return (this.cf1.equals(otherCf1) && this.cf2.equals(otherCf2));
 		}
 	}
 
@@ -206,8 +213,9 @@ public boolean equals(Object other) {
 	@SuppressWarnings("serial")
 	private static class IntersectionMethodMatcher implements IntroductionAwareMethodMatcher, Serializable {
 
-		private MethodMatcher mm1;
-		private MethodMatcher mm2;
+		private final MethodMatcher mm1;
+
+		private final MethodMatcher mm2;
 
 		public IntersectionMethodMatcher(MethodMatcher mm1, MethodMatcher mm2) {
 			Assert.notNull(mm1, "First MethodMatcher must not be null");
@@ -216,12 +224,12 @@ public IntersectionMethodMatcher(MethodMatcher mm1, MethodMatcher mm2) {
 			this.mm2 = mm2;
 		}
 
-		public boolean matches(Method method, Class targetClass, boolean hasIntroductions) {
+		public boolean matches(Method method, Class<?> targetClass, boolean hasIntroductions) {
 			return MethodMatchers.matches(this.mm1, method, targetClass, hasIntroductions) &&
 					MethodMatchers.matches(this.mm2, method, targetClass, hasIntroductions);
 		}
 
-		public boolean matches(Method method, Class targetClass) {
+		public boolean matches(Method method, Class<?> targetClass) {
 			return this.mm1.matches(method, targetClass) && this.mm2.matches(method, targetClass);
 		}
 
@@ -229,7 +237,7 @@ public boolean isRuntime() {
 			return this.mm1.isRuntime() || this.mm2.isRuntime();
 		}
 
-		public boolean matches(Method method, Class targetClass, Object[] args) {
+		public boolean matches(Method method, Class<?> targetClass, Object[] args) {
 			// Because a dynamic intersection may be composed of a static and dynamic part,
 			// we must avoid calling the 3-arg matches method on a dynamic matcher, as
 			// it will probably be an unsupported operation.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java
index 69389d0bf5..05577f7d6c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ public class NameMatchMethodPointcut extends StaticMethodMatcherPointcut impleme
 	 * @see #setMappedNames
 	 */
 	public void setMappedName(String mappedName) {
-		setMappedNames(new String[] {mappedName});
+		setMappedNames(mappedName);
 	}
 
 	/**
@@ -55,7 +55,7 @@ public void setMappedName(String mappedName) {
 	 * Matching will be the union of all these; if any match,
 	 * the pointcut matches.
 	 */
-	public void setMappedNames(String[] mappedNames) {
+	public void setMappedNames(String... mappedNames) {
 		this.mappedNames = new LinkedList<String>();
 		if (mappedNames != null) {
 			this.mappedNames.addAll(Arrays.asList(mappedNames));
@@ -77,7 +77,8 @@ public NameMatchMethodPointcut addMethodName(String name) {
 	}
 
 
-	public boolean matches(Method method, Class targetClass) {
+	@Override
+	public boolean matches(Method method, Class<?> targetClass) {
 		for (String mappedName : this.mappedNames) {
 			if (mappedName.equals(method.getName()) || isMatch(method.getName(), mappedName)) {
 				return true;
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java
index c2f85b5881..7e824e65f0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ public void setMappedName(String mappedName) {
 	 * the pointcut matches.
 	 * @see NameMatchMethodPointcut#setMappedNames
 	 */
-	public void setMappedNames(String[] mappedNames) {
+	public void setMappedNames(String... mappedNames) {
 		this.pointcut.setMappedNames(mappedNames);
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java
index 1edb2d746b..bbbd81156f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@ public RegexpMethodPointcutAdvisor(String[] patterns, Advice advice) {
 	 * @see #setPatterns
 	 */
 	public void setPattern(String pattern) {
-		setPatterns(new String[] {pattern});
+		setPatterns(pattern);
 	}
 
 	/**
@@ -108,7 +108,7 @@ public void setPattern(String pattern) {
 	 * patterns matches, the pointcut matches.
 	 * @see AbstractRegexpMethodPointcut#setPatterns
 	 */
-	public void setPatterns(String[] patterns) {
+	public void setPatterns(String... patterns) {
 		this.patterns = patterns;
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
index 9136c8974e..ea8a3adf15 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,10 +59,32 @@ public AnnotationClassFilter(Class<? extends Annotation> annotationType, boolean
 	}
 
 
-	public boolean matches(Class clazz) {
+	public boolean matches(Class<?> clazz) {
 		return (this.checkInherited ?
 				(AnnotationUtils.findAnnotation(clazz, this.annotationType) != null) :
 				clazz.isAnnotationPresent(this.annotationType));
 	}
 
+	@Override
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof AnnotationClassFilter)) {
+			return false;
+		}
+		AnnotationClassFilter otherCf = (AnnotationClassFilter) other;
+		return (this.annotationType.equals(otherCf.annotationType) && this.checkInherited == otherCf.checkInherited);
+	}
+
+	@Override
+	public int hashCode() {
+		return this.annotationType.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return getClass().getName() + ": " + this.annotationType;
+	}
+
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
index acdbbeff88..5bc54af587 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Simple Pointcut that looks for a specific Java 5 annotation
@@ -98,6 +99,36 @@ public MethodMatcher getMethodMatcher() {
 		return this.methodMatcher;
 	}
 
+	@Override
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof AnnotationMatchingPointcut)) {
+			return false;
+		}
+		AnnotationMatchingPointcut that = (AnnotationMatchingPointcut) other;
+		return ObjectUtils.nullSafeEquals(that.classFilter, this.classFilter) &&
+				ObjectUtils.nullSafeEquals(that.methodMatcher, this.methodMatcher);
+	}
+
+	@Override
+	public int hashCode() {
+		int code = 17;
+		if (this.classFilter != null) {
+			code = 37 * code + this.classFilter.hashCode();
+		}
+		if (this.methodMatcher != null) {
+			code = 37 * code + this.methodMatcher.hashCode();
+		}
+		return code;
+	}
+
+	@Override
+	public String toString() {
+		return "AnnotationMatchingPointcut: " + this.classFilter + ", " +this.methodMatcher;
+	}
+
 
 	/**
 	 * Factory method for an AnnotationMatchingPointcut that matches
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
index 4f4dd6c391..15f83f7b11 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,4 +73,9 @@ public int hashCode() {
 		return this.annotationType.hashCode();
 	}
 
+	@Override
+	public String toString() {
+		return getClass().getName() + ": " + this.annotationType;
+	}
+
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java
index 3192fab5fe..8967162564 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import org.springframework.aop.TargetSource;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -48,8 +47,7 @@
  * @see ThreadLocalTargetSource
  * @see CommonsPoolTargetSource
  */
-public abstract class AbstractBeanFactoryBasedTargetSource
-		implements TargetSource, BeanFactoryAware, Serializable {
+public abstract class AbstractBeanFactoryBasedTargetSource implements TargetSource, BeanFactoryAware, Serializable {
 
 	/** use serialVersionUID from Spring 1.2.7 for interoperability */
 	private static final long serialVersionUID = -4721607536018568393L;
@@ -97,7 +95,7 @@ public String getTargetBeanName() {
 	 * <p>Default is to detect the type automatically, through a {@code getType}
 	 * call on the BeanFactory (or even a full {@code getBean} call as fallback).
 	 */
-	public void setTargetClass(Class targetClass) {
+	public void setTargetClass(Class<?> targetClass) {
 		this.targetClass = targetClass;
 	}
 
@@ -107,7 +105,7 @@ public void setTargetClass(Class targetClass) {
 	 */
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (this.targetBeanName == null) {
-			throw new IllegalStateException("Property'targetBeanName' is required");
+			throw new IllegalStateException("Property 'targetBeanName' is required");
 		}
 		this.beanFactory = beanFactory;
 	}
@@ -181,8 +179,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append(ClassUtils.getShortName(getClass()));
+		StringBuilder sb = new StringBuilder(getClass().getSimpleName());
 		sb.append(" for target bean '").append(this.targetBeanName).append("'");
 		if (this.targetClass != null) {
 			sb.append(" of type [").append(this.targetClass.getName()).append("]");
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java
index 91e1b72ee7..545d45052c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@
  * @see #releaseTarget
  * @see #destroy
  */
+@SuppressWarnings("serial")
 public abstract class AbstractPoolingTargetSource extends AbstractPrototypeBasedTargetSource
 		implements PoolingConfig, DisposableBean {
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java
index 4880d5119b..24e0286e97 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
  * @see ThreadLocalTargetSource
  * @see CommonsPoolTargetSource
  */
+@SuppressWarnings("serial")
 public abstract class AbstractPrototypeBasedTargetSource extends AbstractBeanFactoryBasedTargetSource {
 
 	@Override
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java
index 47a35f756e..a48621ae00 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@
 import org.springframework.core.Constants;
 
 /**
- * TargetSource implementation that holds objects in a configurable
- * Jakarta Commons Pool.
+ * {@link org.springframework.aop.TargetSource} implementation that holds
+ * objects in a configurable Apache Commons Pool.
  *
  * <p>By default, an instance of {@code GenericObjectPool} is created.
  * Subclasses may change the type of {@code ObjectPool} used by
@@ -38,10 +38,12 @@
  * of configuration properties that are relevant to your chosen implementation.
  *
  * <p>The {@code testOnBorrow}, {@code testOnReturn} and {@code testWhileIdle}
- * properties are explictly not mirrored because the implementation of
+ * properties are explicitly not mirrored because the implementation of
  * {@code PoolableObjectFactory} used by this class does not implement
- * meaningful validation. All exposed Commons Pool properties use the corresponding
- * Commons Pool defaults: for example,
+ * meaningful validation. All exposed Commons Pool properties use the
+ * corresponding Commons Pool defaults.
+ *
+ * <p>Compatible with Apache Commons Pool 1.5.x and 1.6.
  *
  * @author Rod Johnson
  * @author Rob Harrop
@@ -55,10 +57,8 @@
  * @see #setTimeBetweenEvictionRunsMillis
  * @see #setMinEvictableIdleTimeMillis
  */
-public class CommonsPoolTargetSource extends AbstractPoolingTargetSource
-		implements PoolableObjectFactory {
-
-	private static final long serialVersionUID = 1L;
+@SuppressWarnings("serial")
+public class CommonsPoolTargetSource extends AbstractPoolingTargetSource implements PoolableObjectFactory {
 
 	private static final Constants constants = new Constants(GenericObjectPool.class);
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java
index 81642f6b2e..57604a0853 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,11 @@
 import org.springframework.beans.BeansException;
 
 /**
- * TargetSource that creates a new instance of the target bean for each
- * request, destroying each instance on release (after each request).
- * Obtains bean instances from its containing
+ * {@link org.springframework.aop.TargetSource} implementation that
+ * creates a new instance of the target bean for each request,
+ * destroying each instance on release (after each request).
+ *
+ * <p>Obtains bean instances from its containing
  * {@link org.springframework.beans.factory.BeanFactory}.
  *
  * @author Rod Johnson
@@ -29,10 +31,9 @@
  * @see #setBeanFactory
  * @see #setTargetBeanName
  */
+@SuppressWarnings("serial")
 public class PrototypeTargetSource extends AbstractPrototypeBasedTargetSource {
 
-	private static final long serialVersionUID = 1L;
-
 	/**
 	 * Obtain a new prototype instance for every call.
 	 * @see #newPrototypeInstance()
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java
index 7b100fe0da..a33681fd3c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,10 @@
 import org.springframework.core.NamedThreadLocal;
 
 /**
- * Alternative to an object pool. This TargetSource uses a threading model in which
- * every thread has its own copy of the target. There's no contention for targets.
- * Target object creation is kept to a minimum on the running server.
+ * Alternative to an object pool. This {@link org.springframework.aop.TargetSource}
+ * uses a threading model in which every thread has its own copy of the target.
+ * There's no contention for targets. Target object creation is kept to a minimum
+ * on the running server.
  *
  * <p>Application code is written as to a normal pool; callers can't assume they
  * will be dealing with the same instance in invocations in different threads.
@@ -47,11 +48,10 @@
  * @see ThreadLocalTargetSourceStats
  * @see org.springframework.beans.factory.DisposableBean#destroy()
  */
+@SuppressWarnings("serial")
 public class ThreadLocalTargetSource extends AbstractPrototypeBasedTargetSource
 		implements ThreadLocalTargetSourceStats, DisposableBean {
 
-	private static final long serialVersionUID = 1L;
-
 	/**
 	 * ThreadLocal holding the target associated with the current
 	 * thread. Unlike most ThreadLocals, which are static, this variable
@@ -80,10 +80,8 @@ public Object getTarget() throws BeansException {
 		Object target = this.targetInThread.get();
 		if (target == null) {
 			if (logger.isDebugEnabled()) {
-				logger.debug("No target for prototype '" + getTargetBeanName() +
-						"' bound to thread: " +
-						"creating one and binding it to thread '" +
-						Thread.currentThread().getName() + "'");
+				logger.debug("No target for prototype '" + getTargetBeanName() + "' bound to thread: " +
+						"creating one and binding it to thread '" + Thread.currentThread().getName() + "'");
 			}
 			// Associate target with ThreadLocal.
 			target = newPrototypeInstance();
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java
index 8f06791335..0f4fd8d3ce 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java
@@ -43,6 +43,7 @@ public final class MethodMatchersTests {
 
 	private final Method IOTHER_ABSQUATULATE;
 
+
 	public MethodMatchersTests() throws Exception {
 		EXCEPTION_GETMESSAGE = Exception.class.getMethod("getMessage", (Class[]) null);
 		ITESTBEAN_GETAGE = ITestBean.class.getMethod("getAge", (Class[]) null);
@@ -50,6 +51,7 @@ public MethodMatchersTests() throws Exception {
 		IOTHER_ABSQUATULATE = IOther.class.getMethod("absquatulate", (Class[]) null);
 	}
 
+
 	@Test
 	public void testDefaultMatchesAll() throws Exception {
 		MethodMatcher defaultMm = MethodMatcher.TRUE;
@@ -99,23 +101,33 @@ public void testStaticMethodMatcherUnion() throws Exception {
 		assertTrue("Matched setAge method", union.matches(ITESTBEAN_SETAGE, TestBean.class));
 		assertTrue("Matched getAge method", union.matches(ITESTBEAN_GETAGE, TestBean.class));
 		assertFalse("Didn't matched absquatulate method", union.matches(IOTHER_ABSQUATULATE, TestBean.class));
+	}
 
+	@Test
+	public void testUnionEquals() {
+		MethodMatcher first = MethodMatchers.union(MethodMatcher.TRUE, MethodMatcher.TRUE);
+		MethodMatcher second = new ComposablePointcut(MethodMatcher.TRUE).union(new ComposablePointcut(MethodMatcher.TRUE)).getMethodMatcher();
+		assertTrue(first.equals(second));
+		assertTrue(second.equals(first));
 	}
 
 
 	public static class StartsWithMatcher extends StaticMethodMatcher {
-		private String prefix;
+
+		private final String prefix;
+
 		public StartsWithMatcher(String s) {
 			this.prefix = s;
 		}
+
 		@Override
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().startsWith(prefix);
 		}
 	}
 
-
 	private static class TestDynamicMethodMatcherWhichMatches extends DynamicMethodMatcher {
+
 		@Override
 		public boolean matches(Method m, Class<?> targetClass, Object[] args) {
 			return true;
@@ -123,6 +135,7 @@ public boolean matches(Method m, Class<?> targetClass, Object[] args) {
 	}
 
 	private static class TestDynamicMethodMatcherWhichDoesNotMatch extends DynamicMethodMatcher {
+
 		@Override
 		public boolean matches(Method m, Class<?> targetClass, Object[] args) {
 			return false;
diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java b/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java
index d152719261..de49c8af7f 100644
--- a/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java
+++ b/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java
@@ -1,6 +1,5 @@
-
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,23 +28,23 @@ public class NopInterceptor implements MethodInterceptor {
 
 	private int count;
 
-	/**
-	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation)
-	 */
+
 	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		increment();
 		return invocation.proceed();
 	}
 
+	protected void increment() {
+		this.count++;
+	}
+
 	public int getCount() {
 		return this.count;
 	}
 
-	protected void increment() {
-		++count;
-	}
 
+	@Override
 	public boolean equals(Object other) {
 		if (!(other instanceof NopInterceptor)) {
 			return false;
@@ -56,4 +55,9 @@ public boolean equals(Object other) {
 		return this.count == ((NopInterceptor) other).count;
 	}
 
+	@Override
+	public int hashCode() {
+		return NopInterceptor.class.hashCode();
+	}
+
 }
diff --git a/spring-aop/src/test/java/org/springframework/tests/sample/beans/SerializablePerson.java b/spring-aop/src/test/java/org/springframework/tests/sample/beans/SerializablePerson.java
index 2730d50c8e..bfa856144a 100644
--- a/spring-aop/src/test/java/org/springframework/tests/sample/beans/SerializablePerson.java
+++ b/spring-aop/src/test/java/org/springframework/tests/sample/beans/SerializablePerson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,26 +29,28 @@
 public class SerializablePerson implements Person, Serializable {
 
 	private String name;
+
 	private int age;
 
+
 	@Override
-	public int getAge() {
-		return age;
+	public String getName() {
+		return name;
 	}
 
 	@Override
-	public void setAge(int age) {
-		this.age = age;
+	public void setName(String name) {
+		this.name = name;
 	}
 
 	@Override
-	public String getName() {
-		return name;
+	public int getAge() {
+		return age;
 	}
 
 	@Override
-	public void setName(String name) {
-		this.name = name;
+	public void setAge(int age) {
+		this.age = age;
 	}
 
 	@Override
@@ -59,6 +61,8 @@ public Object echo(Object o) throws Throwable {
 		return o;
 	}
 
+
+	@Override
 	public boolean equals(Object other) {
 		if (!(other instanceof SerializablePerson)) {
 			return false;
@@ -67,4 +71,9 @@ public boolean equals(Object other) {
 		return p.age == age && ObjectUtils.nullSafeEquals(name, p.name);
 	}
 
+	@Override
+	public int hashCode() {
+		return SerializablePerson.class.hashCode();
+	}
+
 }
diff --git a/spring-aspects/aspects.gradle b/spring-aspects/aspects.gradle
index 8172830316..59a0ae615f 100644
--- a/spring-aspects/aspects.gradle
+++ b/spring-aspects/aspects.gradle
@@ -12,8 +12,8 @@ configurations {
 tasks.getByName("idea").onlyIf { false }
 tasks.getByName("ideaModule").onlyIf { false }
 
-task compileJava(overwrite: true)  {
-	dependsOn JavaPlugin.PROCESS_RESOURCES_TASK_NAME
+compileJava  {
+	actions = []
 	dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileJava")
 
 	def outputDir = project.sourceSets.main.output.classesDir
@@ -44,8 +44,8 @@ task compileJava(overwrite: true)  {
 	}
 }
 
-task compileTestJava(overwrite: true)  {
-	dependsOn JavaPlugin.PROCESS_TEST_RESOURCES_TASK_NAME
+compileTestJava  {
+	actions = []
 	dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileTestJava")
 	dependsOn jar
 
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj
index fa8fc6441f..e0a9e9fad4 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,26 +27,18 @@ import org.aspectj.lang.annotation.control.CodeGenerationHint;
  * @since 2.5.2
  */
 public abstract aspect AbstractDependencyInjectionAspect {
-	/**
-	 * Select construction join points for objects to inject dependencies
-	 */
-	public abstract pointcut beanConstruction(Object bean);
 
-	/**
-	 * Select deserialization join points for objects to inject dependencies
-	 */
-	public abstract pointcut beanDeserialization(Object bean);
+	private pointcut preConstructionCondition() :
+			leastSpecificSuperTypeConstruction() && preConstructionConfiguration();
 
-	/**
-	 * Select join points in a configurable bean
-	 */
-	public abstract pointcut inConfigurableBean();
+	private pointcut postConstructionCondition() :
+			mostSpecificSubTypeConstruction() && !preConstructionConfiguration();
 
 	/**
-	 * Select join points in beans to be configured prior to construction?
-	 * By default, use post-construction injection matching the default in the Configurable annotation.
+	 * Select least specific super type that is marked for DI
+	 * (so that injection occurs only once with pre-construction injection).
 	 */
-	public pointcut preConstructionConfiguration() : if(false);
+	public abstract pointcut leastSpecificSuperTypeConstruction();
 
 	/**
 	 * Select the most-specific initialization join point
@@ -54,31 +46,36 @@ public abstract aspect AbstractDependencyInjectionAspect {
 	 */
 	@CodeGenerationHint(ifNameSuffix="6f1")
 	public pointcut mostSpecificSubTypeConstruction() :
-		if(thisJoinPoint.getSignature().getDeclaringType() == thisJoinPoint.getThis().getClass());
+			if (thisJoinPoint.getSignature().getDeclaringType() == thisJoinPoint.getThis().getClass());
 
 	/**
-	 * Select least specific super type that is marked for DI (so that injection occurs only once with pre-construction inejection
+	 * Select join points in beans to be configured prior to construction?
+	 * By default, use post-construction injection matching the default in the Configurable annotation.
 	 */
-	public abstract pointcut leastSpecificSuperTypeConstruction();
+	public pointcut preConstructionConfiguration() : if (false);
 
 	/**
-	 * Configure the bean
+	 * Select construction join points for objects to inject dependencies.
 	 */
-	public abstract void configureBean(Object bean);
+	public abstract pointcut beanConstruction(Object bean);
 
+	/**
+	 * Select deserialization join points for objects to inject dependencies.
+	 */
+	public abstract pointcut beanDeserialization(Object bean);
 
-	private pointcut preConstructionCondition() :
-		leastSpecificSuperTypeConstruction() && preConstructionConfiguration();
+	/**
+	 * Select join points in a configurable bean.
+	 */
+	public abstract pointcut inConfigurableBean();
 
-	private pointcut postConstructionCondition() :
-		mostSpecificSubTypeConstruction() && !preConstructionConfiguration();
 
 	/**
 	 * Pre-construction configuration.
 	 */
 	@SuppressAjWarnings("adviceDidNotMatch")
 	before(Object bean) :
-		beanConstruction(bean) && preConstructionCondition() && inConfigurableBean()  {
+			beanConstruction(bean) && preConstructionCondition() && inConfigurableBean()  {
 		configureBean(bean);
 	}
 
@@ -87,7 +84,7 @@ public abstract aspect AbstractDependencyInjectionAspect {
 	 */
 	@SuppressAjWarnings("adviceDidNotMatch")
 	after(Object bean) returning :
-		beanConstruction(bean) && postConstructionCondition() && inConfigurableBean() {
+			beanConstruction(bean) && postConstructionCondition() && inConfigurableBean() {
 		configureBean(bean);
 	}
 
@@ -96,8 +93,14 @@ public abstract aspect AbstractDependencyInjectionAspect {
 	 */
 	@SuppressAjWarnings("adviceDidNotMatch")
 	after(Object bean) returning :
-		beanDeserialization(bean) && inConfigurableBean() {
+			beanDeserialization(bean) && inConfigurableBean() {
 		configureBean(bean);
 	}
 
+
+	/**
+	 * Configure the given bean.
+	 */
+	public abstract void configureBean(Object bean);
+
 }
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj
index 8270d6962d..a65be5f5bb 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,49 +20,48 @@ import java.io.ObjectStreamException;
 import java.io.Serializable;
 
 /**
- * An aspect that injects dependency into any object whose type implements the {@link ConfigurableObject} interface.
- * <p>
- * This aspect supports injecting into domain objects when they are created for the first time as well as
- * upon deserialization. Subaspects need to simply provide definition for the configureBean() method. This
- * method may be implemented without relying on Spring container if so desired.
- * </p>
- * <p>
- * There are two cases that needs to be handled:
+ * An aspect that injects dependency into any object whose type implements the
+ * {@link ConfigurableObject} interface.
+ *
+ * <p>This aspect supports injecting into domain objects when they are created
+ * for the first time as well as upon deserialization. Subaspects need to simply
+ * provide definition for the configureBean() method. This method may be
+ * implemented without relying on Spring container if so desired.
+ *
+ * <p>There are two cases that needs to be handled:
  * <ol>
- *   <li>Normal object creation via the '{@code new}' operator: this is
- *       taken care of by advising {@code initialization()} join points.</li>
- *   <li>Object creation through deserialization: since no constructor is
- *       invoked during deserialization, the aspect needs to advise a method that a
- *       deserialization mechanism is going to invoke. Ideally, we should not
- *       require user classes to implement any specific method. This implies that
- *       we need to <i>introduce</i> the chosen method. We should also handle the cases
- *       where the chosen method is already implemented in classes (in which case,
- *       the user's implementation for that method should take precedence over the
- *       introduced implementation). There are a few choices for the chosen method:
- *       <ul>
- *       <li>readObject(ObjectOutputStream): Java requires that the method must be
- *           {@code private}</p>. Since aspects cannot introduce a private member,
- *           while preserving its name, this option is ruled out.</li>
- * 		 <li>readResolve(): Java doesn't pose any restriction on an access specifier.
- *           Problem solved! There is one (minor) limitation of this approach in
- *           that if a user class already has this method, that method must be
- *           {@code public}. However, this shouldn't be a big burden, since
- *           use cases that need classes to implement readResolve() (custom enums,
- *           for example) are unlikely to be marked as &#64;Configurable, and
- *           in any case asking to make that method {@code public} should not
- *           pose any undue burden.</li>
- *       </ul>
- *       The minor collaboration needed by user classes (i.e., that the
- *       implementation of {@code readResolve()}, if any, must be
- *       {@code public}) can be lifted as well if we were to use an
- *       experimental feature in AspectJ - the {@code hasmethod()} PCD.</li>
+ * <li>Normal object creation via the '{@code new}' operator: this is
+ * taken care of by advising {@code initialization()} join points.</li>
+ * <li>Object creation through deserialization: since no constructor is
+ * invoked during deserialization, the aspect needs to advise a method that a
+ * deserialization mechanism is going to invoke. Ideally, we should not
+ * require user classes to implement any specific method. This implies that
+ * we need to <i>introduce</i> the chosen method. We should also handle the cases
+ * where the chosen method is already implemented in classes (in which case,
+ * the user's implementation for that method should take precedence over the
+ * introduced implementation). There are a few choices for the chosen method:
+ * <ul>
+ * <li>readObject(ObjectOutputStream): Java requires that the method must be
+ * {@code private}</p>. Since aspects cannot introduce a private member,
+ * while preserving its name, this option is ruled out.</li>
+ * <li>readResolve(): Java doesn't pose any restriction on an access specifier.
+ * Problem solved! There is one (minor) limitation of this approach in
+ * that if a user class already has this method, that method must be
+ * {@code public}. However, this shouldn't be a big burden, since
+ * use cases that need classes to implement readResolve() (custom enums,
+ * for example) are unlikely to be marked as &#64;Configurable, and
+ * in any case asking to make that method {@code public} should not
+ * pose any undue burden.</li>
+ * </ul>
+ * The minor collaboration needed by user classes (i.e., that the implementation of
+ * {@code readResolve()}, if any, must be {@code public}) can be lifted as well if we
+ * were to use an experimental feature in AspectJ - the {@code hasmethod()} PCD.</li>
  * </ol>
-
- * <p>
- * While having type implement the {@link ConfigurableObject} interface is certainly a valid choice, an alternative
- * is to use a 'declare parents' statement another aspect (a subaspect of this aspect would be a logical choice)
- * that declares the classes that need to be configured by supplying the {@link ConfigurableObject} interface.
- * </p>
+ *
+ * <p>While having type implement the {@link ConfigurableObject} interface is certainly
+ * a valid choice, an alternative is to use a 'declare parents' statement another aspect
+ * (a subaspect of this aspect would be a logical choice) that declares the classes that
+ * need to be configured by supplying the {@link ConfigurableObject} interface.
  *
  * @author Ramnivas Laddad
  * @since 2.5.2
@@ -72,35 +71,33 @@ public abstract aspect AbstractInterfaceDrivenDependencyInjectionAspect extends
 	 * Select initialization join point as object construction
 	 */
 	public pointcut beanConstruction(Object bean) :
-		initialization(ConfigurableObject+.new(..)) && this(bean);
+			initialization(ConfigurableObject+.new(..)) && this(bean);
 
 	/**
 	 * Select deserialization join point made available through ITDs for ConfigurableDeserializationSupport
 	 */
 	public pointcut beanDeserialization(Object bean) :
-		execution(Object ConfigurableDeserializationSupport+.readResolve()) &&
-		this(bean);
+			execution(Object ConfigurableDeserializationSupport+.readResolve()) && this(bean);
 
 	public pointcut leastSpecificSuperTypeConstruction() : initialization(ConfigurableObject.new(..));
 
 
 
 	// Implementation to support re-injecting dependencies once an object is deserialized
+
 	/**
 	 * Declare any class implementing Serializable and ConfigurableObject as also implementing
-	 * ConfigurableDeserializationSupport. This allows us to introduce the readResolve()
+	 * ConfigurableDeserializationSupport. This allows us to introduce the {@code readResolve()}
 	 * method and select it with the beanDeserialization() pointcut.
-	 *
 	 * <p>Here is an improved version that uses the hasmethod() pointcut and lifts
 	 * even the minor requirement on user classes:
-	 *
-	 * <pre class="code">declare parents: ConfigurableObject+ Serializable+
-	 *		            && !hasmethod(Object readResolve() throws ObjectStreamException)
-	 *		            implements ConfigurableDeserializationSupport;
+	 * <pre class="code">
+	 * declare parents: ConfigurableObject+ Serializable+
+	 * && !hasmethod(Object readResolve() throws ObjectStreamException)
+	 * implements ConfigurableDeserializationSupport;
 	 * </pre>
 	 */
-	declare parents:
-		ConfigurableObject+ && Serializable+	implements ConfigurableDeserializationSupport;
+	declare parents: ConfigurableObject+ && Serializable+ implements ConfigurableDeserializationSupport;
 
 	/**
 	 * A marker interface to which the {@code readResolve()} is introduced.
@@ -111,7 +108,6 @@ public abstract aspect AbstractInterfaceDrivenDependencyInjectionAspect extends
 	/**
 	 * Introduce the {@code readResolve()} method so that we can advise its
 	 * execution to configure the object.
-	 *
 	 * <p>Note if a method with the same signature already exists in a
 	 * {@code Serializable} class of ConfigurableObject type,
 	 * that implementation will take precedence (a good thing, since we are
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj
index 2f1e91ccd2..81635ccd0e 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.beans.factory.aspectj;
 import java.io.Serializable;
 
 import org.aspectj.lang.annotation.control.CodeGenerationHint;
-import org.springframework.beans.BeansException;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.DisposableBean;
@@ -44,48 +44,47 @@ import org.springframework.beans.factory.wiring.BeanConfigurerSupport;
  * @see org.springframework.beans.factory.annotation.Configurable
  * @see org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver
  */
-public aspect AnnotationBeanConfigurerAspect
-		extends AbstractInterfaceDrivenDependencyInjectionAspect
+public aspect AnnotationBeanConfigurerAspect extends AbstractInterfaceDrivenDependencyInjectionAspect
 		implements BeanFactoryAware, InitializingBean, DisposableBean {
 
 	private BeanConfigurerSupport beanConfigurerSupport = new BeanConfigurerSupport();
 
-	public pointcut inConfigurableBean() : @this(Configurable);
 
-	public pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);
-
-	declare parents: @Configurable * implements ConfigurableObject;
-
-	public void configureBean(Object bean) {
-		beanConfigurerSupport.configureBean(bean);
+	public void setBeanFactory(BeanFactory beanFactory) {
+		this.beanConfigurerSupport.setBeanFactory(beanFactory);
+		this.beanConfigurerSupport.setBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver());
 	}
 
-
-	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-		beanConfigurerSupport.setBeanFactory(beanFactory);
-		beanConfigurerSupport.setBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver());
+	public void afterPropertiesSet() throws Exception {
+		this.beanConfigurerSupport.afterPropertiesSet();
 	}
 
-	public void afterPropertiesSet() throws Exception {
-		beanConfigurerSupport.afterPropertiesSet();
+	public void configureBean(Object bean) {
+		this.beanConfigurerSupport.configureBean(bean);
 	}
 
 	public void destroy() throws Exception {
-		beanConfigurerSupport.destroy();
+		this.beanConfigurerSupport.destroy();
 	}
 
 
+	public pointcut inConfigurableBean() : @this(Configurable);
+
+	public pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);
+
 	/*
 	 * An intermediary to match preConstructionConfiguration signature (that doesn't expose the annotation object)
 	 */
 	@CodeGenerationHint(ifNameSuffix="bb0")
-	private pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if(c.preConstruction());
+	private pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if (c.preConstruction());
+
+
+	declare parents: @Configurable * implements ConfigurableObject;
 
 	/*
 	 * This declaration shouldn't be needed,
 	 * except for an AspectJ bug (https://bugs.eclipse.org/bugs/show_bug.cgi?id=214559)
 	 */
-	declare parents: @Configurable Serializable+
-		implements ConfigurableDeserializationSupport;
+	declare parents: @Configurable Serializable+ implements ConfigurableDeserializationSupport;
 
 }
diff --git a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java
index 740ddaddca..696ba51320 100644
--- a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java
+++ b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
 @Configuration
 public class AspectJCachingConfiguration extends AbstractCachingConfiguration {
 
-	@Bean(name=AnnotationConfigUtils.CACHE_ASPECT_BEAN_NAME)
+	@Bean(name = AnnotationConfigUtils.CACHE_ASPECT_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public AnnotationCacheAspect cacheAspect() {
 		AnnotationCacheAspect cacheAspect = AnnotationCacheAspect.aspectOf();
@@ -47,4 +47,5 @@ public AnnotationCacheAspect cacheAspect() {
 		}
 		return cacheAspect;
 	}
+
 }
diff --git a/spring-aspects/src/main/java/org/springframework/context/annotation/aspectj/SpringConfiguredConfiguration.java b/spring-aspects/src/main/java/org/springframework/context/annotation/aspectj/SpringConfiguredConfiguration.java
index 8534fd76b5..747f280f27 100644
--- a/spring-aspects/src/main/java/org/springframework/context/annotation/aspectj/SpringConfiguredConfiguration.java
+++ b/spring-aspects/src/main/java/org/springframework/context/annotation/aspectj/SpringConfiguredConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,9 +28,9 @@
  * annotated with @{@link org.springframework.beans.factory.annotation.Configurable
  * Configurable}.
  *
- * <p>This configuration class is automatically imported when using the @{@link
- * EnableSpringConfigured} annotation. See {@code @EnableSpringConfigured} Javadoc for
- * complete usage details.
+ * <p>This configuration class is automatically imported when using the
+ * @{@link EnableSpringConfigured} annotation. See {@code @EnableSpringConfigured}'s
+ * javadoc for complete usage details.
  *
  * @author Chris Beams
  * @since 3.1
@@ -42,9 +42,10 @@ public class SpringConfiguredConfiguration {
 	public static final String BEAN_CONFIGURER_ASPECT_BEAN_NAME =
 			"org.springframework.context.config.internalBeanConfigurerAspect";
 
-	@Bean(name=BEAN_CONFIGURER_ASPECT_BEAN_NAME)
+	@Bean(name = BEAN_CONFIGURER_ASPECT_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public AnnotationBeanConfigurerAspect beanConfigurerAspect() {
 		return AnnotationBeanConfigurerAspect.aspectOf();
 	}
+
 }
diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
index 972a324859..4661840f61 100644
--- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
+++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,22 @@ package org.springframework.mock.staticmock;
 
 import java.util.Arrays;
 import java.util.LinkedList;
-import java.util.List;
+
+import org.springframework.util.ObjectUtils;
 
 /**
  * Abstract aspect to enable mocking of methods picked out by a pointcut.
- * Sub-aspects must define the mockStaticsTestMethod() pointcut to
- * indicate call stacks when mocking should be triggered, and the
- * methodToMock() pointcut to pick out a method invocations to mock.
+ *
+ * <p>Sub-aspects must define:
+ * <ul>
+ * <li>the {@link #mockStaticsTestMethod()} pointcut to indicate call stacks
+ * when mocking should be triggered
+ * <li>the {@link #methodToMock()} pointcut to pick out method invocations to mock
+ * </ul>
  *
  * @author Rod Johnson
  * @author Ramnivas Laddad
+ * @author Sam Brannen
  */
 public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMethod()) {
 
@@ -35,24 +41,34 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 
 	protected abstract pointcut methodToMock();
 
+
 	private boolean recording = true;
 
-	static enum CallResponse { nothing, return_, throw_ };
 
-	// Represents a list of expected calls to static entity methods
+	static enum CallResponse {
+		nothing, return_, throw_
+	};
+
+	/**
+	 * Represents a list of expected calls to methods.
+	 */
 	// Public to allow inserted code to access: is this normal??
 	public class Expectations {
 
-		// Represents an expected call to a static entity method
+		/**
+		 * Represents an expected call to a method.
+		 */
 		private class Call {
+
 			private final String signature;
 			private final Object[] args;
 
 			private Object responseObject; // return value or throwable
 			private CallResponse responseType = CallResponse.nothing;
 
-			public Call(String name, Object[] args) {
-				this.signature = name;
+
+			public Call(String signature, Object[] args) {
+				this.signature = signature;
 				this.args = args;
 			}
 
@@ -77,7 +93,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 
 			public Object throwException(String lastSig, Object[] args) {
 				checkSignature(lastSig, args);
-				throw (RuntimeException)responseObject;
+				throw (RuntimeException) responseObject;
 			}
 
 			private void checkSignature(String lastSig, Object[] args) {
@@ -88,50 +104,62 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 					throw new IllegalArgumentException("Arguments don't match");
 				}
 			}
+
+			@Override
+			public String toString() {
+				return String.format("Call with signature [%s] and arguments %s", this.signature,
+					ObjectUtils.nullSafeToString(args));
+			}
 		}
 
-		private List<Call> calls = new LinkedList<Call>();
 
-		// Calls already verified
+		/**
+		 * The list of recorded calls.
+		 */
+		private final LinkedList<Call> calls = new LinkedList<Call>();
+
+		/**
+		 * The number of calls already verified.
+		 */
 		private int verified;
 
+
 		public void verify() {
 			if (verified != calls.size()) {
-				throw new IllegalStateException("Expected " + calls.size()
-						+ " calls, received " + verified);
+				throw new IllegalStateException("Expected " + calls.size() + " calls, but received " + verified);
 			}
 		}
 
 		/**
-		 * Validate the call and provide the expected return value
-		 * @param lastSig
-		 * @param args
-		 * @return
+		 * Validate the call and provide the expected return value.
 		 */
 		public Object respond(String lastSig, Object[] args) {
-			Call call = nextCall();
-			CallResponse responseType = call.responseType;
-			if (responseType == CallResponse.return_) {
-				return call.returnValue(lastSig, args);
-			} else if(responseType == CallResponse.throw_) {
-				return (RuntimeException)call.throwException(lastSig, args);
-			} else if(responseType == CallResponse.nothing) {
-				// do nothing
+			Call c = nextCall();
+
+			switch (c.responseType) {
+				case return_: {
+					return c.returnValue(lastSig, args);
+				}
+				case throw_: {
+					return c.throwException(lastSig, args);
+				}
+				default: {
+					throw new IllegalStateException("Behavior of " + c + " not specified");
+				}
 			}
-			throw new IllegalStateException("Behavior of " + call + " not specified");
 		}
 
 		private Call nextCall() {
-			if (verified > calls.size() - 1) {
-				throw new IllegalStateException("Expected " + calls.size()
-						+ " calls, received " + verified);
+			verified++;
+			if (verified > calls.size()) {
+				throw new IllegalStateException("Expected " + calls.size() + " calls, but received " + verified);
 			}
-			return calls.get(verified++);
+			// The 'verified' count is 1-based; whereas, 'calls' is 0-based.
+			return calls.get(verified - 1);
 		}
 
-		public void expectCall(String lastSig, Object lastArgs[]) {
-			Call call = new Call(lastSig, lastArgs);
-			calls.add(call);
+		public void expectCall(String lastSig, Object[] lastArgs) {
+			calls.add(new Call(lastSig, lastArgs));
 		}
 
 		public boolean hasCalls() {
@@ -139,29 +167,31 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 		}
 
 		public void expectReturn(Object retVal) {
-			Call call = calls.get(calls.size() - 1);
-			if (call.hasResponseSpecified()) {
-				throw new IllegalStateException("No static method invoked before setting return value");
+			Call c = calls.getLast();
+			if (c.hasResponseSpecified()) {
+				throw new IllegalStateException("No method invoked before setting return value");
 			}
-			call.setReturnVal(retVal);
+			c.setReturnVal(retVal);
 		}
 
 		public void expectThrow(Throwable throwable) {
-			Call call = calls.get(calls.size() - 1);
-			if (call.hasResponseSpecified()) {
-				throw new IllegalStateException("No static method invoked before setting throwable");
+			Call c = calls.getLast();
+			if (c.hasResponseSpecified()) {
+				throw new IllegalStateException("No method invoked before setting throwable");
 			}
-			call.setThrow(throwable);
+			c.setThrow(throwable);
 		}
 	}
 
-	private Expectations expectations = new Expectations();
+
+	private final Expectations expectations = new Expectations();
+
 
 	after() returning : mockStaticsTestMethod() {
 		if (recording && (expectations.hasCalls())) {
 			throw new IllegalStateException(
-					"Calls recorded, yet playback state never reached: Create expectations then call "
-							+ this.getClass().getSimpleName() + ".playback()");
+				"Calls recorded, yet playback state never reached: Create expectations then call "
+						+ this.getClass().getSimpleName() + ".playback()");
 		}
 		expectations.verify();
 	}
@@ -171,7 +201,8 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 			expectations.expectCall(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());
 			// Return value doesn't matter
 			return null;
-		} else {
+		}
+		else {
 			return expectations.respond(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());
 		}
 	}
diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj
index 816f6a1e42..a9985e9c7e 100644
--- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj
+++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,50 +17,69 @@
 package org.springframework.mock.staticmock;
 
 /**
- * Annotation-based aspect to use in test build to enable mocking static methods
- * on JPA-annotated {@code @Entity} classes, as used by Roo for finders.
+ * Annotation-based aspect to use in test builds to enable mocking of static methods
+ * on JPA-annotated {@code @Entity} classes, as used by Spring Roo for so-called
+ * <em>finder methods</em>.
  *
- * <p>Mocking will occur in the call stack of any method in a class (typically a test class)
- * that is annotated with the @MockStaticEntityMethods annotation.
+ * <p>Mocking will occur within the call stack of any method in a class (typically a
+ * test class) that is annotated with {@code @MockStaticEntityMethods}.
  *
- * <p>Also provides static methods to simplify the programming model for
- * entering playback mode and setting expected return values.
+ * <p>This aspect also provides static methods to simplify the programming model for
+ * setting expectations and entering playback mode.
  *
  * <p>Usage:
  * <ol>
- * <li>Annotate a test class with @MockStaticEntityMethods.
- * <li>In each test method, AnnotationDrivenStaticEntityMockingControl will begin in recording mode.
- * Invoke static methods on Entity classes, with each recording-mode invocation
- * being followed by an invocation to the static expectReturn() or expectThrow()
- * method on AnnotationDrivenStaticEntityMockingControl.
- * <li>Invoke the static AnnotationDrivenStaticEntityMockingControl() method.
- * <li>Call the code you wish to test that uses the static methods. Verification will
- * occur automatically.
+ * <li>Annotate a test class with {@code @MockStaticEntityMethods}.
+ * <li>In each test method, {@code AnnotationDrivenStaticEntityMockingControl}
+ * will begin in <em>recording</em> mode.
+ * <li>Invoke static methods on JPA-annotated {@code @Entity} classes, with each
+ * recording-mode invocation being followed by an invocation of either the static
+ * {@link #expectReturn(Object)} method or the static {@link #expectThrow(Throwable)}
+ * method on {@code AnnotationDrivenStaticEntityMockingControl}.
+ * <li>Invoke the static {@link #playback()} method.
+ * <li>Call the code you wish to test that uses the static methods.
+ * <li>Verification will occur automatically.
  * </ol>
  *
  * @author Rod Johnson
  * @author Ramnivas Laddad
+ * @author Sam Brannen
  * @see MockStaticEntityMethods
  */
 public aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {
 
 	/**
-	 * Stop recording mock calls and enter playback state
+	 * Expect the supplied {@link Object} to be returned by the previous static
+	 * method invocation.
+	 * @see #playback()
 	 */
-	public static void playback() {
-		AnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();
-	}
-
 	public static void expectReturn(Object retVal) {
 		AnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);
 	}
 
+	/**
+	 * Expect the supplied {@link Throwable} to be thrown by the previous static
+	 * method invocation.
+	 * @see #playback()
+	 */
 	public static void expectThrow(Throwable throwable) {
 		AnnotationDrivenStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);
 	}
 
-	// Only matches directly annotated @Test methods, to allow methods in
-	// @MockStatics classes to invoke each other without resetting the mocking environment
+	/**
+	 * Stop recording mock expectations and enter <em>playback</em> mode.
+	 * @see #expectReturn(Object)
+	 * @see #expectThrow(Throwable)
+	 */
+	public static void playback() {
+		AnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();
+	}
+	
+	// Apparently, the following pointcut was originally defined to only match
+	// methods directly annotated with @Test (in order to allow methods in
+	// @MockStaticEntityMethods classes to invoke each other without resetting
+	// the mocking environment); however, this is no longer the case. The current
+	// pointcut applies to all public methods in @MockStaticEntityMethods classes.
 	protected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));
 
 	protected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..));
diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java b/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java
index 913d147b3e..f68b80640b 100644
--- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java
+++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,13 @@
 import java.lang.annotation.Target;
 
 /**
- * Annotation to indicate a test class for whose @Test methods
- * static methods on Entity classes should be mocked. See
- * {@code AbstractMethodMockingControl}.
+ * Annotation to indicate a test class for whose {@code @Test} methods
+ * static methods on JPA-annotated {@code @Entity} classes should be mocked.
+ *
+ * <p>See {@link AnnotationDrivenStaticEntityMockingControl} for details.
  *
  * @author Rod Johnson
+ * @author Sam Brannen
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java
index c2df8e984d..ee02e6624f 100644
--- a/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java
+++ b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,12 +32,12 @@
  * @since 3.1
  * @see EnableAsync
  * @see org.springframework.scheduling.annotation.AsyncConfigurationSelector
+ * @see org.springframework.scheduling.annotation.ProxyAsyncConfiguration
  */
 @Configuration
 public class AspectJAsyncConfiguration extends AbstractAsyncConfiguration {
 
-	@Override
-	@Bean(name=AnnotationConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME)
+	@Bean(name = AnnotationConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public AnnotationAsyncExecutionAspect asyncAdvisor() {
 		AnnotationAsyncExecutionAspect asyncAspect = AnnotationAsyncExecutionAspect.aspectOf();
diff --git a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java
index 582de64462..41993f81d4 100644
--- a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java
+++ b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
 @Configuration
 public class AspectJTransactionManagementConfiguration extends AbstractTransactionManagementConfiguration {
 
-	@Bean(name=TransactionManagementConfigUtils.TRANSACTION_ASPECT_BEAN_NAME)
+	@Bean(name = TransactionManagementConfigUtils.TRANSACTION_ASPECT_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public AnnotationTransactionAspect transactionAspect() {
 		AnnotationTransactionAspect txAspect = AnnotationTransactionAspect.aspectOf();
@@ -46,4 +46,5 @@ public AnnotationTransactionAspect transactionAspect() {
 		}
 		return txAspect;
 	}
+
 }
diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
deleted file mode 100644
index 5a531301c9..0000000000
--- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.staticmock;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.springframework.mock.staticmock.AnnotationDrivenStaticEntityMockingControl.expectReturn;
-import static org.springframework.mock.staticmock.AnnotationDrivenStaticEntityMockingControl.expectThrow;
-import static org.springframework.mock.staticmock.AnnotationDrivenStaticEntityMockingControl.playback;
-
-import javax.persistence.PersistenceException;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-
-/**
- * Test for static entity mocking framework.
- * @author Rod Johnson
- * @author Ramnivas Laddad
- *
- */
-@MockStaticEntityMethods
-@RunWith(JUnit4.class)
-public class AnnotationDrivenStaticEntityMockingControlTest {
-
-	@Test
-	public void testNoArgIntReturn() {
-		int expectedCount = 13;
-		Person.countPeople();
-		expectReturn(expectedCount);
-		playback();
-		assertEquals(expectedCount, Person.countPeople());
-	}
-
-	@Test(expected=PersistenceException.class)
-	public void testNoArgThrows() {
-		Person.countPeople();
-		expectThrow(new PersistenceException());
-		playback();
-		Person.countPeople();
-	}
-
-	@Test
-	public void testArgMethodMatches() {
-		long id = 13;
-		Person found = new Person();
-		Person.findPerson(id);
-		expectReturn(found);
-		playback();
-		assertEquals(found, Person.findPerson(id));
-	}
-
-
-	@Test
-	public void testLongSeriesOfCalls() {
-		long id1 = 13;
-		long id2 = 24;
-		Person found1 = new Person();
-		Person.findPerson(id1);
-		expectReturn(found1);
-		Person found2 = new Person();
-		Person.findPerson(id2);
-		expectReturn(found2);
-		Person.findPerson(id1);
-		expectReturn(found1);
-		Person.countPeople();
-		expectReturn(0);
-		playback();
-
-		assertEquals(found1, Person.findPerson(id1));
-		assertEquals(found2, Person.findPerson(id2));
-		assertEquals(found1, Person.findPerson(id1));
-		assertEquals(0, Person.countPeople());
-	}
-
-	// Note delegation is used when tests are invalid and should fail, as otherwise
-	// the failure will occur on the verify() method in the aspect after
-	// this method returns, failing the test case
-	@Test
-	public void testArgMethodNoMatchExpectReturn() {
-		try {
-			new Delegate().testArgMethodNoMatchExpectReturn();
-			fail();
-		} catch (IllegalArgumentException expected) {
-		}
-	}
-
-	@Test(expected=IllegalArgumentException.class)
-	public void testArgMethodNoMatchExpectThrow() {
-		new Delegate().testArgMethodNoMatchExpectThrow();
-	}
-
-	private void called(Person found, long id) {
-		assertEquals(found, Person.findPerson(id));
-	}
-
-	@Test
-	public void testReentrant() {
-		long id = 13;
-		Person found = new Person();
-		Person.findPerson(id);
-		expectReturn(found);
-		playback();
-		called(found, id);
-	}
-
-	@Test(expected=IllegalStateException.class)
-	public void testRejectUnexpectedCall() {
-		new Delegate().rejectUnexpectedCall();
-	}
-
-	@Test(expected=IllegalStateException.class)
-	public void testFailTooFewCalls() {
-		new Delegate().failTooFewCalls();
-	}
-
-	@Test
-	public void testEmpty() {
-		// Test that verification check doesn't blow up if no replay() call happened
-	}
-
-	@Test(expected=IllegalStateException.class)
-	public void testDoesntEverReplay() {
-		new Delegate().doesntEverReplay();
-	}
-
-	@Test(expected=IllegalStateException.class)
-	public void testDoesntEverSetReturn() {
-		new Delegate().doesntEverSetReturn();
-	}
-}
-
diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTests.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTests.java
new file mode 100644
index 0000000000..4993fbc297
--- /dev/null
+++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTests.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.mock.staticmock;
+
+import java.rmi.RemoteException;
+
+import javax.persistence.PersistenceException;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+import static org.springframework.mock.staticmock.AnnotationDrivenStaticEntityMockingControl.*;
+
+/**
+ * Tests for Spring's static entity mocking framework (i.e., @{@link MockStaticEntityMethods}
+ * and {@link AnnotationDrivenStaticEntityMockingControl}).
+ * 
+ * @author Rod Johnson
+ * @author Ramnivas Laddad
+ * @author Sam Brannen
+ */
+@MockStaticEntityMethods
+public class AnnotationDrivenStaticEntityMockingControlTests {
+
+	@Test
+	public void noArgumentMethodInvocationReturnsInt() {
+		int expectedCount = 13;
+		Person.countPeople();
+		expectReturn(expectedCount);
+		playback();
+		assertEquals(expectedCount, Person.countPeople());
+	}
+
+	@Test(expected = PersistenceException.class)
+	public void noArgumentMethodInvocationThrowsException() {
+		Person.countPeople();
+		expectThrow(new PersistenceException());
+		playback();
+		Person.countPeople();
+	}
+
+	@Test
+	public void methodArgumentsMatch() {
+		long id = 13;
+		Person found = new Person();
+		Person.findPerson(id);
+		expectReturn(found);
+		playback();
+		assertEquals(found, Person.findPerson(id));
+	}
+
+	@Test
+	public void longSeriesOfCalls() {
+		long id1 = 13;
+		long id2 = 24;
+		Person found1 = new Person();
+		Person.findPerson(id1);
+		expectReturn(found1);
+		Person found2 = new Person();
+		Person.findPerson(id2);
+		expectReturn(found2);
+		Person.findPerson(id1);
+		expectReturn(found1);
+		Person.countPeople();
+		expectReturn(0);
+		playback();
+
+		assertEquals(found1, Person.findPerson(id1));
+		assertEquals(found2, Person.findPerson(id2));
+		assertEquals(found1, Person.findPerson(id1));
+		assertEquals(0, Person.countPeople());
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void methodArgumentsDoNotMatchAndReturnsObject() {
+		long id = 13;
+		Person found = new Person();
+		Person.findPerson(id);
+		AnnotationDrivenStaticEntityMockingControl.expectReturn(found);
+		AnnotationDrivenStaticEntityMockingControl.playback();
+		assertEquals(found, Person.findPerson(id + 1));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void methodArgumentsDoNotMatchAndThrowsException() {
+		long id = 13;
+		Person found = new Person();
+		Person.findPerson(id);
+		AnnotationDrivenStaticEntityMockingControl.expectThrow(new PersistenceException());
+		AnnotationDrivenStaticEntityMockingControl.playback();
+		assertEquals(found, Person.findPerson(id + 1));
+	}
+
+	@Test
+	public void reentrant() {
+		long id = 13;
+		Person found = new Person();
+		Person.findPerson(id);
+		expectReturn(found);
+		playback();
+		called(found, id);
+	}
+
+	private void called(Person found, long id) {
+		assertEquals(found, Person.findPerson(id));
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void rejectUnexpectedCall() {
+		AnnotationDrivenStaticEntityMockingControl.playback();
+		Person.countPeople();
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void tooFewCalls() {
+		long id = 13;
+		Person found = new Person();
+		Person.findPerson(id);
+		AnnotationDrivenStaticEntityMockingControl.expectReturn(found);
+		Person.countPeople();
+		AnnotationDrivenStaticEntityMockingControl.expectReturn(25);
+		AnnotationDrivenStaticEntityMockingControl.playback();
+		assertEquals(found, Person.findPerson(id));
+	}
+
+	@Test
+	public void empty() {
+		// Test that verification check doesn't blow up if no replay() call happened.
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void doesNotEnterPlaybackMode() {
+		Person.countPeople();
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void doesNotSetExpectedReturnValue() {
+		Person.countPeople();
+		AnnotationDrivenStaticEntityMockingControl.playback();
+	}
+
+	/**
+	 * Note: this test method currently does NOT actually verify that the mock
+	 * verification fails.
+	 */
+	// TODO Determine if it's possible for a mock verification failure to fail a test in
+	// JUnit 4+ if the test method itself throws an expected exception.
+	@Test(expected = RemoteException.class)
+	public void verificationFailsEvenWhenTestFailsInExpectedManner() throws Exception {
+		Person.countPeople();
+		AnnotationDrivenStaticEntityMockingControl.playback();
+		// No calls in order to allow verification failure
+		throw new RemoteException();
+	}
+
+}
diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
deleted file mode 100644
index d4b3206bc3..0000000000
--- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.staticmock;
-
-import static org.junit.Assert.assertEquals;
-
-import java.rmi.RemoteException;
-
-import javax.persistence.PersistenceException;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.springframework.mock.staticmock.AnnotationDrivenStaticEntityMockingControl;
-import org.springframework.mock.staticmock.MockStaticEntityMethods;
-
-//Used because verification failures occur after method returns,
-//so we can't test for them in the test case itself
-@MockStaticEntityMethods
-@Ignore // This isn't meant for direct testing; rather it is driven from AnnotationDrivenStaticEntityMockingControl
-public class Delegate {
-
-	@Test
-	public void testArgMethodNoMatchExpectReturn() {
-		long id = 13;
-		Person found = new Person();
-		Person.findPerson(id);
-		AnnotationDrivenStaticEntityMockingControl.expectReturn(found);
-		AnnotationDrivenStaticEntityMockingControl.playback();
-		assertEquals(found, Person.findPerson(id + 1));
-	}
-
-	@Test
-	public void testArgMethodNoMatchExpectThrow() {
-		long id = 13;
-		Person found = new Person();
-		Person.findPerson(id);
-		AnnotationDrivenStaticEntityMockingControl.expectThrow(new PersistenceException());
-		AnnotationDrivenStaticEntityMockingControl.playback();
-		assertEquals(found, Person.findPerson(id + 1));
-	}
-
-	@Test
-	public void failTooFewCalls() {
-		long id = 13;
-		Person found = new Person();
-		Person.findPerson(id);
-		AnnotationDrivenStaticEntityMockingControl.expectReturn(found);
-		Person.countPeople();
-		AnnotationDrivenStaticEntityMockingControl.expectReturn(25);
-		AnnotationDrivenStaticEntityMockingControl.playback();
-		assertEquals(found, Person.findPerson(id));
-	}
-
-	@Test
-	public void doesntEverReplay() {
-		Person.countPeople();
-	}
-
-	@Test
-	public void doesntEverSetReturn() {
-		Person.countPeople();
-		AnnotationDrivenStaticEntityMockingControl.playback();
-	}
-
-	@Test
-	public void rejectUnexpectedCall() {
-		AnnotationDrivenStaticEntityMockingControl.playback();
-		Person.countPeople();
-	}
-
-	@Test(expected=RemoteException.class)
-	public void testVerificationFailsEvenWhenTestFailsInExpectedManner() throws RemoteException {
-		Person.countPeople();
-		AnnotationDrivenStaticEntityMockingControl.playback();
-		// No calls to allow verification failure
-		throw new RemoteException();
-	}
-}
diff --git a/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java
index 258313c90f..58668b8612 100644
--- a/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,7 +105,7 @@ public void setPropertyValues(PropertyValues pvs, boolean ignoreUnknown, boolean
 
 	// Redefined with public visibility.
 	@Override
-	public Class getPropertyType(String propertyPath) {
+	public Class<?> getPropertyType(String propertyPath) {
 		return null;
 	}
 
@@ -127,7 +127,7 @@ public Class getPropertyType(String propertyPath) {
 	 * @throws InvalidPropertyException if there is no such property or
 	 * if the property isn't writable
 	 * @throws PropertyAccessException if the property was valid but the
-	 * accessor method failed or a type mismatch occured
+	 * accessor method failed or a type mismatch occurred
 	 */
 	public abstract void setPropertyValue(String propertyName, Object value) throws BeansException;
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanInfoFactory.java b/spring-beans/src/main/java/org/springframework/beans/BeanInfoFactory.java
index fe26c29d85..1906fbfdbb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanInfoFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanInfoFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,33 +20,36 @@
 import java.beans.IntrospectionException;
 
 /**
- * Strategy for creating {@link BeanInfo} instances.
+ * Strategy interface for creating {@link BeanInfo} instances for Spring beans.
+ * Can be used to plug in custom bean property resolution strategies (e.g. for other
+ * languages on the JVM) or more efficient {@link BeanInfo} retrieval algorithms.
  *
  * <p>BeanInfoFactories are are instantiated by the {@link CachedIntrospectionResults},
- * by using the {@link org.springframework.core.io.support.SpringFactoriesLoader} utility
- * class.
+ * by using the {@link org.springframework.core.io.support.SpringFactoriesLoader}
+ * utility class.
  *
  * When a {@link BeanInfo} is to be created, the {@code CachedIntrospectionResults}
- * will iterate through the discovered factories, calling {@link
- * #getBeanInfo(Class)} on each one. If {@code null} is returned, the next factory will
- * be queried. If none of the factories support the class, an standard {@link BeanInfo}
- * is created as a default.
+ * will iterate through the discovered factories, calling {@link #getBeanInfo(Class)}
+ * on each one. If {@code null} is returned, the next factory will be queried.
+ * If none of the factories support the class, a standard {@link BeanInfo} will be
+ * created as a default.
  *
  * <p>Note that the {@link org.springframework.core.io.support.SpringFactoriesLoader}
  * sorts the {@code BeanInfoFactory} instances by
- * {@link org.springframework.core.annotation.Order @Order}, so that ones with
- * a higher precedence come first.
+ * {@link org.springframework.core.annotation.Order @Order}, so that ones with a
+ * higher precedence come first.
  *
  * @author Arjen Poutsma
  * @since 3.2
+ * @see CachedIntrospectionResults
+ * @see org.springframework.core.io.support.SpringFactoriesLoader
  */
 public interface BeanInfoFactory {
 
 	/**
-	 * Returns the bean info for the given class, if supported.
-	 *
+	 * Return the bean info for the given class, if supported.
 	 * @param beanClass the bean class
-	 * @return the bean info, or {@code null} if not the given class is not supported
+	 * @return the BeanInfo, or {@code null} if the given class is not supported
 	 * @throws IntrospectionException in case of exceptions
 	 */
 	BeanInfo getBeanInfo(Class<?> beanClass) throws IntrospectionException;
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
index 0a605478c1..d18b1ed1ea 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ public abstract class BeanUtils {
 
 	private static final Log logger = LogFactory.getLog(BeanUtils.class);
 
-	// using WeakHashMap as a Set
+	// Effectively using a WeakHashMap as a Set
 	private static final Map<Class<?>, Boolean> unknownEditorTypes =
 			Collections.synchronizedMap(new WeakHashMap<Class<?>, Boolean>());
 
@@ -127,7 +127,7 @@ public static <T> T instantiateClass(Class<T> clazz) throws BeanInstantiationExc
 	@SuppressWarnings("unchecked")
 	public static <T> T instantiateClass(Class<?> clazz, Class<T> assignableTo) throws BeanInstantiationException {
 		Assert.isAssignable(assignableTo, clazz);
-		return (T)instantiateClass(clazz);
+		return (T) instantiateClass(clazz);
 	}
 
 	/**
@@ -199,7 +199,7 @@ public static Method findMethod(Class<?> clazz, String methodName, Class<?>... p
 	 * @return the Method object, or {@code null} if not found
 	 * @see Class#getDeclaredMethod
 	 */
-	public static Method findDeclaredMethod(Class<?> clazz, String methodName, Class<?>[] paramTypes) {
+	public static Method findDeclaredMethod(Class<?> clazz, String methodName, Class<?>... paramTypes) {
 		try {
 			return clazz.getDeclaredMethod(methodName, paramTypes);
 		}
@@ -281,7 +281,7 @@ public static Method findMethodWithMinimalParameters(Method[] methods, String me
 				}
 				else {
 					if (targetMethod.getParameterTypes().length == numParams) {
-						// Additional candidate with same length.
+						// Additional candidate with same length
 						numMethodsFoundWithCurrentMinimumArgs++;
 					}
 				}
@@ -317,10 +317,8 @@ public static Method findMethodWithMinimalParameters(Method[] methods, String me
 	public static Method resolveSignature(String signature, Class<?> clazz) {
 		Assert.hasText(signature, "'signature' must not be empty");
 		Assert.notNull(clazz, "Class must not be null");
-
 		int firstParen = signature.indexOf("(");
 		int lastParen = signature.indexOf(")");
-
 		if (firstParen > -1 && lastParen == -1) {
 			throw new IllegalArgumentException("Invalid method signature '" + signature +
 					"': expected closing ')' for args list");
@@ -336,7 +334,7 @@ else if (firstParen == -1 && lastParen == -1) {
 			String methodName = signature.substring(0, firstParen);
 			String[] parameterTypeNames =
 					StringUtils.commaDelimitedListToStringArray(signature.substring(firstParen + 1, lastParen));
-			Class<?>[] parameterTypes = new Class[parameterTypeNames.length];
+			Class<?>[] parameterTypes = new Class<?>[parameterTypeNames.length];
 			for (int i = 0; i < parameterTypeNames.length; i++) {
 				String parameterTypeName = parameterTypeNames[i].trim();
 				try {
@@ -381,13 +379,28 @@ public static PropertyDescriptor getPropertyDescriptor(Class<?> clazz, String pr
 	 * Find a JavaBeans {@code PropertyDescriptor} for the given method,
 	 * with the method either being the read method or the write method for
 	 * that bean property.
-	 * @param method the method to find a corresponding PropertyDescriptor for
+	 * @param method the method to find a corresponding PropertyDescriptor for,
+	 * introspecting its declaring class
 	 * @return the corresponding PropertyDescriptor, or {@code null} if none
 	 * @throws BeansException if PropertyDescriptor lookup fails
 	 */
 	public static PropertyDescriptor findPropertyForMethod(Method method) throws BeansException {
+		return findPropertyForMethod(method, method.getDeclaringClass());
+	}
+
+	/**
+	 * Find a JavaBeans {@code PropertyDescriptor} for the given method,
+	 * with the method either being the read method or the write method for
+	 * that bean property.
+	 * @param method the method to find a corresponding PropertyDescriptor for
+	 * @param clazz the (most specific) class to introspect for descriptors
+	 * @return the corresponding PropertyDescriptor, or {@code null} if none
+	 * @throws BeansException if PropertyDescriptor lookup fails
+	 * @since 3.2.13
+	 */
+	public static PropertyDescriptor findPropertyForMethod(Method method, Class<?> clazz) throws BeansException {
 		Assert.notNull(method, "Method must not be null");
-		PropertyDescriptor[] pds = getPropertyDescriptors(method.getDeclaringClass());
+		PropertyDescriptor[] pds = getPropertyDescriptors(clazz);
 		for (PropertyDescriptor pd : pds) {
 			if (method.equals(pd.getReadMethod()) || method.equals(pd.getWriteMethod())) {
 				return pd;
@@ -455,7 +468,7 @@ public static PropertyEditor findEditorByConvention(Class<?> targetType) {
 	 * @param beanClasses the classes to check against
 	 * @return the property type, or {@code Object.class} as fallback
 	 */
-	public static Class<?> findPropertyType(String propertyName, Class<?>[] beanClasses) {
+	public static Class<?> findPropertyType(String propertyName, Class<?>... beanClasses) {
 		if (beanClasses != null) {
 			for (Class<?> beanClass : beanClasses) {
 				PropertyDescriptor pd = getPropertyDescriptor(beanClass, propertyName);
@@ -475,8 +488,7 @@ public static Class<?> findPropertyType(String propertyName, Class<?>[] beanClas
 	 */
 	public static MethodParameter getWriteMethodParameter(PropertyDescriptor pd) {
 		if (pd instanceof GenericTypeAwarePropertyDescriptor) {
-			return new MethodParameter(
-					((GenericTypeAwarePropertyDescriptor) pd).getWriteMethodParameter());
+			return new MethodParameter(((GenericTypeAwarePropertyDescriptor) pd).getWriteMethodParameter());
 		}
 		else {
 			return new MethodParameter(pd.getWriteMethod(), 0);
@@ -528,7 +540,7 @@ public static boolean isSimpleValueType(Class<?> clazz) {
 	 * @see BeanWrapper
 	 */
 	public static void copyProperties(Object source, Object target) throws BeansException {
-		copyProperties(source, target, null, null);
+		copyProperties(source, target, null, (String[]) null);
 	}
 
 	/**
@@ -545,10 +557,8 @@ public static void copyProperties(Object source, Object target) throws BeansExce
 	 * @throws BeansException if the copying failed
 	 * @see BeanWrapper
 	 */
-	public static void copyProperties(Object source, Object target, Class<?> editable)
-			throws BeansException {
-
-		copyProperties(source, target, editable, null);
+	public static void copyProperties(Object source, Object target, Class<?> editable) throws BeansException {
+		copyProperties(source, target, editable, (String[]) null);
 	}
 
 	/**
@@ -565,9 +575,7 @@ public static void copyProperties(Object source, Object target, Class<?> editabl
 	 * @throws BeansException if the copying failed
 	 * @see BeanWrapper
 	 */
-	public static void copyProperties(Object source, Object target, String[] ignoreProperties)
-			throws BeansException {
-
+	public static void copyProperties(Object source, Object target, String... ignoreProperties) throws BeansException {
 		copyProperties(source, target, null, ignoreProperties);
 	}
 
@@ -583,7 +591,7 @@ public static void copyProperties(Object source, Object target, String[] ignoreP
 	 * @throws BeansException if the copying failed
 	 * @see BeanWrapper
 	 */
-	private static void copyProperties(Object source, Object target, Class<?> editable, String[] ignoreProperties)
+	private static void copyProperties(Object source, Object target, Class<?> editable, String... ignoreProperties)
 			throws BeansException {
 
 		Assert.notNull(source, "Source must not be null");
@@ -598,27 +606,30 @@ private static void copyProperties(Object source, Object target, Class<?> editab
 			actualEditable = editable;
 		}
 		PropertyDescriptor[] targetPds = getPropertyDescriptors(actualEditable);
-		List<String> ignoreList = (ignoreProperties != null) ? Arrays.asList(ignoreProperties) : null;
+		List<String> ignoreList = (ignoreProperties != null ? Arrays.asList(ignoreProperties) : null);
 
 		for (PropertyDescriptor targetPd : targetPds) {
-			if (targetPd.getWriteMethod() != null &&
-					(ignoreProperties == null || (!ignoreList.contains(targetPd.getName())))) {
+			Method writeMethod = targetPd.getWriteMethod();
+			if (writeMethod != null && (ignoreList == null || !ignoreList.contains(targetPd.getName()))) {
 				PropertyDescriptor sourcePd = getPropertyDescriptor(source.getClass(), targetPd.getName());
-				if (sourcePd != null && sourcePd.getReadMethod() != null) {
-					try {
-						Method readMethod = sourcePd.getReadMethod();
-						if (!Modifier.isPublic(readMethod.getDeclaringClass().getModifiers())) {
-							readMethod.setAccessible(true);
+				if (sourcePd != null) {
+					Method readMethod = sourcePd.getReadMethod();
+					if (readMethod != null &&
+							ClassUtils.isAssignable(writeMethod.getParameterTypes()[0], readMethod.getReturnType())) {
+						try {
+							if (!Modifier.isPublic(readMethod.getDeclaringClass().getModifiers())) {
+								readMethod.setAccessible(true);
+							}
+							Object value = readMethod.invoke(source);
+							if (!Modifier.isPublic(writeMethod.getDeclaringClass().getModifiers())) {
+								writeMethod.setAccessible(true);
+							}
+							writeMethod.invoke(target, value);
 						}
-						Object value = readMethod.invoke(source);
-						Method writeMethod = targetPd.getWriteMethod();
-						if (!Modifier.isPublic(writeMethod.getDeclaringClass().getModifiers())) {
-							writeMethod.setAccessible(true);
+						catch (Throwable ex) {
+							throw new FatalBeanException(
+									"Could not copy property '" + targetPd.getName() + "' from source to target", ex);
 						}
-						writeMethod.invoke(target, value);
-					}
-					catch (Throwable ex) {
-						throw new FatalBeanException("Could not copy properties from source to target", ex);
 					}
 				}
 			}
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java
index 628ee8e78a..16992e2e16 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ public interface BeanWrapper extends ConfigurablePropertyAccessor {
 	 * @return the type of the wrapped bean instance,
 	 * or {@code null} if no wrapped object has been set
 	 */
-	Class getWrappedClass();
+	Class<?> getWrappedClass();
 
 	/**
 	 * Obtain the PropertyDescriptors for the wrapped object
@@ -79,11 +79,13 @@ public interface BeanWrapper extends ConfigurablePropertyAccessor {
 	PropertyDescriptor getPropertyDescriptor(String propertyName) throws InvalidPropertyException;
 
 	/**
-	 * Set whether this BeanWrapper should attempt to "auto-grow" a nested path that contains a null value.
-	 * <p>If "true", a null path location will be populated with a default object value and traversed
-	 * instead of resulting in a {@link NullValueInNestedPathException}. Turning this flag on also
-	 * enables auto-growth of collection elements when accessing an out-of-bounds index.
-	 * <p>Default is "false" on a plain BeanWrapper.
+	 * Set whether this BeanWrapper should attempt to "auto-grow" a
+	 * nested path that contains a {@code null} value.
+	 * <p>If {@code true}, a {@code null} path location will be populated
+	 * with a default object value and traversed instead of resulting in a
+	 * {@link NullValueInNestedPathException}. Turning this flag on also enables
+	 * auto-growth of collection elements when accessing an out-of-bounds index.
+	 * <p>Default is {@code false} on a plain BeanWrapper.
 	 */
 	void setAutoGrowNestedPaths(boolean autoGrowNestedPaths);
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
index df5def12a8..dd725bf713 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -223,7 +223,7 @@ public final Object getWrappedInstance() {
 		return this.object;
 	}
 
-	public final Class getWrappedClass() {
+	public final Class<?> getWrappedClass() {
 		return (this.object != null ? this.object.getClass() : null);
 	}
 
@@ -246,7 +246,7 @@ public final Object getRootInstance() {
 	 * Return the class of the root object at the top of the path of this BeanWrapper.
 	 * @see #getNestedPath
 	 */
-	public final Class getRootClass() {
+	public final Class<?> getRootClass() {
 		return (this.rootObject != null ? this.rootObject.getClass() : null);
 	}
 
@@ -304,7 +304,7 @@ public AccessControlContext getSecurityContext() {
 	 * Needs to be called when the target object changes.
 	 * @param clazz the class to introspect
 	 */
-	protected void setIntrospectionClass(Class clazz) {
+	protected void setIntrospectionClass(Class<?> clazz) {
 		if (this.cachedIntrospectionResults != null &&
 				!clazz.equals(this.cachedIntrospectionResults.getBeanClass())) {
 			this.cachedIntrospectionResults = null;
@@ -352,7 +352,7 @@ protected PropertyDescriptor getPropertyDescriptorInternal(String propertyName)
 	}
 
 	@Override
-	public Class getPropertyType(String propertyName) throws BeansException {
+	public Class<?> getPropertyType(String propertyName) throws BeansException {
 		try {
 			PropertyDescriptor pd = getPropertyDescriptorInternal(propertyName);
 			if (pd != null) {
@@ -366,7 +366,7 @@ public Class getPropertyType(String propertyName) throws BeansException {
 				}
 				// Check to see if there is a custom editor,
 				// which might give an indication on the desired target type.
-				Class editorType = guessPropertyTypeFromEditors(propertyName);
+				Class<?> editorType = guessPropertyTypeFromEditors(propertyName);
 				if (editorType != null) {
 					return editorType;
 				}
@@ -389,7 +389,8 @@ public TypeDescriptor getPropertyTypeDescriptor(String propertyName) throws Bean
 					if (pd.getReadMethod() != null || pd.getWriteMethod() != null) {
 						return TypeDescriptor.nested(property(pd), tokens.keys.length);
 					}
-				} else {
+				}
+				else {
 					if (pd.getReadMethod() != null || pd.getWriteMethod() != null) {
 						return new TypeDescriptor(property(pd));
 					}
@@ -485,13 +486,13 @@ public Object convertForProperty(Object value, String propertyName) throws TypeM
 			throw new InvalidPropertyException(getRootClass(), this.nestedPath + propertyName,
 					"No property '" + propertyName + "' found");
 		}
-		return convertForProperty(propertyName, null, value, pd);
+		return convertForProperty(propertyName, null, value, new TypeDescriptor(property(pd)));
 	}
 
-	private Object convertForProperty(String propertyName, Object oldValue, Object newValue, PropertyDescriptor pd)
+	private Object convertForProperty(String propertyName, Object oldValue, Object newValue, TypeDescriptor td)
 			throws TypeMismatchException {
 
-		return convertIfNecessary(propertyName, oldValue, newValue, pd.getPropertyType(), new TypeDescriptor(property(pd)));
+		return convertIfNecessary(propertyName, oldValue, newValue, td.getType(), td);
 	}
 
 	private Property property(PropertyDescriptor pd) {
@@ -699,7 +700,8 @@ public Object getPropertyValue(String propertyName) throws BeansException {
 		return nestedBw.getPropertyValue(tokens);
 	}
 
-    private Object getPropertyValue(PropertyTokenHolder tokens) throws BeansException {
+    @SuppressWarnings("unchecked")
+	private Object getPropertyValue(PropertyTokenHolder tokens) throws BeansException {
 		String propertyName = tokens.canonicalName;
 		String actualName = tokens.actualName;
 		PropertyDescriptor pd = getCachedIntrospectionResults().getPropertyDescriptor(actualName);
@@ -766,20 +768,20 @@ else if (value.getClass().isArray()) {
 					}
 					else if (value instanceof List) {
 						int index = Integer.parseInt(key);
-						List list = (List) value;
+						List<Object> list = (List<Object>) value;
 						growCollectionIfNecessary(list, index, indexedPropertyName, pd, i + 1);
 						value = list.get(index);
 					}
 					else if (value instanceof Set) {
 						// Apply index to Iterator in case of a Set.
-						Set set = (Set) value;
+						Set<Object> set = (Set<Object>) value;
 						int index = Integer.parseInt(key);
 						if (index < 0 || index >= set.size()) {
 							throw new InvalidPropertyException(getRootClass(), this.nestedPath + propertyName,
 									"Cannot get element with index " + index + " from Set of size " +
 									set.size() + ", accessed using property path '" + propertyName + "'");
 						}
-						Iterator it = set.iterator();
+						Iterator<Object> it = set.iterator();
 						for (int j = 0; it.hasNext(); j++) {
 							Object elem = it.next();
 							if (j == index) {
@@ -789,11 +791,12 @@ else if (value instanceof Set) {
 						}
 					}
 					else if (value instanceof Map) {
-						Map map = (Map) value;
+						Map<Object, Object> map = (Map<Object, Object>) value;
 						Class<?> mapKeyType = GenericCollectionTypeResolver.getMapKeyReturnType(pd.getReadMethod(), i + 1);
 						// IMPORTANT: Do not pass full property name in here - property editors
 						// must not kick in for map keys but rather only for map values.
-						TypeDescriptor typeDescriptor = mapKeyType != null ? TypeDescriptor.valueOf(mapKeyType) : TypeDescriptor.valueOf(Object.class);
+						TypeDescriptor typeDescriptor = (mapKeyType != null ?
+								TypeDescriptor.valueOf(mapKeyType) : TypeDescriptor.valueOf(Object.class));
 						Object convertedMapKey = convertIfNecessary(null, null, key, mapKeyType, typeDescriptor);
 						value = map.get(convertedMapKey);
 					}
@@ -850,16 +853,15 @@ private Object growArrayIfNecessary(Object array, int index, String name) {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
-	private void growCollectionIfNecessary(
-			Collection collection, int index, String name, PropertyDescriptor pd, int nestingLevel) {
+	private void growCollectionIfNecessary(Collection<Object> collection, int index, String name,
+			PropertyDescriptor pd, int nestingLevel) {
 
 		if (!this.autoGrowNestedPaths) {
 			return;
 		}
 		int size = collection.size();
 		if (index >= size && index < this.autoGrowCollectionLimit) {
-			Class elementType = GenericCollectionTypeResolver.getCollectionReturnType(pd.getReadMethod(), nestingLevel);
+			Class<?> elementType = GenericCollectionTypeResolver.getCollectionReturnType(pd.getReadMethod(), nestingLevel);
 			if (elementType != null) {
 				for (int i = collection.size(); i < index + 1; i++) {
 					collection.add(newValue(elementType, name));
@@ -945,7 +947,7 @@ private void setPropertyValue(PropertyTokenHolder tokens, PropertyValue pv) thro
 			}
 			if (propValue.getClass().isArray()) {
 				PropertyDescriptor pd = getCachedIntrospectionResults().getPropertyDescriptor(actualName);
-				Class requiredType = propValue.getClass().getComponentType();
+				Class<?> requiredType = propValue.getClass().getComponentType();
 				int arrayIndex = Integer.parseInt(key);
 				Object oldValue = null;
 				try {
@@ -963,9 +965,9 @@ private void setPropertyValue(PropertyTokenHolder tokens, PropertyValue pv) thro
 			}
 			else if (propValue instanceof List) {
 				PropertyDescriptor pd = getCachedIntrospectionResults().getPropertyDescriptor(actualName);
-				Class requiredType = GenericCollectionTypeResolver.getCollectionReturnType(
+				Class<?> requiredType = GenericCollectionTypeResolver.getCollectionReturnType(
 						pd.getReadMethod(), tokens.keys.length);
-				List list = (List) propValue;
+				List<Object> list = (List<Object>) propValue;
 				int index = Integer.parseInt(key);
 				Object oldValue = null;
 				if (isExtractOldValueForEditor() && index < list.size()) {
@@ -1000,11 +1002,11 @@ else if (propValue instanceof List) {
 			}
 			else if (propValue instanceof Map) {
 				PropertyDescriptor pd = getCachedIntrospectionResults().getPropertyDescriptor(actualName);
-				Class mapKeyType = GenericCollectionTypeResolver.getMapKeyReturnType(
+				Class<?> mapKeyType = GenericCollectionTypeResolver.getMapKeyReturnType(
 						pd.getReadMethod(), tokens.keys.length);
-				Class mapValueType = GenericCollectionTypeResolver.getMapValueReturnType(
+				Class<?> mapValueType = GenericCollectionTypeResolver.getMapValueReturnType(
 						pd.getReadMethod(), tokens.keys.length);
-				Map map = (Map) propValue;
+				Map<Object, Object> map = (Map<Object, Object>) propValue;
 				// IMPORTANT: Do not pass full property name in here - property editors
 				// must not kick in for map keys but rather only for map values.
 				TypeDescriptor typeDescriptor = (mapKeyType != null ?
@@ -1023,7 +1025,7 @@ else if (propValue instanceof Map) {
 			else {
 				throw new InvalidPropertyException(getRootClass(), this.nestedPath + propertyName,
 						"Property referenced in indexed property path '" + propertyName +
-						"' is neither an array nor a List nor a Map; returned value was [" + pv.getValue() + "]");
+						"' is neither an array nor a List nor a Map; returned value was [" + propValue + "]");
 			}
 		}
 
@@ -1094,7 +1096,8 @@ public Object run() throws Exception {
 								}
 							}
 						}
-						valueToApply = convertForProperty(propertyName, oldValue, originalValue, pd);
+						valueToApply = convertForProperty(
+								propertyName, oldValue, originalValue, new TypeDescriptor(property(pd)));
 					}
 					pv.getOriginalPropertyValue().conversionNecessary = (valueToApply != originalValue);
 				}
diff --git a/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java b/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java
index 7c8cd51cec..1d4e881e34 100644
--- a/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java
+++ b/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
+import java.lang.ref.SoftReference;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -33,6 +33,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.core.SpringProperties;
 import org.springframework.core.io.support.SpringFactoriesLoader;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
@@ -50,6 +51,18 @@
  * implements the factory design pattern, using a private constructor and
  * a static {@link #forClass(Class)} factory method to obtain instances.
  *
+ * <p>Note that for caching to work effectively, some preconditions need to be met:
+ * Prefer an arrangement where the Spring jars live in the same ClassLoader as the
+ * application classes, which allows for clean caching along with the application's
+ * lifecycle in any case. For a web application, consider declaring a local
+ * {@link org.springframework.web.util.IntrospectorCleanupListener} in {@code web.xml}
+ * in case of a multi-ClassLoader layout, which will allow for effective caching as well.
+ *
+ * <p>In case of a non-clean ClassLoader arrangement without a cleanup listener having
+ * been set up, this class will fall back to a weak-reference-based caching model that
+ * recreates much-requested entries every time the garbage collector removed them. In
+ * such a scenario, consider the {@link #IGNORE_BEANINFO_PROPERTY_NAME} system property.
+ *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @since 05 May 2001
@@ -59,11 +72,34 @@
  */
 public class CachedIntrospectionResults {
 
-	private static final Log logger = LogFactory.getLog(CachedIntrospectionResults.class);
+	/**
+	 * System property that instructs Spring to use the {@link Introspector#IGNORE_ALL_BEANINFO}
+	 * mode when calling the JavaBeans {@link Introspector}: "spring.beaninfo.ignore", with a
+	 * value of "true" skipping the search for {@code BeanInfo} classes (typically for scenarios
+	 * where no such classes are being defined for beans in the application in the first place).
+	 * <p>The default is "false", considering all {@code BeanInfo} metadata classes, like for
+	 * standard {@link Introspector#getBeanInfo(Class)} calls. Consider switching this flag to
+	 * "true" if you experience repeated ClassLoader access for non-existing {@code BeanInfo}
+	 * classes, in case such access is expensive on startup or on lazy loading.
+	 * <p>Note that such an effect may also indicate a scenario where caching doesn't work
+	 * effectively: Prefer an arrangement where the Spring jars live in the same ClassLoader
+	 * as the application classes, which allows for clean caching along with the application's
+	 * lifecycle in any case. For a web application, consider declaring a local
+	 * {@link org.springframework.web.util.IntrospectorCleanupListener} in {@code web.xml}
+	 * in case of a multi-ClassLoader layout, which will allow for effective caching as well.
+	 * @see Introspector#getBeanInfo(Class, int)
+	 */
+	public static final String IGNORE_BEANINFO_PROPERTY_NAME = "spring.beaninfo.ignore";
+
+
+	private static final boolean shouldIntrospectorIgnoreBeaninfoClasses =
+			SpringProperties.getFlag(IGNORE_BEANINFO_PROPERTY_NAME);
 
 	/** Stores the BeanInfoFactory instances */
-	private static List<BeanInfoFactory> beanInfoFactories =
-			SpringFactoriesLoader.loadFactories(BeanInfoFactory.class, CachedIntrospectionResults.class.getClassLoader());
+	private static List<BeanInfoFactory> beanInfoFactories = SpringFactoriesLoader.loadFactories(
+			BeanInfoFactory.class, CachedIntrospectionResults.class.getClassLoader());
+
+	private static final Log logger = LogFactory.getLog(CachedIntrospectionResults.class);
 
 	/**
 	 * Set of ClassLoaders that this CachedIntrospectionResults class will always
@@ -76,7 +112,7 @@ public class CachedIntrospectionResults {
 	 * Needs to be a WeakHashMap with WeakReferences as values to allow
 	 * for proper garbage collection in case of multiple class loaders.
 	 */
-	static final Map<Class, Object> classCache = new WeakHashMap<Class, Object>();
+	static final Map<Class<?>, Object> classCache = new WeakHashMap<Class<?>, Object>();
 
 
 	/**
@@ -101,15 +137,14 @@ public static void acceptClassLoader(ClassLoader classLoader) {
 
 	/**
 	 * Clear the introspection cache for the given ClassLoader, removing the
-	 * introspection results for all classes underneath that ClassLoader,
-	 * and deregistering the ClassLoader (and any of its children) from the
-	 * acceptance list.
+	 * introspection results for all classes underneath that ClassLoader, and
+	 * removing the ClassLoader (and its children) from the acceptance list.
 	 * @param classLoader the ClassLoader to clear the cache for
 	 */
 	public static void clearClassLoader(ClassLoader classLoader) {
 		synchronized (classCache) {
-			for (Iterator<Class> it = classCache.keySet().iterator(); it.hasNext();) {
-				Class beanClass = it.next();
+			for (Iterator<Class<?>> it = classCache.keySet().iterator(); it.hasNext();) {
+				Class<?> beanClass = it.next();
 				if (isUnderneathClassLoader(beanClass.getClassLoader(), classLoader)) {
 					it.remove();
 				}
@@ -127,21 +162,20 @@ public static void clearClassLoader(ClassLoader classLoader) {
 
 	/**
 	 * Create CachedIntrospectionResults for the given bean class.
-	 * <P>We don't want to use synchronization here. Object references are atomic,
-	 * so we can live with doing the occasional unnecessary lookup at startup only.
 	 * @param beanClass the bean class to analyze
 	 * @return the corresponding CachedIntrospectionResults
 	 * @throws BeansException in case of introspection failure
 	 */
-	static CachedIntrospectionResults forClass(Class beanClass) throws BeansException {
+	@SuppressWarnings("unchecked")
+	static CachedIntrospectionResults forClass(Class<?> beanClass) throws BeansException {
 		CachedIntrospectionResults results;
 		Object value;
 		synchronized (classCache) {
 			value = classCache.get(beanClass);
 		}
 		if (value instanceof Reference) {
-			Reference ref = (Reference) value;
-			results = (CachedIntrospectionResults) ref.get();
+			Reference<CachedIntrospectionResults> ref = (Reference<CachedIntrospectionResults>) value;
+			results = ref.get();
 		}
 		else {
 			results = (CachedIntrospectionResults) value;
@@ -160,7 +194,7 @@ static CachedIntrospectionResults forClass(Class beanClass) throws BeansExceptio
 				}
 				results = new CachedIntrospectionResults(beanClass);
 				synchronized (classCache) {
-					classCache.put(beanClass, new WeakReference<CachedIntrospectionResults>(results));
+					classCache.put(beanClass, new SoftReference<CachedIntrospectionResults>(results));
 				}
 			}
 		}
@@ -181,8 +215,8 @@ private static boolean isClassLoaderAccepted(ClassLoader classLoader) {
 		synchronized (acceptedClassLoaders) {
 			acceptedLoaderArray = acceptedClassLoaders.toArray(new ClassLoader[acceptedClassLoaders.size()]);
 		}
-		for (ClassLoader registeredLoader : acceptedLoaderArray) {
-			if (isUnderneathClassLoader(classLoader, registeredLoader)) {
+		for (ClassLoader acceptedLoader : acceptedLoaderArray) {
+			if (isUnderneathClassLoader(classLoader, acceptedLoader)) {
 				return true;
 			}
 		}
@@ -225,7 +259,7 @@ private static boolean isUnderneathClassLoader(ClassLoader candidate, ClassLoade
 	 * @param beanClass the bean class to analyze
 	 * @throws BeansException in case of introspection failure
 	 */
-	private CachedIntrospectionResults(Class beanClass) throws BeansException {
+	private CachedIntrospectionResults(Class<?> beanClass) throws BeansException {
 		try {
 			if (logger.isTraceEnabled()) {
 				logger.trace("Getting BeanInfo for class [" + beanClass.getName() + "]");
@@ -240,20 +274,25 @@ private CachedIntrospectionResults(Class beanClass) throws BeansException {
 			}
 			if (beanInfo == null) {
 				// If none of the factories supported the class, fall back to the default
-				beanInfo = Introspector.getBeanInfo(beanClass);
+				beanInfo = (shouldIntrospectorIgnoreBeaninfoClasses ?
+						Introspector.getBeanInfo(beanClass, Introspector.IGNORE_ALL_BEANINFO) :
+						Introspector.getBeanInfo(beanClass));
 			}
 			this.beanInfo = beanInfo;
 
-			// Immediately remove class from Introspector cache, to allow for proper
-			// garbage collection on class loader shutdown - we cache it here anyway,
-			// in a GC-friendly manner. In contrast to CachedIntrospectionResults,
-			// Introspector does not use WeakReferences as values of its WeakHashMap!
-			Class classToFlush = beanClass;
-			do {
-				Introspector.flushFromCaches(classToFlush);
-				classToFlush = classToFlush.getSuperclass();
+			// Only bother with flushFromCaches if the Introspector actually cached...
+			if (!shouldIntrospectorIgnoreBeaninfoClasses) {
+				// Immediately remove class from Introspector cache, to allow for proper
+				// garbage collection on class loader shutdown - we cache it here anyway,
+				// in a GC-friendly manner. In contrast to CachedIntrospectionResults,
+				// Introspector does not use WeakReferences as values of its WeakHashMap!
+				Class<?> classToFlush = beanClass;
+				do {
+					Introspector.flushFromCaches(classToFlush);
+					classToFlush = classToFlush.getSuperclass();
+				}
+				while (classToFlush != null && classToFlush != Object.class);
 			}
-			while (classToFlush != null);
 
 			if (logger.isTraceEnabled()) {
 				logger.trace("Caching PropertyDescriptors for class [" + beanClass.getName() + "]");
@@ -263,8 +302,9 @@ private CachedIntrospectionResults(Class beanClass) throws BeansException {
 			// This call is slow so we do it once.
 			PropertyDescriptor[] pds = this.beanInfo.getPropertyDescriptors();
 			for (PropertyDescriptor pd : pds) {
-				if (Class.class.equals(beanClass) && "classLoader".equals(pd.getName())) {
-					// Ignore Class.getClassLoader() method - nobody needs to bind to that
+				if (Class.class.equals(beanClass) &&
+						("classLoader".equals(pd.getName()) ||  "protectionDomain".equals(pd.getName()))) {
+					// Ignore Class.getClassLoader() and getProtectionDomain() methods - nobody needs to bind to those
 					continue;
 				}
 				if (logger.isTraceEnabled()) {
@@ -286,7 +326,7 @@ BeanInfo getBeanInfo() {
 		return this.beanInfo;
 	}
 
-	Class getBeanClass() {
+	Class<?> getBeanClass() {
 		return this.beanInfo.getBeanDescriptor().getBeanClass();
 	}
 
@@ -314,7 +354,7 @@ PropertyDescriptor[] getPropertyDescriptors() {
 		return pds;
 	}
 
-	private PropertyDescriptor buildGenericTypeAwarePropertyDescriptor(Class beanClass, PropertyDescriptor pd) {
+	private PropertyDescriptor buildGenericTypeAwarePropertyDescriptor(Class<?> beanClass, PropertyDescriptor pd) {
 		try {
 			return new GenericTypeAwarePropertyDescriptor(beanClass, pd.getName(), pd.getReadMethod(),
 					pd.getWriteMethod(), pd.getPropertyEditorClass());
diff --git a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
index 6606741ee4..022fff3ae2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
+++ b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.beans;
 
 import java.awt.Image;
-
 import java.beans.BeanDescriptor;
 import java.beans.BeanInfo;
 import java.beans.EventSetDescriptor;
@@ -26,10 +25,8 @@
 import java.beans.Introspector;
 import java.beans.MethodDescriptor;
 import java.beans.PropertyDescriptor;
-
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -38,13 +35,16 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import static org.springframework.beans.PropertyDescriptorUtils.*;
 
 /**
  * Decorator for a standard {@link BeanInfo} object, e.g. as created by
  * {@link Introspector#getBeanInfo(Class)}, designed to discover and register static
  * and/or non-void returning setter methods. For example:
- * <pre>{@code
+ * <pre class="code">
  * public class Bean {
  *     private Foo foo;
  *
@@ -56,7 +56,7 @@
  *         this.foo = foo;
  *         return this;
  *     }
- * }}</pre>
+ * }</pre>
  * The standard JavaBeans {@code Introspector} will discover the {@code getFoo} read
  * method, but will bypass the {@code #setFoo(Foo)} write method, because its non-void
  * returning signature does not comply with the JavaBeans specification.
@@ -76,6 +76,8 @@
  */
 class ExtendedBeanInfo implements BeanInfo {
 
+	private static final Log logger = LogFactory.getLog(ExtendedBeanInfo.class);
+
 	private final BeanInfo delegate;
 
 	private final Set<PropertyDescriptor> propertyDescriptors =
@@ -84,8 +86,8 @@ class ExtendedBeanInfo implements BeanInfo {
 
 	/**
 	 * Wrap the given {@link BeanInfo} instance; copy all its existing property descriptors
-	 * locally, wrapping each in a custom {@link SimpleIndexedPropertyDescriptor indexed} or
-	 * {@link SimpleNonIndexedPropertyDescriptor non-indexed} {@code PropertyDescriptor}
+	 * locally, wrapping each in a custom {@link SimpleIndexedPropertyDescriptor indexed}
+	 * or {@link SimplePropertyDescriptor non-indexed} {@code PropertyDescriptor}
 	 * variant that bypasses default JDK weak/soft reference management; then search
 	 * through its method descriptors to find any non-void returning write methods and
 	 * update or create the corresponding {@link PropertyDescriptor} for each one found.
@@ -96,15 +98,32 @@ class ExtendedBeanInfo implements BeanInfo {
 	 */
 	public ExtendedBeanInfo(BeanInfo delegate) throws IntrospectionException {
 		this.delegate = delegate;
-
 		for (PropertyDescriptor pd : delegate.getPropertyDescriptors()) {
-			this.propertyDescriptors.add(pd instanceof IndexedPropertyDescriptor ?
-					new SimpleIndexedPropertyDescriptor((IndexedPropertyDescriptor) pd) :
-					new SimpleNonIndexedPropertyDescriptor(pd));
+			try {
+				this.propertyDescriptors.add(pd instanceof IndexedPropertyDescriptor ?
+						new SimpleIndexedPropertyDescriptor((IndexedPropertyDescriptor) pd) :
+						new SimplePropertyDescriptor(pd));
+			}
+			catch (IntrospectionException ex) {
+				// Probably simply a method that wasn't meant to follow the JavaBeans pattern...
+				if (logger.isDebugEnabled()) {
+					logger.debug("Ignoring invalid bean property '" + pd.getName() + "': " + ex.getMessage());
+				}
+			}
 		}
-
-		for (Method method : findCandidateWriteMethods(delegate.getMethodDescriptors())) {
-			handleCandidateWriteMethod(method);
+		MethodDescriptor[] methodDescriptors = delegate.getMethodDescriptors();
+		if (methodDescriptors != null) {
+			for (Method method : findCandidateWriteMethods(methodDescriptors)) {
+				try {
+					handleCandidateWriteMethod(method);
+				}
+				catch (IntrospectionException ex) {
+					// We're only trying to find candidates, can easily ignore extra ones here...
+					if (logger.isDebugEnabled()) {
+						logger.debug("Ignoring candidate write method [" + method + "]: " + ex.getMessage());
+					}
+				}
+			}
 		}
 	}
 
@@ -117,7 +136,7 @@ private List<Method> findCandidateWriteMethods(MethodDescriptor[] methodDescript
 				matches.add(method);
 			}
 		}
-		// sort non-void returning write methods to guard against the ill effects of
+		// Sort non-void returning write methods to guard against the ill effects of
 		// non-deterministic sorting of methods returned from Class#getDeclaredMethods
 		// under JDK 7. See http://bugs.sun.com/view_bug.do?bug_id=7023180
 		Collections.sort(matches, new Comparator<Method>() {
@@ -132,58 +151,44 @@ public static boolean isCandidateWriteMethod(Method method) {
 		String methodName = method.getName();
 		Class<?>[] parameterTypes = method.getParameterTypes();
 		int nParams = parameterTypes.length;
-		if (methodName.length() > 3 && methodName.startsWith("set") &&
-				Modifier.isPublic(method.getModifiers()) &&
-				(
-						!void.class.isAssignableFrom(method.getReturnType()) ||
-						Modifier.isStatic(method.getModifiers())
-				) &&
-				(nParams == 1 || (nParams == 2 && parameterTypes[0].equals(int.class)))) {
-			return true;
-		}
-		return false;
+		return (methodName.length() > 3 && methodName.startsWith("set") && Modifier.isPublic(method.getModifiers()) &&
+				(!void.class.isAssignableFrom(method.getReturnType()) || Modifier.isStatic(method.getModifiers())) &&
+				(nParams == 1 || (nParams == 2 && parameterTypes[0].equals(int.class))));
 	}
 
 	private void handleCandidateWriteMethod(Method method) throws IntrospectionException {
 		int nParams = method.getParameterTypes().length;
 		String propertyName = propertyNameFor(method);
-		Class<?> propertyType = method.getParameterTypes()[nParams-1];
-		PropertyDescriptor existingPD = findExistingPropertyDescriptor(propertyName, propertyType);
+		Class<?> propertyType = method.getParameterTypes()[nParams - 1];
+		PropertyDescriptor existingPd = findExistingPropertyDescriptor(propertyName, propertyType);
 		if (nParams == 1) {
-			if (existingPD == null) {
-				this.propertyDescriptors.add(
-						new SimpleNonIndexedPropertyDescriptor(propertyName, null, method));
+			if (existingPd == null) {
+				this.propertyDescriptors.add(new SimplePropertyDescriptor(propertyName, null, method));
 			}
 			else {
-				existingPD.setWriteMethod(method);
+				existingPd.setWriteMethod(method);
 			}
 		}
 		else if (nParams == 2) {
-			if (existingPD == null) {
+			if (existingPd == null) {
 				this.propertyDescriptors.add(
-						new SimpleIndexedPropertyDescriptor(
-								propertyName, null, null, null, method));
+						new SimpleIndexedPropertyDescriptor(propertyName, null, null, null, method));
 			}
-			else if (existingPD instanceof IndexedPropertyDescriptor) {
-				((IndexedPropertyDescriptor)existingPD).setIndexedWriteMethod(method);
+			else if (existingPd instanceof IndexedPropertyDescriptor) {
+				((IndexedPropertyDescriptor) existingPd).setIndexedWriteMethod(method);
 			}
 			else {
-				this.propertyDescriptors.remove(existingPD);
-				this.propertyDescriptors.add(
-						new SimpleIndexedPropertyDescriptor(
-								propertyName, existingPD.getReadMethod(),
-								existingPD.getWriteMethod(), null, method));
+				this.propertyDescriptors.remove(existingPd);
+				this.propertyDescriptors.add(new SimpleIndexedPropertyDescriptor(
+						propertyName, existingPd.getReadMethod(), existingPd.getWriteMethod(), null, method));
 			}
 		}
 		else {
-			throw new IllegalArgumentException(
-					"write method must have exactly 1 or 2 parameters: " + method);
+			throw new IllegalArgumentException("Write method must have exactly 1 or 2 parameters: " + method);
 		}
 	}
 
-	private PropertyDescriptor findExistingPropertyDescriptor(
-			String propertyName, Class<?> propertyType) {
-
+	private PropertyDescriptor findExistingPropertyDescriptor(String propertyName, Class<?> propertyType) {
 		for (PropertyDescriptor pd : this.propertyDescriptors) {
 			final Class<?> candidateType;
 			final String candidateName = pd.getName();
@@ -191,16 +196,14 @@ private PropertyDescriptor findExistingPropertyDescriptor(
 				IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
 				candidateType = ipd.getIndexedPropertyType();
 				if (candidateName.equals(propertyName) &&
-						(candidateType.equals(propertyType) ||
-								candidateType.equals(propertyType.getComponentType()))) {
+						(candidateType.equals(propertyType) || candidateType.equals(propertyType.getComponentType()))) {
 					return pd;
 				}
 			}
 			else {
 				candidateType = pd.getPropertyType();
 				if (candidateName.equals(propertyName) &&
-						(candidateType.equals(propertyType) ||
-								propertyType.equals(candidateType.getComponentType()))) {
+						(candidateType.equals(propertyType) || propertyType.equals(candidateType.getComponentType()))) {
 					return pd;
 				}
 			}
@@ -209,8 +212,7 @@ private PropertyDescriptor findExistingPropertyDescriptor(
 	}
 
 	private String propertyNameFor(Method method) {
-		return Introspector.decapitalize(
-				method.getName().substring(3, method.getName().length()));
+		return Introspector.decapitalize(method.getName().substring(3, method.getName().length()));
 	}
 
 
@@ -221,65 +223,61 @@ private String propertyNameFor(Method method) {
 	 * @see #ExtendedBeanInfo(BeanInfo)
 	 */
 	public PropertyDescriptor[] getPropertyDescriptors() {
-		return this.propertyDescriptors.toArray(
-				new PropertyDescriptor[this.propertyDescriptors.size()]);
+		return this.propertyDescriptors.toArray(new PropertyDescriptor[this.propertyDescriptors.size()]);
 	}
 
 	public BeanInfo[] getAdditionalBeanInfo() {
-		return delegate.getAdditionalBeanInfo();
+		return this.delegate.getAdditionalBeanInfo();
 	}
 
 	public BeanDescriptor getBeanDescriptor() {
-		return delegate.getBeanDescriptor();
+		return this.delegate.getBeanDescriptor();
 	}
 
 	public int getDefaultEventIndex() {
-		return delegate.getDefaultEventIndex();
+		return this.delegate.getDefaultEventIndex();
 	}
 
 	public int getDefaultPropertyIndex() {
-		return delegate.getDefaultPropertyIndex();
+		return this.delegate.getDefaultPropertyIndex();
 	}
 
 	public EventSetDescriptor[] getEventSetDescriptors() {
-		return delegate.getEventSetDescriptors();
+		return this.delegate.getEventSetDescriptors();
 	}
 
 	public Image getIcon(int iconKind) {
-		return delegate.getIcon(iconKind);
+		return this.delegate.getIcon(iconKind);
 	}
 
 	public MethodDescriptor[] getMethodDescriptors() {
-		return delegate.getMethodDescriptors();
+		return this.delegate.getMethodDescriptors();
 	}
 }
 
 
-class SimpleNonIndexedPropertyDescriptor extends PropertyDescriptor {
+class SimplePropertyDescriptor extends PropertyDescriptor {
 
 	private Method readMethod;
+
 	private Method writeMethod;
-	private Class<?> propertyType;
-	private Class<?> propertyEditorClass;
 
+	private Class<?> propertyType;
 
-	public SimpleNonIndexedPropertyDescriptor(PropertyDescriptor original)
-			throws IntrospectionException {
+	private Class<?> propertyEditorClass;
 
+	public SimplePropertyDescriptor(PropertyDescriptor original) throws IntrospectionException {
 		this(original.getName(), original.getReadMethod(), original.getWriteMethod());
 		copyNonMethodProperties(original, this);
 	}
 
-	public SimpleNonIndexedPropertyDescriptor(String propertyName,
-			Method readMethod, Method writeMethod) throws IntrospectionException {
-
+	public SimplePropertyDescriptor(String propertyName, Method readMethod, Method writeMethod) throws IntrospectionException {
 		super(propertyName, null, null);
-		this.setReadMethod(readMethod);
-		this.setWriteMethod(writeMethod);
+		this.readMethod = readMethod;
+		this.writeMethod = writeMethod;
 		this.propertyType = findPropertyType(readMethod, writeMethod);
 	}
 
-
 	@Override
 	public Method getReadMethod() {
 		return this.readMethod;
@@ -305,8 +303,9 @@ public Class<?> getPropertyType() {
 		if (this.propertyType == null) {
 			try {
 				this.propertyType = findPropertyType(this.readMethod, this.writeMethod);
-			} catch (IntrospectionException ex) {
-				// ignore, as does PropertyDescriptor#getPropertyType
+			}
+			catch (IntrospectionException ex) {
+				// Ignore, as does PropertyDescriptor#getPropertyType
 			}
 		}
 		return this.propertyType;
@@ -322,7 +321,6 @@ public void setPropertyEditorClass(Class<?> propertyEditorClass) {
 		this.propertyEditorClass = propertyEditorClass;
 	}
 
-
 	@Override
 	public boolean equals(Object obj) {
 		return PropertyDescriptorUtils.equals(this, obj);
@@ -331,8 +329,7 @@ public boolean equals(Object obj) {
 	@Override
 	public String toString() {
 		return String.format("%s[name=%s, propertyType=%s, readMethod=%s, writeMethod=%s]",
-				this.getClass().getSimpleName(), this.getName(), this.getPropertyType(),
-				this.readMethod, this.writeMethod);
+				getClass().getSimpleName(), getName(), getPropertyType(), this.readMethod, this.writeMethod);
 	}
 }
 
@@ -340,40 +337,37 @@ public String toString() {
 class SimpleIndexedPropertyDescriptor extends IndexedPropertyDescriptor {
 
 	private Method readMethod;
+
 	private Method writeMethod;
+
 	private Class<?> propertyType;
-	private Class<?> propertyEditorClass;
 
 	private Method indexedReadMethod;
+
 	private Method indexedWriteMethod;
-	private Class<?> indexedPropertyType;
 
+	private Class<?> indexedPropertyType;
 
-	public SimpleIndexedPropertyDescriptor(IndexedPropertyDescriptor original)
-			throws IntrospectionException {
+	private Class<?> propertyEditorClass;
 
+	public SimpleIndexedPropertyDescriptor(IndexedPropertyDescriptor original) throws IntrospectionException {
 		this(original.getName(), original.getReadMethod(), original.getWriteMethod(),
 				original.getIndexedReadMethod(), original.getIndexedWriteMethod());
 		copyNonMethodProperties(original, this);
 	}
 
-	public SimpleIndexedPropertyDescriptor(String propertyName,
-				Method readMethod, Method writeMethod,
-				Method indexedReadMethod, Method indexedWriteMethod)
-			throws IntrospectionException {
+	public SimpleIndexedPropertyDescriptor(String propertyName, Method readMethod, Method writeMethod,
+				Method indexedReadMethod, Method indexedWriteMethod) throws IntrospectionException {
 
 		super(propertyName, null, null, null, null);
-		this.setReadMethod(readMethod);
-		this.setWriteMethod(writeMethod);
+		this.readMethod = readMethod;
+		this.writeMethod = writeMethod;
 		this.propertyType = findPropertyType(readMethod, writeMethod);
-
-		this.setIndexedReadMethod(indexedReadMethod);
-		this.setIndexedWriteMethod(indexedWriteMethod);
-		this.indexedPropertyType = findIndexedPropertyType(
-				this.getName(), this.propertyType, indexedReadMethod, indexedWriteMethod);
+		this.indexedReadMethod = indexedReadMethod;
+		this.indexedWriteMethod = indexedWriteMethod;
+		this.indexedPropertyType = findIndexedPropertyType(propertyName, this.propertyType, indexedReadMethod, indexedWriteMethod);
 	}
 
-
 	@Override
 	public Method getReadMethod() {
 		return this.readMethod;
@@ -399,8 +393,9 @@ public Class<?> getPropertyType() {
 		if (this.propertyType == null) {
 			try {
 				this.propertyType = findPropertyType(this.readMethod, this.writeMethod);
-			} catch (IntrospectionException ex) {
-				// ignore, as does IndexedPropertyDescriptor#getPropertyType
+			}
+			catch (IntrospectionException ex) {
+				// Ignore, as does IndexedPropertyDescriptor#getPropertyType
 			}
 		}
 		return this.propertyType;
@@ -431,10 +426,10 @@ public Class<?> getIndexedPropertyType() {
 		if (this.indexedPropertyType == null) {
 			try {
 				this.indexedPropertyType = findIndexedPropertyType(
-						this.getName(), this.getPropertyType(),
-						this.indexedReadMethod, this.indexedWriteMethod);
-			} catch (IntrospectionException ex) {
-				// ignore, as does IndexedPropertyDescriptor#getIndexedPropertyType
+						getName(), getPropertyType(), this.indexedReadMethod, this.indexedWriteMethod);
+			}
+			catch (IntrospectionException ex) {
+				// Ignore, as does IndexedPropertyDescriptor#getIndexedPropertyType
 			}
 		}
 		return this.indexedPropertyType;
@@ -450,41 +445,36 @@ public void setPropertyEditorClass(Class<?> propertyEditorClass) {
 		this.propertyEditorClass = propertyEditorClass;
 	}
 
-
 	/*
-	 * @see java.beans.IndexedPropertyDescriptor#equals(java.lang.Object)
+	 * See java.beans.IndexedPropertyDescriptor#equals(java.lang.Object)
 	 */
 	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
+	public boolean equals(Object other) {
+		if (this == other) {
 			return true;
 		}
-
-		if (obj != null && obj instanceof IndexedPropertyDescriptor) {
-			IndexedPropertyDescriptor other = (IndexedPropertyDescriptor) obj;
-			if (!compareMethods(getIndexedReadMethod(), other.getIndexedReadMethod())) {
-				return false;
-			}
-
-			if (!compareMethods(getIndexedWriteMethod(), other.getIndexedWriteMethod())) {
-				return false;
-			}
-
-			if (getIndexedPropertyType() != other.getIndexedPropertyType()) {
-				return false;
-			}
-			return PropertyDescriptorUtils.equals(this, obj);
+		if (!(other instanceof IndexedPropertyDescriptor)) {
+			return false;
 		}
-		return false;
+		IndexedPropertyDescriptor otherPd = (IndexedPropertyDescriptor) other;
+		if (!compareMethods(getIndexedReadMethod(), otherPd.getIndexedReadMethod())) {
+			return false;
+		}
+		if (!compareMethods(getIndexedWriteMethod(), otherPd.getIndexedWriteMethod())) {
+			return false;
+		}
+		if (getIndexedPropertyType() != otherPd.getIndexedPropertyType()) {
+			return false;
+		}
+		return PropertyDescriptorUtils.equals(this, other);
 	}
 
 	@Override
 	public String toString() {
 		return String.format("%s[name=%s, propertyType=%s, indexedPropertyType=%s, " +
 				"readMethod=%s, writeMethod=%s, indexedReadMethod=%s, indexedWriteMethod=%s]",
-				this.getClass().getSimpleName(), this.getName(), this.getPropertyType(),
-				this.getIndexedPropertyType(), this.readMethod, this.writeMethod,
-				this.indexedReadMethod, this.indexedWriteMethod);
+				getClass().getSimpleName(), getName(), getPropertyType(), getIndexedPropertyType(),
+				this.readMethod, this.writeMethod, this.indexedReadMethod, this.indexedWriteMethod);
 	}
 }
 
@@ -492,7 +482,7 @@ public String toString() {
 class PropertyDescriptorUtils {
 
 	/*
-	 * see java.beans.FeatureDescriptor#FeatureDescriptor(FeatureDescriptor)
+	 * See java.beans.FeatureDescriptor#FeatureDescriptor(FeatureDescriptor)
 	 */
 	public static void copyNonMethodProperties(PropertyDescriptor source, PropertyDescriptor target)
 			throws IntrospectionException {
@@ -504,14 +494,14 @@ public static void copyNonMethodProperties(PropertyDescriptor source, PropertyDe
 		target.setShortDescription(source.getShortDescription());
 		target.setDisplayName(source.getDisplayName());
 
-		// copy all attributes (emulating behavior of private FeatureDescriptor#addTable)
+		// Copy all attributes (emulating behavior of private FeatureDescriptor#addTable)
 		Enumeration<String> keys = source.attributeNames();
 		while (keys.hasMoreElements()) {
 			String key = keys.nextElement();
 			target.setValue(key, source.getValue(key));
 		}
 
-		// see java.beans.PropertyDescriptor#PropertyDescriptor(PropertyDescriptor)
+		// See java.beans.PropertyDescriptor#PropertyDescriptor(PropertyDescriptor)
 		target.setPropertyEditorClass(source.getPropertyEditorClass());
 		target.setBound(source.isBound());
 		target.setConstrained(source.isConstrained());
@@ -520,32 +510,39 @@ public static void copyNonMethodProperties(PropertyDescriptor source, PropertyDe
 	/*
 	 * See PropertyDescriptor#findPropertyType
 	 */
-	public static Class<?> findPropertyType(Method readMethod, Method writeMethod)
-			throws IntrospectionException {
-
+	public static Class<?> findPropertyType(Method readMethod, Method writeMethod) throws IntrospectionException {
 		Class<?> propertyType = null;
-
 		if (readMethod != null) {
 			Class<?>[] params = readMethod.getParameterTypes();
 			if (params.length != 0) {
-				throw new IntrospectionException("bad read method arg count: " + readMethod);
+				throw new IntrospectionException("Bad read method arg count: " + readMethod);
 			}
 			propertyType = readMethod.getReturnType();
 			if (propertyType == Void.TYPE) {
-				throw new IntrospectionException("read method "
-						+ readMethod.getName() + " returns void");
+				throw new IntrospectionException("Read method returns void: " + readMethod);
 			}
 		}
 		if (writeMethod != null) {
 			Class<?> params[] = writeMethod.getParameterTypes();
 			if (params.length != 1) {
-				throw new IntrospectionException("bad write method arg count: " + writeMethod);
+				throw new IntrospectionException("Bad write method arg count: " + writeMethod);
 			}
-			if (propertyType != null
-					&& !params[0].isAssignableFrom(propertyType)) {
-				throw new IntrospectionException("type mismatch between read and write methods");
+			if (propertyType != null) {
+				if (propertyType.isAssignableFrom(params[0])) {
+					// Write method's property type potentially more specific
+					propertyType = params[0];
+				}
+				else if (params[0].isAssignableFrom(propertyType)) {
+					// Proceed with read method's property type
+				}
+				else {
+					throw new IntrospectionException(
+							"Type mismatch between read and write methods: " + readMethod + " - " + writeMethod);
+				}
+			}
+			else {
+				propertyType = params[0];
 			}
-			propertyType = params[0];
 		}
 		return propertyType;
 	}
@@ -554,48 +551,51 @@ public static Class<?> findPropertyType(Method readMethod, Method writeMethod)
 	 * See IndexedPropertyDescriptor#findIndexedPropertyType
 	 */
 	public static Class<?> findIndexedPropertyType(String name, Class<?> propertyType,
-				Method indexedReadMethod, Method indexedWriteMethod)
-			throws IntrospectionException {
+			Method indexedReadMethod, Method indexedWriteMethod) throws IntrospectionException {
 
 		Class<?> indexedPropertyType = null;
-
 		if (indexedReadMethod != null) {
 			Class<?> params[] = indexedReadMethod.getParameterTypes();
 			if (params.length != 1) {
-				throw new IntrospectionException(
-						"bad indexed read method arg count");
+				throw new IntrospectionException("Bad indexed read method arg count: " + indexedReadMethod);
 			}
 			if (params[0] != Integer.TYPE) {
-				throw new IntrospectionException(
-						"non int index to indexed read method");
+				throw new IntrospectionException("Non int index to indexed read method: " + indexedReadMethod);
 			}
 			indexedPropertyType = indexedReadMethod.getReturnType();
 			if (indexedPropertyType == Void.TYPE) {
-				throw new IntrospectionException(
-						"indexed read method returns void");
+				throw new IntrospectionException("Indexed read method returns void: " + indexedReadMethod);
 			}
 		}
 		if (indexedWriteMethod != null) {
 			Class<?> params[] = indexedWriteMethod.getParameterTypes();
 			if (params.length != 2) {
-				throw new IntrospectionException(
-						"bad indexed write method arg count");
+				throw new IntrospectionException("Bad indexed write method arg count: " + indexedWriteMethod);
 			}
 			if (params[0] != Integer.TYPE) {
-				throw new IntrospectionException(
-						"non int index to indexed write method");
+				throw new IntrospectionException("Non int index to indexed write method: " + indexedWriteMethod);
+			}
+			if (indexedPropertyType != null) {
+				if (indexedPropertyType.isAssignableFrom(params[1])) {
+					// Write method's property type potentially more specific
+					indexedPropertyType = params[1];
+				}
+				else if (params[1].isAssignableFrom(indexedPropertyType)) {
+					// Proceed with read method's property type
+				}
+				else {
+					throw new IntrospectionException("Type mismatch between indexed read and write methods: " +
+							indexedReadMethod + " - " + indexedWriteMethod);
+				}
 			}
-			if (indexedPropertyType != null && indexedPropertyType != params[1]) {
-				throw new IntrospectionException(
-						"type mismatch between indexed read and indexed write methods: " + name);
+			else {
+				indexedPropertyType = params[1];
 			}
-			indexedPropertyType = params[1];
 		}
-		if (propertyType != null
-				&& (!propertyType.isArray() ||
-						propertyType.getComponentType() != indexedPropertyType)) {
-			throw new IntrospectionException(
-					"type mismatch between indexed and non-indexed methods: " + name);
+		if (propertyType != null && (!propertyType.isArray() ||
+				propertyType.getComponentType() != indexedPropertyType)) {
+			throw new IntrospectionException("Type mismatch between indexed and non-indexed methods: " +
+					indexedReadMethod + " - " + indexedWriteMethod);
 		}
 		return indexedPropertyType;
 	}
@@ -605,42 +605,35 @@ public static Class<?> findIndexedPropertyType(String name, Class<?> propertyTyp
 	 * return {@code true} if they are objects are equivalent, i.e. both are {@code
 	 * PropertyDescriptor}s whose read method, write method, property types, property
 	 * editor and flags are equivalent.
-	 *
 	 * @see PropertyDescriptor#equals(Object)
 	 */
-	public static boolean equals(PropertyDescriptor pd1, Object obj) {
-		if (pd1 == obj) {
+	public static boolean equals(PropertyDescriptor pd, Object other) {
+		if (pd == other) {
 			return true;
 		}
-		if (obj != null && obj instanceof PropertyDescriptor) {
-			PropertyDescriptor pd2 = (PropertyDescriptor) obj;
-			if (!compareMethods(pd1.getReadMethod(), pd2.getReadMethod())) {
-				return false;
-			}
-
-			if (!compareMethods(pd1.getWriteMethod(), pd2.getWriteMethod())) {
-				return false;
-			}
-
-			if (pd1.getPropertyType() == pd2.getPropertyType()
-					&& pd1.getPropertyEditorClass() == pd2.getPropertyEditorClass()
-					&& pd1.isBound() == pd2.isBound()
-					&& pd1.isConstrained() == pd2.isConstrained()) {
-				return true;
-			}
+		if (!(other instanceof PropertyDescriptor)) {
+			return false;
 		}
-		return false;
+		PropertyDescriptor otherPd = (PropertyDescriptor) other;
+		if (!compareMethods(pd.getReadMethod(), otherPd.getReadMethod())) {
+			return false;
+		}
+		if (!compareMethods(pd.getWriteMethod(), otherPd.getWriteMethod())) {
+			return false;
+		}
+		return (pd.getPropertyType() == otherPd.getPropertyType() &&
+				pd.getPropertyEditorClass() == otherPd.getPropertyEditorClass() &&
+				pd.isBound() == otherPd.isBound() && pd.isConstrained() == otherPd.isConstrained());
 	}
 
 	/*
-	 * see PropertyDescriptor#compareMethods
+	 * See PropertyDescriptor#compareMethods
 	 */
 	public static boolean compareMethods(Method a, Method b) {
 		if ((a == null) != (b == null)) {
 			return false;
 		}
-
-		if (a != null && b != null) {
+		if (a != null) {
 			if (!a.equals(b)) {
 				return false;
 			}
@@ -653,7 +646,6 @@ public static boolean compareMethods(Method a, Method b) {
 /**
  * Sorts PropertyDescriptor instances alpha-numerically to emulate the behavior of
  * {@link java.beans.BeanInfo#getPropertyDescriptors()}.
- *
  * @see ExtendedBeanInfo#propertyDescriptors
  */
 class PropertyDescriptorComparator implements Comparator<PropertyDescriptor> {
diff --git a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfoFactory.java b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfoFactory.java
index 183ffe4e2a..c0da24a95c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfoFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfoFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
 
 /**
  * {@link BeanInfoFactory} implementation that evaluates whether bean classes have
- * "non-standard" JavaBeans setter methods and are thus candidates for introspection by
- * Spring's {@link ExtendedBeanInfo}.
+ * "non-standard" JavaBeans setter methods and are thus candidates for introspection
+ * by Spring's (package-visible) {@code ExtendedBeanInfo} implementation.
  *
  * <p>Ordered at {@link Ordered#LOWEST_PRECEDENCE} to allow other user-defined
  * {@link BeanInfoFactory} types to take precedence.
@@ -34,20 +34,20 @@
  * @author Chris Beams
  * @since 3.2
  * @see BeanInfoFactory
+ * @see CachedIntrospectionResults
  */
-public class ExtendedBeanInfoFactory implements Ordered, BeanInfoFactory {
+public class ExtendedBeanInfoFactory implements BeanInfoFactory, Ordered {
 
 	/**
-	 * Return a new {@link ExtendedBeanInfo} for the given bean class.
+	 * Return an {@link ExtendedBeanInfo} for the given bean class, if applicable.
 	 */
 	public BeanInfo getBeanInfo(Class<?> beanClass) throws IntrospectionException {
-		return supports(beanClass) ?
-				new ExtendedBeanInfo(Introspector.getBeanInfo(beanClass)) : null;
+		return (supports(beanClass) ? new ExtendedBeanInfo(Introspector.getBeanInfo(beanClass)) : null);
 	}
 
 	/**
-	 * Return whether the given bean class declares or inherits any non-void returning
-	 * JavaBeans or <em>indexed property</em> setter methods.
+	 * Return whether the given bean class declares or inherits any non-void
+	 * returning bean property or indexed property setter methods.
 	 */
 	private boolean supports(Class<?> beanClass) {
 		for (Method method : beanClass.getMethods()) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
index 0f0c593162..8200d6f8ce 100644
--- a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,37 +31,40 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Extension of the standard JavaBeans PropertyDescriptor class,
- * overriding {@code getPropertyType()} such that a generically
- * declared type will be resolved against the containing bean class.
+ * Extension of the standard JavaBeans {@link PropertyDescriptor} class,
+ * overriding {@code getPropertyType()} such that a generically declared
+ * type variable will be resolved against the containing bean class.
  *
  * @author Juergen Hoeller
  * @since 2.5.2
  */
 class GenericTypeAwarePropertyDescriptor extends PropertyDescriptor {
 
-	private final Class beanClass;
+	private final Class<?> beanClass;
 
 	private final Method readMethod;
 
 	private final Method writeMethod;
 
-	private final Class propertyEditorClass;
-
 	private volatile Set<Method> ambiguousWriteMethods;
 
-	private Class propertyType;
-
 	private MethodParameter writeMethodParameter;
 
+	private Class<?> propertyType;
+
+	private final Class<?> propertyEditorClass;
 
-	public GenericTypeAwarePropertyDescriptor(Class beanClass, String propertyName,
-			Method readMethod, Method writeMethod, Class propertyEditorClass)
+
+	public GenericTypeAwarePropertyDescriptor(Class<?> beanClass, String propertyName,
+			Method readMethod, Method writeMethod, Class<?> propertyEditorClass)
 			throws IntrospectionException {
 
 		super(propertyName, null, null);
+
+		if (beanClass == null)  {
+			throw new IntrospectionException("Bean class must not be null");
+		}
 		this.beanClass = beanClass;
-		this.propertyEditorClass = propertyEditorClass;
 
 		Method readMethodToUse = BridgeMethodResolver.findBridgedMethod(readMethod);
 		Method writeMethodToUse = BridgeMethodResolver.findBridgedMethod(writeMethod);
@@ -69,8 +72,11 @@ public GenericTypeAwarePropertyDescriptor(Class beanClass, String propertyName,
 			// Fallback: Original JavaBeans introspection might not have found matching setter
 			// method due to lack of bridge method resolution, in case of the getter using a
 			// covariant return type whereas the setter is defined for the concrete property type.
-			writeMethodToUse = ClassUtils.getMethodIfAvailable(this.beanClass,
-					"set" + StringUtils.capitalize(getName()), readMethodToUse.getReturnType());
+			Method candidate = ClassUtils.getMethodIfAvailable(
+					this.beanClass, "set" + StringUtils.capitalize(getName()), (Class<?>[]) null);
+			if (candidate != null && candidate.getParameterTypes().length == 1) {
+				writeMethodToUse = candidate;
+			}
 		}
 		this.readMethod = readMethodToUse;
 		this.writeMethod = writeMethodToUse;
@@ -82,7 +88,8 @@ public GenericTypeAwarePropertyDescriptor(Class beanClass, String propertyName,
 			Set<Method> ambiguousCandidates = new HashSet<Method>();
 			for (Method method : beanClass.getMethods()) {
 				if (method.getName().equals(writeMethodToUse.getName()) &&
-						!method.equals(writeMethodToUse) && !method.isBridge()) {
+						!method.equals(writeMethodToUse) && !method.isBridge() &&
+						method.getParameterTypes().length == writeMethodToUse.getParameterTypes().length) {
 					ambiguousCandidates.add(method);
 				}
 			}
@@ -90,8 +97,11 @@ public GenericTypeAwarePropertyDescriptor(Class beanClass, String propertyName,
 				this.ambiguousWriteMethods = ambiguousCandidates;
 			}
 		}
+
+		this.propertyEditorClass = propertyEditorClass;
 	}
 
+
 	public Class<?> getBeanClass() {
 		return this.beanClass;
 	}
@@ -117,13 +127,19 @@ public Method getWriteMethodForActualAccess() {
 		return this.writeMethod;
 	}
 
-	@Override
-	public Class getPropertyEditorClass() {
-		return this.propertyEditorClass;
+	public synchronized MethodParameter getWriteMethodParameter() {
+		if (this.writeMethod == null) {
+			return null;
+		}
+		if (this.writeMethodParameter == null) {
+			this.writeMethodParameter = new MethodParameter(this.writeMethod, 0);
+			GenericTypeResolver.resolveParameterType(this.writeMethodParameter, this.beanClass);
+		}
+		return this.writeMethodParameter;
 	}
 
 	@Override
-	public synchronized Class getPropertyType() {
+	public synchronized Class<?> getPropertyType() {
 		if (this.propertyType == null) {
 			if (this.readMethod != null) {
 				this.propertyType = GenericTypeResolver.resolveReturnType(this.readMethod, this.beanClass);
@@ -141,15 +157,9 @@ public synchronized Class getPropertyType() {
 		return this.propertyType;
 	}
 
-	public synchronized MethodParameter getWriteMethodParameter() {
-		if (this.writeMethod == null) {
-			return null;
-		}
-		if (this.writeMethodParameter == null) {
-			this.writeMethodParameter = new MethodParameter(this.writeMethod, 0);
-			GenericTypeResolver.resolveParameterType(this.writeMethodParameter, this.beanClass);
-		}
-		return this.writeMethodParameter;
+	@Override
+	public Class<?> getPropertyEditorClass() {
+		return this.propertyEditorClass;
 	}
 
 }
diff --git a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
index 390b3f8a12..c7f8b70dd9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,7 +86,7 @@ public MutablePropertyValues(Map<?, ?> original) {
 		// There is no replacement of existing property values.
 		if (original != null) {
 			this.propertyValueList = new ArrayList<PropertyValue>(original.size());
-			for (Map.Entry entry : original.entrySet()) {
+			for (Map.Entry<?, ?> entry : original.entrySet()) {
 				this.propertyValueList.add(new PropertyValue(entry.getKey().toString(), entry.getValue()));
 			}
 		}
@@ -303,6 +303,16 @@ public void registerProcessedProperty(String propertyName) {
 		this.processedProperties.add(propertyName);
 	}
 
+	/**
+	 * Clear the "processed" registration of the given property, if any.
+	 * @since 3.2.13
+	 */
+	public void clearProcessedProperty(String propertyName) {
+		if (this.processedProperties != null) {
+			this.processedProperties.remove(propertyName);
+		}
+	}
+
 	/**
 	 * Mark this holder as containing converted values only
 	 * (i.e. no runtime resolution needed anymore).
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java
index 621bae5325..c7faf35524 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,7 +86,7 @@ public interface PropertyAccessor {
 	 * @throws PropertyAccessException if the property was valid but the
 	 * accessor method failed
 	 */
-	Class getPropertyType(String propertyName) throws BeansException;
+	Class<?> getPropertyType(String propertyName) throws BeansException;
 
 	/**
 	 * Return a type descriptor for the specified property:
@@ -120,7 +120,7 @@ public interface PropertyAccessor {
 	 * @throws InvalidPropertyException if there is no such property or
 	 * if the property isn't writable
 	 * @throws PropertyAccessException if the property was valid but the
-	 * accessor method failed or a type mismatch occured
+	 * accessor method failed or a type mismatch occurred
 	 */
 	void setPropertyValue(String propertyName, Object value) throws BeansException;
 
@@ -130,7 +130,7 @@ public interface PropertyAccessor {
 	 * @throws InvalidPropertyException if there is no such property or
 	 * if the property isn't writable
 	 * @throws PropertyAccessException if the property was valid but the
-	 * accessor method failed or a type mismatch occured
+	 * accessor method failed or a type mismatch occurred
 	 */
 	void setPropertyValue(PropertyValue pv) throws BeansException;
 
@@ -144,7 +144,7 @@ public interface PropertyAccessor {
 	 * @throws InvalidPropertyException if there is no such property or
 	 * if the property isn't writable
 	 * @throws PropertyBatchUpdateException if one or more PropertyAccessExceptions
-	 * occured for specific properties during the batch update. This exception bundles
+	 * occurred for specific properties during the batch update. This exception bundles
 	 * all individual PropertyAccessExceptions. All other properties will have been
 	 * successfully updated.
 	 */
@@ -164,7 +164,7 @@ public interface PropertyAccessor {
 	 * @throws InvalidPropertyException if there is no such property or
 	 * if the property isn't writable
 	 * @throws PropertyBatchUpdateException if one or more PropertyAccessExceptions
-	 * occured for specific properties during the batch update. This exception bundles
+	 * occurred for specific properties during the batch update. This exception bundles
 	 * all individual PropertyAccessExceptions. All other properties will have been
 	 * successfully updated.
 	 * @see #setPropertyValues(PropertyValues, boolean, boolean)
@@ -185,7 +185,7 @@ public interface PropertyAccessor {
 	 * @throws InvalidPropertyException if there is no such property or
 	 * if the property isn't writable
 	 * @throws PropertyBatchUpdateException if one or more PropertyAccessExceptions
-	 * occured for specific properties during the batch update. This exception bundles
+	 * occurred for specific properties during the batch update. This exception bundles
 	 * all individual PropertyAccessExceptions. All other properties will have been
 	 * successfully updated.
 	 * @see #setPropertyValues(PropertyValues, boolean, boolean)
@@ -208,7 +208,7 @@ void setPropertyValues(PropertyValues pvs, boolean ignoreUnknown)
 	 * @throws InvalidPropertyException if there is no such property or
 	 * if the property isn't writable
 	 * @throws PropertyBatchUpdateException if one or more PropertyAccessExceptions
-	 * occured for specific properties during the batch update. This exception bundles
+	 * occurred for specific properties during the batch update. This exception bundles
 	 * all individual PropertyAccessExceptions. All other properties will have been
 	 * successfully updated.
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java
index 1919a47122..bfa54687bb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java
@@ -130,7 +130,7 @@ public void printStackTrace(PrintWriter pw) {
 	}
 
 	@Override
-	public boolean contains(Class exType) {
+	public boolean contains(Class<?> exType) {
 		if (exType == null) {
 			return false;
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java b/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java
index 82830a198c..ea860ec161 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ final class PropertyMatches {
 	 * @param propertyName the name of the property to find possible matches for
 	 * @param beanClass the bean class to search for matches
 	 */
-	public static PropertyMatches forProperty(String propertyName, Class beanClass) {
+	public static PropertyMatches forProperty(String propertyName, Class<?> beanClass) {
 		return forProperty(propertyName, beanClass, DEFAULT_MAX_DISTANCE);
 	}
 
@@ -59,7 +59,7 @@ public static PropertyMatches forProperty(String propertyName, Class beanClass)
 	 * @param beanClass the bean class to search for matches
 	 * @param maxDistance the maximum property distance allowed for matches
 	 */
-	public static PropertyMatches forProperty(String propertyName, Class beanClass, int maxDistance) {
+	public static PropertyMatches forProperty(String propertyName, Class<?> beanClass, int maxDistance) {
 		return new PropertyMatches(propertyName, beanClass, maxDistance);
 	}
 
@@ -76,7 +76,7 @@ public static PropertyMatches forProperty(String propertyName, Class beanClass,
 	/**
 	 * Create a new PropertyMatches instance for the given property.
 	 */
-	private PropertyMatches(String propertyName, Class beanClass, int maxDistance) {
+	private PropertyMatches(String propertyName, Class<?> beanClass, int maxDistance) {
 		this.propertyName = propertyName;
 		this.possibleMatches = calculateMatches(BeanUtils.getPropertyDescriptors(beanClass), maxDistance);
 	}
@@ -172,7 +172,8 @@ private int calculateStringDistance(String s1, String s2) {
 				char t_j = s2.charAt(j - 1);
 				if (s_i == t_j) {
 					cost = 0;
-				} else {
+				}
+				else {
 					cost = 1;
 				}
 				d[i][j] = Math.min(Math.min(d[i - 1][j] + 1, d[i][j - 1] + 1),
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java b/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
index feecaf0e59..a2dbc88f12 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,8 +46,6 @@ public class PropertyValue extends BeanMetadataAttributeAccessor implements Seri
 
 	private final Object value;
 
-	private Object source;
-
 	private boolean optional = false;
 
 	private boolean converted = false;
@@ -82,13 +80,13 @@ public PropertyValue(PropertyValue original) {
 		Assert.notNull(original, "Original must not be null");
 		this.name = original.getName();
 		this.value = original.getValue();
-		this.source = original.getSource();
 		this.optional = original.isOptional();
 		this.converted = original.converted;
 		this.convertedValue = original.convertedValue;
 		this.conversionNecessary = original.conversionNecessary;
 		this.resolvedTokens = original.resolvedTokens;
 		this.resolvedDescriptor = original.resolvedDescriptor;
+		setSource(original.getSource());
 		copyAttributesFrom(original);
 	}
 
@@ -102,11 +100,11 @@ public PropertyValue(PropertyValue original, Object newValue) {
 		Assert.notNull(original, "Original must not be null");
 		this.name = original.getName();
 		this.value = newValue;
-		this.source = original;
 		this.optional = original.isOptional();
 		this.conversionNecessary = original.conversionNecessary;
 		this.resolvedTokens = original.resolvedTokens;
 		this.resolvedDescriptor = original.resolvedDescriptor;
+		setSource(original);
 		copyAttributesFrom(original);
 	}
 
@@ -135,16 +133,28 @@ public Object getValue() {
 	 */
 	public PropertyValue getOriginalPropertyValue() {
 		PropertyValue original = this;
-		while (original.source instanceof PropertyValue && original.source != original) {
-			original = (PropertyValue) original.source;
+		Object source = getSource();
+		while (source instanceof PropertyValue && source != original) {
+			original = (PropertyValue) source;
+			source = original.getSource();
 		}
 		return original;
 	}
 
+	/**
+	 * Set whether this is an optional value, that is, to be ignored
+	 * when no corresponding property exists on the target class.
+	 * @since 3.0
+	 */
 	public void setOptional(boolean optional) {
 		this.optional = optional;
 	}
 
+	/**
+	 * Return whether this is an optional value, that is, to be ignored
+	 * when no corresponding property exists on the target class.
+	 * @since 3.0
+	 */
 	public boolean isOptional() {
 		return this.optional;
 	}
@@ -186,7 +196,7 @@ public boolean equals(Object other) {
 		PropertyValue otherPv = (PropertyValue) other;
 		return (this.name.equals(otherPv.name) &&
 				ObjectUtils.nullSafeEquals(this.value, otherPv.value) &&
-				ObjectUtils.nullSafeEquals(this.source, otherPv.source));
+				ObjectUtils.nullSafeEquals(getSource(), otherPv.getSource()));
 	}
 
 	@Override
diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java b/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
index 24bc57e9e3..0807c229b5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
+++ b/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -187,6 +187,9 @@ public <T> T convertIfNecessary(String propertyName, Object oldValue, Object new
 			// Try to apply some standard type conversion rules if appropriate.
 
 			if (convertedValue != null) {
+				if (Object.class.equals(requiredType)) {
+					return (T) convertedValue;
+				}
 				if (requiredType.isArray()) {
 					// Array required -> apply appropriate conversion of elements.
 					if (convertedValue instanceof String && Enum.class.isAssignableFrom(requiredType.getComponentType())) {
@@ -197,13 +200,13 @@ public <T> T convertIfNecessary(String propertyName, Object oldValue, Object new
 				else if (convertedValue instanceof Collection) {
 					// Convert elements to target type, if determined.
 					convertedValue = convertToTypedCollection(
-							(Collection) convertedValue, propertyName, requiredType, typeDescriptor);
+							(Collection<?>) convertedValue, propertyName, requiredType, typeDescriptor);
 					standardConversion = true;
 				}
 				else if (convertedValue instanceof Map) {
 					// Convert keys and values to respective target type, if determined.
 					convertedValue = convertToTypedMap(
-							(Map) convertedValue, propertyName, requiredType, typeDescriptor);
+							(Map<?, ?>) convertedValue, propertyName, requiredType, typeDescriptor);
 					standardConversion = true;
 				}
 				if (convertedValue.getClass().isArray() && Array.getLength(convertedValue) == 1) {
@@ -217,8 +220,8 @@ else if (convertedValue instanceof Map) {
 				else if (convertedValue instanceof String && !requiredType.isInstance(convertedValue)) {
 					if (firstAttemptEx == null && !requiredType.isInterface() && !requiredType.isEnum()) {
 						try {
-							Constructor strCtor = requiredType.getConstructor(String.class);
-							return (T) BeanUtils.instantiateClass(strCtor, convertedValue);
+							Constructor<T> strCtor = requiredType.getConstructor(String.class);
+							return BeanUtils.instantiateClass(strCtor, convertedValue);
 						}
 						catch (NoSuchMethodException ex) {
 							// proceed with field lookup
@@ -286,19 +289,19 @@ private Object attemptToConvertStringToEnum(Class<?> requiredType, String trimme
 			if (index > - 1) {
 				String enumType = trimmedValue.substring(0, index);
 				String fieldName = trimmedValue.substring(index + 1);
-				ClassLoader loader = this.targetObject.getClass().getClassLoader();
+				ClassLoader cl = this.targetObject.getClass().getClassLoader();
 				try {
-					Class<?> enumValueType = loader.loadClass(enumType);
+					Class<?> enumValueType = ClassUtils.forName(enumType, cl);
 					Field enumField = enumValueType.getField(fieldName);
 					convertedValue = enumField.get(null);
 				}
 				catch (ClassNotFoundException ex) {
-					if(logger.isTraceEnabled()) {
-						logger.trace("Enum class [" + enumType + "] cannot be loaded from [" + loader + "]", ex);
+					if (logger.isTraceEnabled()) {
+						logger.trace("Enum class [" + enumType + "] cannot be loaded", ex);
 					}
 				}
 				catch (Throwable ex) {
-					if(logger.isTraceEnabled()) {
+					if (logger.isTraceEnabled()) {
 						logger.trace("Field [" + fieldName + "] isn't an enum value for type [" + enumType + "]", ex);
 					}
 				}
@@ -328,7 +331,7 @@ private Object attemptToConvertStringToEnum(Class<?> requiredType, String trimme
 	 * @param requiredType the type to find an editor for
 	 * @return the corresponding editor, or {@code null} if none
 	 */
-	private PropertyEditor findDefaultEditor(Class requiredType) {
+	private PropertyEditor findDefaultEditor(Class<?> requiredType) {
 		PropertyEditor editor = null;
 		if (requiredType != null) {
 			// No custom editor -> check BeanWrapperImpl's default editors.
@@ -456,10 +459,10 @@ private Object doConvertTextValue(Object oldValue, String newTextValue, Property
 	private Object convertToTypedArray(Object input, String propertyName, Class<?> componentType) {
 		if (input instanceof Collection) {
 			// Convert Collection elements to array elements.
-			Collection coll = (Collection) input;
+			Collection<?> coll = (Collection<?>) input;
 			Object result = Array.newInstance(componentType, coll.size());
 			int i = 0;
-			for (Iterator it = coll.iterator(); it.hasNext(); i++) {
+			for (Iterator<?> it = coll.iterator(); it.hasNext(); i++) {
 				Object value = convertIfNecessary(
 						buildIndexedPropertyName(propertyName, i), null, it.next(), componentType);
 				Array.set(result, i, value);
@@ -492,8 +495,8 @@ else if (input.getClass().isArray()) {
 	}
 
 	@SuppressWarnings("unchecked")
-	private Collection convertToTypedCollection(
-			Collection original, String propertyName, Class requiredType, TypeDescriptor typeDescriptor) {
+	private Collection<?> convertToTypedCollection(
+			Collection<?> original, String propertyName, Class<?> requiredType, TypeDescriptor typeDescriptor) {
 
 		if (!Collection.class.isAssignableFrom(requiredType)) {
 			return original;
@@ -516,7 +519,7 @@ private Collection convertToTypedCollection(
 			return original;
 		}
 
-		Iterator it;
+		Iterator<?> it;
 		try {
 			it = original.iterator();
 			if (it == null) {
@@ -535,13 +538,13 @@ private Collection convertToTypedCollection(
 			return original;
 		}
 
-		Collection convertedCopy;
+		Collection<Object> convertedCopy;
 		try {
 			if (approximable) {
 				convertedCopy = CollectionFactory.createApproximateCollection(original, original.size());
 			}
 			else {
-				convertedCopy = (Collection) requiredType.newInstance();
+				convertedCopy = (Collection<Object>) requiredType.newInstance();
 			}
 		}
 		catch (Throwable ex) {
@@ -574,8 +577,8 @@ private Collection convertToTypedCollection(
 	}
 
 	@SuppressWarnings("unchecked")
-	private Map convertToTypedMap(
-			Map original, String propertyName, Class requiredType, TypeDescriptor typeDescriptor) {
+	private Map<?, ?> convertToTypedMap(
+			Map<?, ?> original, String propertyName, Class<?> requiredType, TypeDescriptor typeDescriptor) {
 
 		if (!Map.class.isAssignableFrom(requiredType)) {
 			return original;
@@ -599,7 +602,7 @@ private Map convertToTypedMap(
 			return original;
 		}
 
-		Iterator it;
+		Iterator<?> it;
 		try {
 			it = original.entrySet().iterator();
 			if (it == null) {
@@ -618,13 +621,13 @@ private Map convertToTypedMap(
 			return original;
 		}
 
-		Map convertedCopy;
+		Map<Object, Object> convertedCopy;
 		try {
 			if (approximable) {
 				convertedCopy = CollectionFactory.createApproximateMap(original, original.size());
 			}
 			else {
-				convertedCopy = (Map) requiredType.newInstance();
+				convertedCopy = (Map<Object, Object>) requiredType.newInstance();
 			}
 		}
 		catch (Throwable ex) {
@@ -636,7 +639,7 @@ private Map convertToTypedMap(
 		}
 
 		while (it.hasNext()) {
-			Map.Entry entry = (Map.Entry) it.next();
+			Map.Entry<?, ?> entry = (Map.Entry<?, ?>) it.next();
 			Object key = entry.getKey();
 			Object value = entry.getValue();
 			String keyedPropertyName = buildKeyedPropertyName(propertyName, key);
@@ -671,7 +674,7 @@ private String buildKeyedPropertyName(String propertyName, Object key) {
 				null);
 	}
 
-	private boolean canCreateCopy(Class requiredType) {
+	private boolean canCreateCopy(Class<?> requiredType) {
 		return (!requiredType.isInterface() && !Modifier.isAbstract(requiredType.getModifiers()) &&
 				Modifier.isPublic(requiredType.getModifiers()) && ClassUtils.hasConstructor(requiredType));
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java
index 2ffe909a94..7af4087576 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java
@@ -123,7 +123,7 @@ public String getResourceDescription() {
 
 	/**
 	 * Add a related cause to this bean creation exception,
-	 * not being a direct cause of the failure but having occured
+	 * not being a direct cause of the failure but having occurred
 	 * earlier in the creation of the same bean instance.
 	 * @param ex the related cause to add
 	 */
@@ -185,7 +185,7 @@ public void printStackTrace(PrintWriter pw) {
 	}
 
 	@Override
-	public boolean contains(Class exClass) {
+	public boolean contains(Class<?> exClass) {
 		if (super.contains(exClass)) {
 			return true;
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java
index 8c73a16fd7..d13b514dbb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,24 +66,27 @@
  * 1. BeanNameAware's {@code setBeanName}<br>
  * 2. BeanClassLoaderAware's {@code setBeanClassLoader}<br>
  * 3. BeanFactoryAware's {@code setBeanFactory}<br>
- * 4. ResourceLoaderAware's {@code setResourceLoader}
+ * 4. EnvironmentAware's {@code setEnvironment}
+ * 5. EmbeddedValueResolverAware's {@code setEmbeddedValueResolver}
+ * 6. ResourceLoaderAware's {@code setResourceLoader}
  * (only applicable when running in an application context)<br>
- * 5. ApplicationEventPublisherAware's {@code setApplicationEventPublisher}
+ * 7. ApplicationEventPublisherAware's {@code setApplicationEventPublisher}
  * (only applicable when running in an application context)<br>
- * 6. MessageSourceAware's {@code setMessageSource}
+ * 8. MessageSourceAware's {@code setMessageSource}
  * (only applicable when running in an application context)<br>
- * 7. ApplicationContextAware's {@code setApplicationContext}
+ * 9. ApplicationContextAware's {@code setApplicationContext}
  * (only applicable when running in an application context)<br>
- * 8. ServletContextAware's {@code setServletContext}
+ * 10. ServletContextAware's {@code setServletContext}
  * (only applicable when running in a web application context)<br>
- * 9. {@code postProcessBeforeInitialization} methods of BeanPostProcessors<br>
- * 10. InitializingBean's {@code afterPropertiesSet}<br>
- * 11. a custom init-method definition<br>
- * 12. {@code postProcessAfterInitialization} methods of BeanPostProcessors
+ * 11. {@code postProcessBeforeInitialization} methods of BeanPostProcessors<br>
+ * 12. InitializingBean's {@code afterPropertiesSet}<br>
+ * 13. a custom init-method definition<br>
+ * 14. {@code postProcessAfterInitialization} methods of BeanPostProcessors
  *
  * <p>On shutdown of a bean factory, the following lifecycle methods apply:<br>
- * 1. DisposableBean's {@code destroy}<br>
- * 2. a custom destroy-method definition
+ * 1. {@code postProcessBeforeDestruction} methods of DestructionAwareBeanPostProcessors
+ * 2. DisposableBean's {@code destroy}<br>
+ * 3. a custom destroy-method definition
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -114,6 +117,7 @@ public interface BeanFactory {
 	 */
 	String FACTORY_BEAN_PREFIX = "&";
 
+
 	/**
 	 * Return an instance, which may be shared or independent, of the specified bean.
 	 * <p>This method allows a Spring BeanFactory to be used as a replacement for the
@@ -151,15 +155,16 @@ public interface BeanFactory {
 
 	/**
 	 * Return the bean instance that uniquely matches the given object type, if any.
-	 * @param requiredType type the bean must match; can be an interface or superclass.
-	 * {@code null} is disallowed.
 	 * <p>This method goes into {@link ListableBeanFactory} by-type lookup territory
 	 * but may also be translated into a conventional by-name lookup based on the name
 	 * of the given type. For more extensive retrieval operations across sets of beans,
 	 * use {@link ListableBeanFactory} and/or {@link BeanFactoryUtils}.
+	 * @param requiredType type the bean must match; can be an interface or superclass.
+	 * {@code null} is disallowed.
 	 * @return an instance of the single bean matching the required type
 	 * @throws NoSuchBeanDefinitionException if no bean of the given type was found
 	 * @throws NoUniqueBeanDefinitionException if more than one bean of the given type was found
+	 * @throws BeansException if the bean could not be created
 	 * @since 3.0
 	 * @see ListableBeanFactory
 	 */
@@ -170,8 +175,7 @@ public interface BeanFactory {
 	 * <p>Allows for specifying explicit constructor arguments / factory method arguments,
 	 * overriding the specified default arguments (if any) in the bean definition.
 	 * @param name the name of the bean to retrieve
-	 * @param args arguments to use if creating a prototype using explicit arguments to a
-	 * static factory method. It is invalid to use a non-null args value in any other case.
+	 * @param args arguments to use when creating a prototype using explicit arguments
 	 * @return an instance of the bean
 	 * @throws NoSuchBeanDefinitionException if there is no such bean definition
 	 * @throws BeanDefinitionStoreException if arguments have been given but
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java
index 657bb1ebd1..701b638c60 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.beans.factory;
 
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -139,7 +138,7 @@ public static String[] beanNamesIncludingAncestors(ListableBeanFactory lbf) {
 	 * @param type the type that beans must match
 	 * @return the array of matching bean names, or an empty array if none
 	 */
-	public static String[] beanNamesForTypeIncludingAncestors(ListableBeanFactory lbf, Class type) {
+	public static String[] beanNamesForTypeIncludingAncestors(ListableBeanFactory lbf, Class<?> type) {
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		String[] result = lbf.getBeanNamesForType(type);
 		if (lbf instanceof HierarchicalBeanFactory) {
@@ -181,7 +180,7 @@ public static String[] beanNamesForTypeIncludingAncestors(ListableBeanFactory lb
 	 * @return the array of matching bean names, or an empty array if none
 	 */
 	public static String[] beanNamesForTypeIncludingAncestors(
-			ListableBeanFactory lbf, Class type, boolean includeNonSingletons, boolean allowEagerInit) {
+			ListableBeanFactory lbf, Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
 
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		String[] result = lbf.getBeanNamesForType(type, includeNonSingletons, allowEagerInit);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/NamedBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/NamedBean.java
index e1e5ed33f5..9f2453ff65 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/NamedBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/NamedBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 package org.springframework.beans.factory;
 
 /**
- * Counterpart of BeanNameAware. Returns the bean name of an object.
+ * Counterpart of {@link BeanNameAware}. Returns the bean name of an object.
  *
- * <p>This interface can be introduced to avoid a brittle dependence
- * on bean name in objects used with Spring IoC and Spring AOP.
+ * <p>This interface can be introduced to avoid a brittle dependence on
+ * bean name in objects used with Spring IoC and Spring AOP.
  *
  * @author Rod Johnson
  * @since 2.0
@@ -29,7 +29,7 @@
 public interface NamedBean {
 
 	/**
-	 * Return the name of this bean in a Spring bean factory.
+	 * Return the name of this bean in a Spring bean factory, if known.
 	 */
 	String getBeanName();
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/NoSuchBeanDefinitionException.java b/spring-beans/src/main/java/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
index 5bd8ea7a9f..106fa0cafc 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,21 +20,23 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Exception thrown when a {@code BeanFactory} is asked for a bean instance
- * for which it cannot find a definition.
+ * Exception thrown when a {@code BeanFactory} is asked for a bean instance for which it
+ * cannot find a definition. This may point to a non-existing bean, a non-unique bean,
+ * or a manually registered singleton instance without an associated bean definition.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @see BeanFactory#getBean(String)
  * @see BeanFactory#getBean(Class)
+ * @see NoUniqueBeanDefinitionException
  */
 @SuppressWarnings("serial")
 public class NoSuchBeanDefinitionException extends BeansException {
 
-	/** Name of the missing bean. */
+	/** Name of the missing bean */
 	private String beanName;
 
-	/** Required type of the missing bean. */
+	/** Required type of the missing bean */
 	private Class<?> beanType;
 
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java
index e97329df74..b2be5132c5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.beans.FeatureDescriptor;
 import java.util.Iterator;
-
 import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.ELResolver;
@@ -78,8 +77,14 @@ public void setValue(ELContext elContext, Object base, Object property, Object v
 			String beanName = property.toString();
 			BeanFactory bf = getBeanFactory(elContext);
 			if (bf.containsBean(beanName)) {
-				throw new PropertyNotWritableException(
-						"Variable '" + beanName + "' refers to a Spring bean which by definition is not writable");
+				if (value == bf.getBean(beanName)) {
+					// Setting the bean reference to the same value is alright - can simply be ignored...
+					elContext.setPropertyResolved(true);
+				}
+				else {
+					throw new PropertyNotWritableException(
+							"Variable '" + beanName + "' refers to a Spring bean which by definition is not writable");
+				}
 			}
 		}
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java
index f0fd4c5cac..53c1011b8c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedGenericBeanDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,15 +58,19 @@ public AnnotatedGenericBeanDefinition(Class<?> beanClass) {
 	 * allowing for ASM-based processing and avoidance of early loading of the bean class.
 	 * Note that this constructor is functionally equivalent to
 	 * {@link org.springframework.context.annotation.ScannedGenericBeanDefinition
-	 * ScannedGenericBeanDefinition}, however the semantics of the latter indicate that
-	 * a bean was discovered specifically via component-scanning as opposed to other
-	 * means.
+	 * ScannedGenericBeanDefinition}, however the semantics of the latter indicate that a
+	 * bean was discovered specifically via component-scanning as opposed to other means.
 	 * @param metadata the annotation metadata for the bean class in question
 	 * @since 3.1.1
 	 */
 	public AnnotatedGenericBeanDefinition(AnnotationMetadata metadata) {
 		Assert.notNull(metadata, "AnnotationMetadata must not be null");
-		setBeanClassName(metadata.getClassName());
+		if (metadata instanceof StandardAnnotationMetadata) {
+			setBeanClass(((StandardAnnotationMetadata) metadata).getIntrospectedClass());
+		}
+		else {
+			setBeanClassName(metadata.getClassName());
+		}
 		this.metadata = metadata;
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
index 6775dd78ed..0e6db6f36a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,6 +59,7 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link org.springframework.beans.factory.config.BeanPostProcessor} implementation
@@ -121,8 +122,8 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 	private final Map<Class<?>, Constructor<?>[]> candidateConstructorsCache =
 			new ConcurrentHashMap<Class<?>, Constructor<?>[]>(64);
 
-	private final Map<Class<?>, InjectionMetadata> injectionMetadataCache =
-			new ConcurrentHashMap<Class<?>, InjectionMetadata>(64);
+	private final Map<String, InjectionMetadata> injectionMetadataCache =
+			new ConcurrentHashMap<String, InjectionMetadata>(64);
 
 
 	/**
@@ -134,9 +135,9 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 	public AutowiredAnnotationBeanPostProcessor() {
 		this.autowiredAnnotationTypes.add(Autowired.class);
 		this.autowiredAnnotationTypes.add(Value.class);
-		ClassLoader cl = AutowiredAnnotationBeanPostProcessor.class.getClassLoader();
 		try {
-			this.autowiredAnnotationTypes.add((Class<? extends Annotation>) cl.loadClass("javax.inject.Inject"));
+			this.autowiredAnnotationTypes.add((Class<? extends Annotation>)
+					ClassUtils.forName("javax.inject.Inject", AutowiredAnnotationBeanPostProcessor.class.getClassLoader()));
 			logger.info("JSR-330 'javax.inject.Inject' annotation found and supported for autowiring");
 		}
 		catch (ClassNotFoundException ex) {
@@ -214,7 +215,7 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 
 	public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
 		if (beanType != null) {
-			InjectionMetadata metadata = findAutowiringMetadata(beanType);
+			InjectionMetadata metadata = findAutowiringMetadata(beanName, beanType, null);
 			metadata.checkConfigMembers(beanDefinition);
 		}
 	}
@@ -232,24 +233,25 @@ public Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, Strin
 					Constructor<?> requiredConstructor = null;
 					Constructor<?> defaultConstructor = null;
 					for (Constructor<?> candidate : rawCandidates) {
-						Annotation annotation = findAutowiredAnnotation(candidate);
-						if (annotation != null) {
+						Annotation ann = findAutowiredAnnotation(candidate);
+						if (ann != null) {
 							if (requiredConstructor != null) {
-								throw new BeanCreationException("Invalid autowire-marked constructor: " + candidate +
-										". Found another constructor with 'required' Autowired annotation: " +
+								throw new BeanCreationException(beanName,
+										"Invalid autowire-marked constructor: " + candidate +
+										". Found constructor with 'required' Autowired annotation already: " +
 										requiredConstructor);
 							}
 							if (candidate.getParameterTypes().length == 0) {
 								throw new IllegalStateException(
 										"Autowired annotation requires at least one argument: " + candidate);
 							}
-							boolean required = determineRequiredStatus(annotation);
+							boolean required = determineRequiredStatus(ann);
 							if (required) {
 								if (!candidates.isEmpty()) {
-									throw new BeanCreationException(
+									throw new BeanCreationException(beanName,
 											"Invalid autowire-marked constructors: " + candidates +
-											". Found another constructor with 'required' Autowired annotation: " +
-											requiredConstructor);
+											". Found constructor with 'required' Autowired annotation: " +
+											candidate);
 								}
 								requiredConstructor = candidate;
 							}
@@ -261,13 +263,21 @@ else if (candidate.getParameterTypes().length == 0) {
 					}
 					if (!candidates.isEmpty()) {
 						// Add default constructor to list of optional constructors, as fallback.
-						if (requiredConstructor == null && defaultConstructor != null) {
-							candidates.add(defaultConstructor);
+						if (requiredConstructor == null) {
+							if (defaultConstructor != null) {
+								candidates.add(defaultConstructor);
+							}
+							else if (candidates.size() == 1 && logger.isWarnEnabled()) {
+								logger.warn("Inconsistent constructor declaration on bean with name '" + beanName +
+										"': single autowire-marked constructor flagged as optional - this constructor " +
+										"is effectively required since there is no default constructor to fall back to: " +
+										candidates.get(0));
+							}
 						}
-						candidateConstructors = candidates.toArray(new Constructor[candidates.size()]);
+						candidateConstructors = candidates.toArray(new Constructor<?>[candidates.size()]);
 					}
 					else {
-						candidateConstructors = new Constructor[0];
+						candidateConstructors = new Constructor<?>[0];
 					}
 					this.candidateConstructorsCache.put(beanClass, candidateConstructors);
 				}
@@ -280,7 +290,7 @@ else if (candidate.getParameterTypes().length == 0) {
 	public PropertyValues postProcessPropertyValues(
 			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeansException {
 
-		InjectionMetadata metadata = findAutowiringMetadata(bean.getClass());
+		InjectionMetadata metadata = findAutowiringMetadata(beanName, bean.getClass(), pvs);
 		try {
 			metadata.inject(bean, beanName, pvs);
 		}
@@ -298,7 +308,7 @@ public PropertyValues postProcessPropertyValues(
 	 */
 	public void processInjection(Object bean) throws BeansException {
 		Class<?> clazz = bean.getClass();
-		InjectionMetadata metadata = findAutowiringMetadata(clazz);
+		InjectionMetadata metadata = findAutowiringMetadata(clazz.getName(), clazz, null);
 		try {
 			metadata.inject(bean, null, null);
 		}
@@ -308,15 +318,20 @@ public void processInjection(Object bean) throws BeansException {
 	}
 
 
-	private InjectionMetadata findAutowiringMetadata(Class<?> clazz) {
+	private InjectionMetadata findAutowiringMetadata(String beanName, Class<?> clazz, PropertyValues pvs) {
+		// Fall back to class name as cache key, for backwards compatibility with custom callers.
+		String cacheKey = (StringUtils.hasLength(beanName) ? beanName : clazz.getName());
 		// Quick check on the concurrent map first, with minimal locking.
-		InjectionMetadata metadata = this.injectionMetadataCache.get(clazz);
-		if (metadata == null) {
+		InjectionMetadata metadata = this.injectionMetadataCache.get(cacheKey);
+		if (InjectionMetadata.needsRefresh(metadata, clazz)) {
 			synchronized (this.injectionMetadataCache) {
-				metadata = this.injectionMetadataCache.get(clazz);
-				if (metadata == null) {
+				metadata = this.injectionMetadataCache.get(cacheKey);
+				if (InjectionMetadata.needsRefresh(metadata, clazz)) {
+					if (metadata != null) {
+						metadata.clear(pvs);
+					}
 					metadata = buildAutowiringMetadata(clazz);
-					this.injectionMetadataCache.put(clazz, metadata);
+					this.injectionMetadataCache.put(cacheKey, metadata);
 				}
 			}
 		}
@@ -330,23 +345,25 @@ private InjectionMetadata buildAutowiringMetadata(Class<?> clazz) {
 		do {
 			LinkedList<InjectionMetadata.InjectedElement> currElements = new LinkedList<InjectionMetadata.InjectedElement>();
 			for (Field field : targetClass.getDeclaredFields()) {
-				Annotation annotation = findAutowiredAnnotation(field);
-				if (annotation != null) {
+				Annotation ann = findAutowiredAnnotation(field);
+				if (ann != null) {
 					if (Modifier.isStatic(field.getModifiers())) {
 						if (logger.isWarnEnabled()) {
 							logger.warn("Autowired annotation is not supported on static fields: " + field);
 						}
 						continue;
 					}
-					boolean required = determineRequiredStatus(annotation);
+					boolean required = determineRequiredStatus(ann);
 					currElements.add(new AutowiredFieldElement(field, required));
 				}
 			}
 			for (Method method : targetClass.getDeclaredMethods()) {
+				Annotation ann = null;
 				Method bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
-				Annotation annotation = BridgeMethodResolver.isVisibilityBridgeMethodPair(method, bridgedMethod) ?
-						findAutowiredAnnotation(bridgedMethod) : findAutowiredAnnotation(method);
-				if (annotation != null && method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
+				if (BridgeMethodResolver.isVisibilityBridgeMethodPair(method, bridgedMethod)) {
+					ann = findAutowiredAnnotation(bridgedMethod);
+				}
+				if (ann != null && method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
 					if (Modifier.isStatic(method.getModifiers())) {
 						if (logger.isWarnEnabled()) {
 							logger.warn("Autowired annotation is not supported on static methods: " + method);
@@ -358,8 +375,8 @@ private InjectionMetadata buildAutowiringMetadata(Class<?> clazz) {
 							logger.warn("Autowired annotation should be used on methods with actual parameters: " + method);
 						}
 					}
-					boolean required = determineRequiredStatus(annotation);
-					PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);
+					boolean required = determineRequiredStatus(ann);
+					PropertyDescriptor pd = BeanUtils.findPropertyForMethod(bridgedMethod, clazz);
 					currElements.add(new AutowiredMethodElement(method, required, pd));
 				}
 			}
@@ -373,9 +390,9 @@ private InjectionMetadata buildAutowiringMetadata(Class<?> clazz) {
 
 	private Annotation findAutowiredAnnotation(AccessibleObject ao) {
 		for (Class<? extends Annotation> type : this.autowiredAnnotationTypes) {
-			Annotation annotation = AnnotationUtils.getAnnotation(ao, type);
-			if (annotation != null) {
-				return annotation;
+			Annotation ann = AnnotationUtils.getAnnotation(ao, type);
+			if (ann != null) {
+				return ann;
 			}
 		}
 		return null;
@@ -400,21 +417,21 @@ protected <T> Map<String, T> findAutowireCandidates(Class<T> type) throws BeansE
 	 * <p>A 'required' dependency means that autowiring should fail when no beans
 	 * are found. Otherwise, the autowiring process will simply bypass the field
 	 * or method when no beans are found.
-	 * @param annotation the Autowired annotation
+	 * @param ann the Autowired annotation
 	 * @return whether the annotation indicates that a dependency is required
 	 */
-	protected boolean determineRequiredStatus(Annotation annotation) {
+	protected boolean determineRequiredStatus(Annotation ann) {
 		try {
-			Method method = ReflectionUtils.findMethod(annotation.annotationType(), this.requiredParameterName);
+			Method method = ReflectionUtils.findMethod(ann.annotationType(), this.requiredParameterName);
 			if (method == null) {
-				// annotations like @Inject and @Value don't have a method (attribute) named "required"
+				// Annotations like @Inject and @Value don't have a method (attribute) named "required"
 				// -> default to required status
 				return true;
 			}
-			return (this.requiredParameterValue == (Boolean) ReflectionUtils.invokeMethod(method, annotation));
+			return (this.requiredParameterValue == (Boolean) ReflectionUtils.invokeMethod(method, ann));
 		}
 		catch (Exception ex) {
-			// an exception was thrown during reflective invocation of the required attribute
+			// An exception was thrown during reflective invocation of the required attribute
 			// -> default to required status
 			return true;
 		}
@@ -480,14 +497,14 @@ protected void inject(Object bean, String beanName, PropertyValues pvs) throws T
 					value = resolvedCachedArgument(beanName, this.cachedFieldValue);
 				}
 				else {
-					DependencyDescriptor descriptor = new DependencyDescriptor(field, this.required);
+					DependencyDescriptor desc = new DependencyDescriptor(field, this.required);
 					Set<String> autowiredBeanNames = new LinkedHashSet<String>(1);
 					TypeConverter typeConverter = beanFactory.getTypeConverter();
-					value = beanFactory.resolveDependency(descriptor, beanName, autowiredBeanNames, typeConverter);
+					value = beanFactory.resolveDependency(desc, beanName, autowiredBeanNames, typeConverter);
 					synchronized (this) {
 						if (!this.cached) {
 							if (value != null || this.required) {
-								this.cachedFieldValue = descriptor;
+								this.cachedFieldValue = desc;
 								registerDependentBeans(beanName, autowiredBeanNames);
 								if (autowiredBeanNames.size() == 1) {
 									String autowiredBeanName = autowiredBeanNames.iterator().next();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java
index 5b604fd263..eb691a14fd 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.beans.factory.annotation;
 
 import java.lang.reflect.Method;
-import java.util.Map;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryUtils;
@@ -34,6 +33,7 @@
  * Spring's {@link Qualifier @Qualifier} annotation.
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  * @since 3.1.2
  * @see BeanFactoryUtils
  */
@@ -76,23 +76,27 @@ else if (beanFactory.containsBean(qualifier)) {
 	 * @throws NoSuchBeanDefinitionException if no matching bean of type {@code T} found
 	 */
 	private static <T> T qualifiedBeanOfType(ConfigurableListableBeanFactory bf, Class<T> beanType, String qualifier) {
-		Map<String, T> candidateBeans = BeanFactoryUtils.beansOfTypeIncludingAncestors(bf, beanType);
-		T matchingBean = null;
-		for (String beanName : candidateBeans.keySet()) {
+		String[] candidateBeans = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(bf, beanType);
+		String matchingBean = null;
+		for (String beanName : candidateBeans) {
 			if (isQualifierMatch(qualifier, beanName, bf)) {
 				if (matchingBean != null) {
 					throw new NoSuchBeanDefinitionException(qualifier, "No unique " + beanType.getSimpleName() +
 							" bean found for qualifier '" + qualifier + "'");
 				}
-				matchingBean = candidateBeans.get(beanName);
+				matchingBean = beanName;
 			}
 		}
 		if (matchingBean != null) {
-			return matchingBean;
+			return bf.getBean(matchingBean, beanType);
+		}
+		else if (bf.containsBean(qualifier)) {
+			// Fallback: target bean at least found by bean name - probably a manually registered singleton.
+			return bf.getBean(qualifier, beanType);
 		}
 		else {
 			throw new NoSuchBeanDefinitionException(qualifier, "No matching " + beanType.getSimpleName() +
-					" bean found for qualifier '" + qualifier + "' - neither qualifier " + "match nor bean name match!");
+					" bean found for qualifier '" + qualifier + "' - neither qualifier match nor bean name match!");
 		}
 	}
 
@@ -128,7 +132,7 @@ private static boolean isQualifierMatch(String qualifier, String beanName, Confi
 				}
 			}
 			catch (NoSuchBeanDefinitionException ex) {
-				// ignore - can't compare qualifiers for a manually registered singleton object
+				// Ignore - can't compare qualifiers for a manually registered singleton object
 			}
 		}
 		return false;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
index fe3e3b15ef..9cb34e62ee 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,20 +46,21 @@
  */
 public class InjectionMetadata {
 
-	private final Log logger = LogFactory.getLog(InjectionMetadata.class);
+	private static final Log logger = LogFactory.getLog(InjectionMetadata.class);
 
-	private final Class targetClass;
+	private final Class<?> targetClass;
 
 	private final Collection<InjectedElement> injectedElements;
 
 	private volatile Set<InjectedElement> checkedElements;
 
 
-	public InjectionMetadata(Class targetClass, Collection<InjectedElement> elements) {
+	public InjectionMetadata(Class<?> targetClass, Collection<InjectedElement> elements) {
 		this.targetClass = targetClass;
 		this.injectedElements = elements;
 	}
 
+
 	public void checkConfigMembers(RootBeanDefinition beanDefinition) {
 		Set<InjectedElement> checkedElements = new LinkedHashSet<InjectedElement>(this.injectedElements.size());
 		for (InjectedElement element : this.injectedElements) {
@@ -82,13 +83,31 @@ public void inject(Object target, String beanName, PropertyValues pvs) throws Th
 			boolean debug = logger.isDebugEnabled();
 			for (InjectedElement element : elementsToIterate) {
 				if (debug) {
-					logger.debug("Processing injected method of bean '" + beanName + "': " + element);
+					logger.debug("Processing injected element of bean '" + beanName + "': " + element);
 				}
 				element.inject(target, beanName, pvs);
 			}
 		}
 	}
 
+	/**
+	 * @since 3.2.13
+	 */
+	public void clear(PropertyValues pvs) {
+		Collection<InjectedElement> elementsToIterate =
+				(this.checkedElements != null ? this.checkedElements : this.injectedElements);
+		if (!elementsToIterate.isEmpty()) {
+			for (InjectedElement element : elementsToIterate) {
+				element.clearPropertySkipping(pvs);
+			}
+		}
+	}
+
+
+	public static boolean needsRefresh(InjectionMetadata metadata, Class<?> clazz) {
+		return (metadata == null || !metadata.targetClass.equals(clazz));
+	}
+
 
 	public static abstract class InjectedElement {
 
@@ -110,7 +129,7 @@ public final Member getMember() {
 			return this.member;
 		}
 
-		protected final Class getResourceType() {
+		protected final Class<?> getResourceType() {
 			if (this.isField) {
 				return ((Field) this.member).getType();
 			}
@@ -122,16 +141,16 @@ else if (this.pd != null) {
 			}
 		}
 
-		protected final void checkResourceType(Class resourceType) {
+		protected final void checkResourceType(Class<?> resourceType) {
 			if (this.isField) {
-				Class fieldType = ((Field) this.member).getType();
+				Class<?> fieldType = ((Field) this.member).getType();
 				if (!(resourceType.isAssignableFrom(fieldType) || fieldType.isAssignableFrom(resourceType))) {
 					throw new IllegalStateException("Specified field type [" + fieldType +
 							"] is incompatible with resource type [" + resourceType.getName() + "]");
 				}
 			}
 			else {
-				Class paramType =
+				Class<?> paramType =
 						(this.pd != null ? this.pd.getPropertyType() : ((Method) this.member).getParameterTypes()[0]);
 				if (!(resourceType.isAssignableFrom(paramType) || paramType.isAssignableFrom(resourceType))) {
 					throw new IllegalStateException("Specified parameter type [" + paramType +
@@ -165,7 +184,7 @@ protected void inject(Object target, String requestingBeanName, PropertyValues p
 		}
 
 		/**
-		 * Checks whether this injector's property needs to be skipped due to
+		 * Check whether this injector's property needs to be skipped due to
 		 * an explicit property value having been specified. Also marks the
 		 * affected property as processed for other processors to ignore it.
 		 */
@@ -196,6 +215,20 @@ else if (pvs instanceof MutablePropertyValues) {
 			}
 		}
 
+		/**
+		 * @since 3.2.13
+		 */
+		protected void clearPropertySkipping(PropertyValues pvs) {
+			if (pvs == null) {
+				return;
+			}
+			synchronized (pvs) {
+				if (Boolean.FALSE.equals(this.skip) && this.pd != null && pvs instanceof MutablePropertyValues) {
+					((MutablePropertyValues) pvs).clearProcessedProperty(this.pd.getName());
+				}
+			}
+		}
+
 		/**
 		 * Either this or {@link #inject} needs to be overridden.
 		 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java
index 657ee22666..5645d40030 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,10 @@
 import org.springframework.beans.TypeConverter;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.support.AutowireCandidateQualifier;
 import org.springframework.beans.factory.support.AutowireCandidateResolver;
@@ -69,9 +72,9 @@ public class QualifierAnnotationAutowireCandidateResolver implements AutowireCan
 	@SuppressWarnings("unchecked")
 	public QualifierAnnotationAutowireCandidateResolver() {
 		this.qualifierTypes.add(Qualifier.class);
-		ClassLoader cl = QualifierAnnotationAutowireCandidateResolver.class.getClassLoader();
 		try {
-			this.qualifierTypes.add((Class<? extends Annotation>) cl.loadClass("javax.inject.Qualifier"));
+			this.qualifierTypes.add((Class<? extends Annotation>) ClassUtils.forName("javax.inject.Qualifier",
+							QualifierAnnotationAutowireCandidateResolver.class.getClassLoader()));
 		}
 		catch (ClassNotFoundException ex) {
 			// JSR-330 API not available - simply skip.
@@ -227,21 +230,31 @@ protected boolean checkQualifier(
 
 		Class<? extends Annotation> type = annotation.annotationType();
 		RootBeanDefinition bd = (RootBeanDefinition) bdHolder.getBeanDefinition();
+
 		AutowireCandidateQualifier qualifier = bd.getQualifier(type.getName());
 		if (qualifier == null) {
 			qualifier = bd.getQualifier(ClassUtils.getShortName(type));
 		}
 		if (qualifier == null) {
-			Annotation targetAnnotation = null;
-			if (bd.getResolvedFactoryMethod() != null) {
-				targetAnnotation = AnnotationUtils.getAnnotation(bd.getResolvedFactoryMethod(), type);
+			// First, check annotation on factory method, if applicable
+			Annotation targetAnnotation = getFactoryMethodAnnotation(bd, type);
+			if (targetAnnotation == null) {
+				RootBeanDefinition dbd = getResolvedDecoratedDefinition(bd);
+				if (dbd != null) {
+					targetAnnotation = getFactoryMethodAnnotation(dbd, type);
+				}
 			}
 			if (targetAnnotation == null) {
-				// look for matching annotation on the target class
+				// Look for matching annotation on the target class
 				if (this.beanFactory != null) {
-					Class<?> beanType = this.beanFactory.getType(bdHolder.getBeanName());
-					if (beanType != null) {
-						targetAnnotation = AnnotationUtils.getAnnotation(ClassUtils.getUserClass(beanType), type);
+					try {
+						Class<?> beanType = this.beanFactory.getType(bdHolder.getBeanName());
+						if (beanType != null) {
+							targetAnnotation = AnnotationUtils.getAnnotation(ClassUtils.getUserClass(beanType), type);
+						}
+					}
+					catch (NoSuchBeanDefinitionException ex) {
+						// Not the usual case - simply forget about the type check...
 					}
 				}
 				if (targetAnnotation == null && bd.hasBeanClass()) {
@@ -252,30 +265,31 @@ protected boolean checkQualifier(
 				return true;
 			}
 		}
+
 		Map<String, Object> attributes = AnnotationUtils.getAnnotationAttributes(annotation);
 		if (attributes.isEmpty() && qualifier == null) {
-			// if no attributes, the qualifier must be present
+			// If no attributes, the qualifier must be present
 			return false;
 		}
 		for (Map.Entry<String, Object> entry : attributes.entrySet()) {
 			String attributeName = entry.getKey();
 			Object expectedValue = entry.getValue();
 			Object actualValue = null;
-			// check qualifier first
+			// Check qualifier first
 			if (qualifier != null) {
 				actualValue = qualifier.getAttribute(attributeName);
 			}
 			if (actualValue == null) {
-				// fall back on bean definition attribute
+				// Fall back on bean definition attribute
 				actualValue = bd.getAttribute(attributeName);
 			}
 			if (actualValue == null && attributeName.equals(AutowireCandidateQualifier.VALUE_KEY) &&
 					expectedValue instanceof String && bdHolder.matchesName((String) expectedValue)) {
-				// fall back on bean name (or alias) match
+				// Fall back on bean name (or alias) match
 				continue;
 			}
 			if (actualValue == null && qualifier != null) {
-				// fall back on default, but only if the qualifier is present
+				// Fall back on default, but only if the qualifier is present
 				actualValue = AnnotationUtils.getDefaultValue(annotation, attributeName);
 			}
 			if (actualValue != null) {
@@ -288,6 +302,25 @@ protected boolean checkQualifier(
 		return true;
 	}
 
+	protected RootBeanDefinition getResolvedDecoratedDefinition(RootBeanDefinition rbd) {
+		BeanDefinitionHolder decDef = rbd.getDecoratedDefinition();
+		if (decDef != null && this.beanFactory instanceof ConfigurableListableBeanFactory) {
+			ConfigurableListableBeanFactory clbf = (ConfigurableListableBeanFactory) this.beanFactory;
+			if (clbf.containsBeanDefinition(decDef.getBeanName())) {
+				BeanDefinition dbd = clbf.getMergedBeanDefinition(decDef.getBeanName());
+				if (dbd instanceof RootBeanDefinition) {
+					return (RootBeanDefinition) dbd;
+				}
+			}
+		}
+		return null;
+	}
+
+	protected Annotation getFactoryMethodAnnotation(RootBeanDefinition bd, Class<? extends Annotation> type) {
+		Method resolvedFactoryMethod = bd.getResolvedFactoryMethod();
+		return (resolvedFactoryMethod != null ? AnnotationUtils.getAnnotation(resolvedFactoryMethod, type) : null);
+	}
+
 
 	/**
 	 * Determine whether the given dependency carries a value annotation.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java
index 5c1ad4b751..7cb1685fed 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -153,7 +153,7 @@ public final T getObject() throws Exception {
 	 */
 	@SuppressWarnings("unchecked")
 	private T getEarlySingletonInstance() throws Exception {
-		Class[] ifcs = getEarlySingletonInterfaces();
+		Class<?>[] ifcs = getEarlySingletonInterfaces();
 		if (ifcs == null) {
 			throw new FactoryBeanNotInitializedException(
 					getClass().getName() + " does not support circular references");
@@ -201,7 +201,7 @@ public void destroy() throws Exception {
 	 * <p>Invoked on initialization of this FactoryBean in case of
 	 * a singleton; else, on each {@link #getObject()} call.
 	 * @return the object returned by this factory
-	 * @throws Exception if an exception occured during object creation
+	 * @throws Exception if an exception occurred during object creation
 	 * @see #getObject()
 	 */
 	protected abstract T createInstance() throws Exception;
@@ -218,9 +218,9 @@ public void destroy() throws Exception {
 	 * or {@code null} to indicate a FactoryBeanNotInitializedException
 	 * @see org.springframework.beans.factory.FactoryBeanNotInitializedException
 	 */
-	protected Class[] getEarlySingletonInterfaces() {
-		Class type = getObjectType();
-		return (type != null && type.isInterface() ? new Class[] {type} : null);
+	protected Class<?>[] getEarlySingletonInterfaces() {
+		Class<?> type = getObjectType();
+		return (type != null && type.isInterface() ? new Class<?>[] {type} : null);
 	}
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java
index e71eb1a899..9cf2e3d5eb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -114,9 +114,9 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
 	 * <p>Performs full initialization of the bean, including all applicable
 	 * {@link BeanPostProcessor BeanPostProcessors}.
 	 * <p>Note: This is intended for creating a fresh instance, populating annotated
-	 * fields and methods as well as applying all standard bean initialiation callbacks.
+	 * fields and methods as well as applying all standard bean initialization callbacks.
 	 * It does <i>not</> imply traditional by-name or by-type autowiring of properties;
-	 * use {@link #createBean(Class, int, boolean)} for that purposes.
+	 * use {@link #createBean(Class, int, boolean)} for those purposes.
 	 * @param beanClass the class of the bean to create
 	 * @return the new bean instance
 	 * @throws BeansException if instantiation or wiring failed
@@ -129,7 +129,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
 	 * <p>Note: This is essentially intended for (re-)populating annotated fields and
 	 * methods, either for new instances or for deserialized instances. It does
 	 * <i>not</i> imply traditional by-name or by-type autowiring of properties;
-	 * use {@link #autowireBeanProperties} for that purposes.
+	 * use {@link #autowireBeanProperties} for those purposes.
 	 * @param existingBean the existing bean instance
 	 * @throws BeansException if wiring failed
 	 */
@@ -185,7 +185,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
 	 * @see #AUTOWIRE_BY_TYPE
 	 * @see #AUTOWIRE_CONSTRUCTOR
 	 */
-	Object createBean(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException;
+	Object createBean(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException;
 
 	/**
 	 * Instantiate a new bean instance of the given class with the specified autowire
@@ -213,7 +213,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
 	 * @see #applyBeanPostProcessorsBeforeInitialization
 	 * @see #applyBeanPostProcessorsAfterInitialization
 	 */
-	Object autowire(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException;
+	Object autowire(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException;
 
 	/**
 	 * Autowire the bean properties of the given bean instance by name or type.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
index 1e59e7d134..5bf2fffcdf 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,7 +146,7 @@ public boolean hasIndexedArgumentValue(int index) {
 	 * untyped values only)
 	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
-	public ValueHolder getIndexedArgumentValue(int index, Class requiredType) {
+	public ValueHolder getIndexedArgumentValue(int index, Class<?> requiredType) {
 		return getIndexedArgumentValue(index, requiredType, null);
 	}
 
@@ -159,7 +159,7 @@ public ValueHolder getIndexedArgumentValue(int index, Class requiredType) {
 	 * unnamed values only)
 	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
-	public ValueHolder getIndexedArgumentValue(int index, Class requiredType, String requiredName) {
+	public ValueHolder getIndexedArgumentValue(int index, Class<?> requiredType, String requiredName) {
 		Assert.isTrue(index >= 0, "Index must not be negative");
 		ValueHolder valueHolder = this.indexedArgumentValues.get(index);
 		if (valueHolder != null &&
@@ -247,7 +247,7 @@ private void addOrMergeGenericArgumentValue(ValueHolder newValue) {
 	 * @param requiredType the type to match
 	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
-	public ValueHolder getGenericArgumentValue(Class requiredType) {
+	public ValueHolder getGenericArgumentValue(Class<?> requiredType) {
 		return getGenericArgumentValue(requiredType, null, null);
 	}
 
@@ -257,7 +257,7 @@ public ValueHolder getGenericArgumentValue(Class requiredType) {
 	 * @param requiredName the name to match
 	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
-	public ValueHolder getGenericArgumentValue(Class requiredType, String requiredName) {
+	public ValueHolder getGenericArgumentValue(Class<?> requiredType, String requiredName) {
 		return getGenericArgumentValue(requiredType, requiredName, null);
 	}
 
@@ -273,7 +273,7 @@ public ValueHolder getGenericArgumentValue(Class requiredType, String requiredNa
 	 * in the current resolution process and should therefore not be returned again
 	 * @return the ValueHolder for the argument, or {@code null} if none found
 	 */
-	public ValueHolder getGenericArgumentValue(Class requiredType, String requiredName, Set<ValueHolder> usedValueHolders) {
+	public ValueHolder getGenericArgumentValue(Class<?> requiredType, String requiredName, Set<ValueHolder> usedValueHolders) {
 		for (ValueHolder valueHolder : this.genericArgumentValues) {
 			if (usedValueHolders != null && usedValueHolders.contains(valueHolder)) {
 				continue;
@@ -309,10 +309,10 @@ public List<ValueHolder> getGenericArgumentValues() {
 	 * Look for an argument value that either corresponds to the given index
 	 * in the constructor argument list or generically matches by type.
 	 * @param index the index in the constructor argument list
-	 * @param requiredType the type to match
+	 * @param requiredType the parameter type to match
 	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
-	public ValueHolder getArgumentValue(int index, Class requiredType) {
+	public ValueHolder getArgumentValue(int index, Class<?> requiredType) {
 		return getArgumentValue(index, requiredType, null, null);
 	}
 
@@ -320,11 +320,11 @@ public ValueHolder getArgumentValue(int index, Class requiredType) {
 	 * Look for an argument value that either corresponds to the given index
 	 * in the constructor argument list or generically matches by type.
 	 * @param index the index in the constructor argument list
-	 * @param requiredType the type to match
-	 * @param requiredName the name to match
+	 * @param requiredType the parameter type to match
+	 * @param requiredName the parameter name to match
 	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
-	public ValueHolder getArgumentValue(int index, Class requiredType, String requiredName) {
+	public ValueHolder getArgumentValue(int index, Class<?> requiredType, String requiredName) {
 		return getArgumentValue(index, requiredType, requiredName, null);
 	}
 
@@ -332,15 +332,17 @@ public ValueHolder getArgumentValue(int index, Class requiredType, String requir
 	 * Look for an argument value that either corresponds to the given index
 	 * in the constructor argument list or generically matches by type.
 	 * @param index the index in the constructor argument list
-	 * @param requiredType the type to match (can be {@code null} to find
-	 * an untyped argument value)
+	 * @param requiredType the parameter type to match (can be {@code null}
+	 * to find an untyped argument value)
+	 * @param requiredName the parameter name to match (can be {@code null}
+	 * to find an unnamed argument value)
 	 * @param usedValueHolders a Set of ValueHolder objects that have already
 	 * been used in the current resolution process and should therefore not
 	 * be returned again (allowing to return the next generic argument match
 	 * in case of multiple generic argument values of the same type)
 	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
-	public ValueHolder getArgumentValue(int index, Class requiredType, String requiredName, Set<ValueHolder> usedValueHolders) {
+	public ValueHolder getArgumentValue(int index, Class<?> requiredType, String requiredName, Set<ValueHolder> usedValueHolders) {
 		Assert.isTrue(index >= 0, "Index must not be negative");
 		ValueHolder valueHolder = getIndexedArgumentValue(index, requiredType, requiredName);
 		if (valueHolder == null) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
index 2693f8246c..35bdfd904b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class DependencyDescriptor implements Serializable {
 
 	private transient Field field;
 
-	private Class declaringClass;
+	private Class<?> declaringClass;
 
 	private String methodName;
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java
index 2f6bd6865a..43e9674a6f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -206,7 +206,7 @@ protected void doProcessProperties(ConfigurableListableBeanFactory beanFactoryTo
 					visitor.visitBeanDefinition(bd);
 				}
 				catch (Exception ex) {
-					throw new BeanDefinitionStoreException(bd.getResourceDescription(), curName, ex.getMessage());
+					throw new BeanDefinitionStoreException(bd.getResourceDescription(), curName, ex.getMessage(), ex);
 				}
 			}
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertiesFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertiesFactoryBean.java
index 9e0673ccfb..b39e0de0da 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertiesFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertiesFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -91,7 +91,7 @@ public Class<Properties> getObjectType() {
 	 * <p>Invoked on initialization of this FactoryBean in case of a
 	 * shared singleton; else, on each {@link #getObject()} call.
 	 * @return the object returned by this factory
-	 * @throws IOException if an exception occured during properties loading
+	 * @throws IOException if an exception occurred during properties loading
 	 * @see #mergeProperties()
 	 */
 	protected Properties createProperties() throws IOException {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java
index bf9474138f..b51694ffa5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 
 import org.springframework.beans.BeansException;
 import org.springframework.core.Constants;
+import org.springframework.core.SpringProperties;
+import org.springframework.core.env.AbstractEnvironment;
 import org.springframework.util.PropertyPlaceholderHelper;
 import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;
 import org.springframework.util.StringValueResolver;
@@ -82,7 +84,8 @@ public class PropertyPlaceholderConfigurer extends PlaceholderConfigurerSupport
 
 	private int systemPropertiesMode = SYSTEM_PROPERTIES_MODE_FALLBACK;
 
-	private boolean searchSystemEnvironment = true;
+	private boolean searchSystemEnvironment =
+			!SpringProperties.getFlag(AbstractEnvironment.IGNORE_GETENV_PROPERTY_NAME);
 
 
 	/**
@@ -216,8 +219,7 @@ protected void processProperties(ConfigurableListableBeanFactory beanFactoryToPr
 			throws BeansException {
 
 		StringValueResolver valueResolver = new PlaceholderResolvingStringValueResolver(props);
-
-		this.doProcessProperties(beanFactoryToProcess, valueResolver);
+		doProcessProperties(beanFactoryToProcess, valueResolver);
 	}
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java
index e4f27fec8b..40f7e3f24e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@ public TypedStringValue(String value) {
 	 * @param value the String value
 	 * @param targetType the type to convert to
 	 */
-	public TypedStringValue(String value, Class targetType) {
+	public TypedStringValue(String value, Class<?> targetType) {
 		setValue(value);
 		setTargetType(targetType);
 	}
@@ -101,7 +101,7 @@ public String getValue() {
 	 * for example in BeanFactoryPostProcessors.
 	 * @see PropertyPlaceholderConfigurer
 	 */
-	public void setTargetType(Class targetType) {
+	public void setTargetType(Class<?> targetType) {
 		Assert.notNull(targetType, "'targetType' must not be null");
 		this.targetType = targetType;
 	}
@@ -109,7 +109,7 @@ public void setTargetType(Class targetType) {
 	/**
 	 * Return the type to convert to.
 	 */
-	public Class getTargetType() {
+	public Class<?> getTargetType() {
 		Object targetTypeValue = this.targetType;
 		if (!(targetTypeValue instanceof Class)) {
 			throw new IllegalStateException("Typed String value does not carry a resolved target type");
@@ -153,11 +153,11 @@ public boolean hasTargetType() {
 	 * @return the resolved type to convert to
 	 * @throws ClassNotFoundException if the type cannot be resolved
 	 */
-	public Class resolveTargetType(ClassLoader classLoader) throws ClassNotFoundException {
+	public Class<?> resolveTargetType(ClassLoader classLoader) throws ClassNotFoundException {
 		if (this.targetType == null) {
 			return null;
 		}
-		Class resolvedClass = ClassUtils.forName(getTargetTypeName(), classLoader);
+		Class<?> resolvedClass = ClassUtils.forName(getTargetTypeName(), classLoader);
 		this.targetType = resolvedClass;
 		return resolvedClass;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
index 09faf0c3b2..651af574da 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
+import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessor;
 import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
@@ -135,21 +135,21 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	 * Dependency types to ignore on dependency check and autowire, as Set of
 	 * Class objects: for example, String. Default is none.
 	 */
-	private final Set<Class> ignoredDependencyTypes = new HashSet<Class>();
+	private final Set<Class<?>> ignoredDependencyTypes = new HashSet<Class<?>>();
 
 	/**
 	 * Dependency interfaces to ignore on dependency check and autowire, as Set of
 	 * Class objects. By default, only the BeanFactory interface is ignored.
 	 */
-	private final Set<Class> ignoredDependencyInterfaces = new HashSet<Class>();
+	private final Set<Class<?>> ignoredDependencyInterfaces = new HashSet<Class<?>>();
 
 	/** Cache of unfinished FactoryBean instances: FactoryBean name --> BeanWrapper */
 	private final Map<String, BeanWrapper> factoryBeanInstanceCache =
 			new ConcurrentHashMap<String, BeanWrapper>(16);
 
 	/** Cache of filtered PropertyDescriptors: bean Class -> PropertyDescriptor array */
-	private final Map<Class, PropertyDescriptor[]> filteredPropertyDescriptorsCache =
-			new ConcurrentHashMap<Class, PropertyDescriptor[]>(64);
+	private final Map<Class<?>, PropertyDescriptor[]> filteredPropertyDescriptorsCache =
+			new ConcurrentHashMap<Class<?>, PropertyDescriptor[]>(64);
 
 
 	/**
@@ -171,6 +171,7 @@ public AbstractAutowireCapableBeanFactory(BeanFactory parentBeanFactory) {
 		setParentBeanFactory(parentBeanFactory);
 	}
 
+
 	/**
 	 * Set the instantiation strategy to use for creating bean instances.
 	 * Default is CglibSubclassingInstantiationStrategy.
@@ -243,7 +244,7 @@ public void setAllowRawInjectionDespiteWrapping(boolean allowRawInjectionDespite
 	 * Ignore the given dependency type for autowiring:
 	 * for example, String. Default is none.
 	 */
-	public void ignoreDependencyType(Class type) {
+	public void ignoreDependencyType(Class<?> type) {
 		this.ignoredDependencyTypes.add(type);
 	}
 
@@ -257,11 +258,10 @@ public void ignoreDependencyType(Class type) {
 	 * @see org.springframework.beans.factory.BeanFactoryAware
 	 * @see org.springframework.context.ApplicationContextAware
 	 */
-	public void ignoreDependencyInterface(Class ifc) {
+	public void ignoreDependencyInterface(Class<?> ifc) {
 		this.ignoredDependencyInterfaces.add(ifc);
 	}
 
-
 	@Override
 	public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) {
 		super.copyConfigurationFrom(otherFactory);
@@ -285,7 +285,7 @@ public <T> T createBean(Class<T> beanClass) throws BeansException {
 		// Use prototype bean definition, to avoid registering bean as dependent bean.
 		RootBeanDefinition bd = new RootBeanDefinition(beanClass);
 		bd.setScope(SCOPE_PROTOTYPE);
-		bd.allowCaching = false;
+		bd.allowCaching = ClassUtils.isCacheSafe(beanClass, getBeanClassLoader());
 		return (T) createBean(beanClass.getName(), bd, null);
 	}
 
@@ -293,7 +293,7 @@ public void autowireBean(Object existingBean) {
 		// Use non-singleton bean definition, to avoid registering bean as dependent bean.
 		RootBeanDefinition bd = new RootBeanDefinition(ClassUtils.getUserClass(existingBean));
 		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
-		bd.allowCaching = false;
+		bd.allowCaching = ClassUtils.isCacheSafe(bd.getBeanClass(), getBeanClassLoader());
 		BeanWrapper bw = new BeanWrapperImpl(existingBean);
 		initBeanWrapper(bw);
 		populateBean(bd.getBeanClass().getName(), bd, bw);
@@ -305,14 +305,14 @@ public Object configureBean(Object existingBean, String beanName) throws BeansEx
 		RootBeanDefinition bd = null;
 		if (mbd instanceof RootBeanDefinition) {
 			RootBeanDefinition rbd = (RootBeanDefinition) mbd;
-			if (rbd.isPrototype()) {
-				bd = rbd;
-			}
+			bd = (rbd.isPrototype() ? rbd : rbd.cloneBeanDefinition());
 		}
-		if (bd == null) {
-			bd = new RootBeanDefinition(mbd);
+		if (!mbd.isPrototype()) {
+			if (bd == null) {
+				bd = new RootBeanDefinition(mbd);
+			}
 			bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
-			bd.allowCaching = false;
+			bd.allowCaching = ClassUtils.isCacheSafe(ClassUtils.getUserClass(existingBean), getBeanClassLoader());
 		}
 		BeanWrapper bw = new BeanWrapperImpl(existingBean);
 		initBeanWrapper(bw);
@@ -329,14 +329,14 @@ public Object resolveDependency(DependencyDescriptor descriptor, String beanName
 	// Specialized methods for fine-grained control over the bean lifecycle
 	//-------------------------------------------------------------------------
 
-	public Object createBean(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
+	public Object createBean(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
 		// Use non-singleton bean definition, to avoid registering bean as dependent bean.
 		RootBeanDefinition bd = new RootBeanDefinition(beanClass, autowireMode, dependencyCheck);
 		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
 		return createBean(beanClass.getName(), bd, null);
 	}
 
-	public Object autowire(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
+	public Object autowire(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
 		// Use non-singleton bean definition, to avoid registering bean as dependent bean.
 		final RootBeanDefinition bd = new RootBeanDefinition(beanClass, autowireMode, dependencyCheck);
 		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
@@ -346,10 +346,8 @@ public Object autowire(Class beanClass, int autowireMode, boolean dependencyChec
 		else {
 			Object bean;
 			final BeanFactory parent = this;
-
 			if (System.getSecurityManager() != null) {
 				bean = AccessController.doPrivileged(new PrivilegedAction<Object>() {
-
 					public Object run() {
 						return getInstantiationStrategy().instantiate(bd, null, parent);
 					}
@@ -358,7 +356,6 @@ public Object run() {
 			else {
 				bean = getInstantiationStrategy().instantiate(bd, null, parent);
 			}
-
 			populateBean(beanClass.getName(), bd, new BeanWrapperImpl(bean));
 			return bean;
 		}
@@ -428,9 +425,7 @@ public Object applyBeanPostProcessorsAfterInitialization(Object existingBean, St
 	 * @see #doCreateBean
 	 */
 	@Override
-	protected Object createBean(final String beanName, final RootBeanDefinition mbd, final Object[] args)
-			throws BeanCreationException {
-
+	protected Object createBean(String beanName, RootBeanDefinition mbd, Object[] args) throws BeanCreationException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Creating instance of bean '" + beanName + "'");
 		}
@@ -490,7 +485,7 @@ protected Object doCreateBean(final String beanName, final RootBeanDefinition mb
 			instanceWrapper = createBeanInstance(beanName, mbd, args);
 		}
 		final Object bean = (instanceWrapper != null ? instanceWrapper.getWrappedInstance() : null);
-		Class beanType = (instanceWrapper != null ? instanceWrapper.getWrappedClass() : null);
+		Class<?> beanType = (instanceWrapper != null ? instanceWrapper.getWrappedClass() : null);
 
 		// Allow post-processors to modify the merged bean definition.
 		synchronized (mbd.postProcessingLock) {
@@ -509,7 +504,7 @@ protected Object doCreateBean(final String beanName, final RootBeanDefinition mb
 				logger.debug("Eagerly caching bean '" + beanName +
 						"' to allow for resolving potential circular references");
 			}
-			addSingletonFactory(beanName, new ObjectFactory() {
+			addSingletonFactory(beanName, new ObjectFactory<Object>() {
 				public Object getObject() throws BeansException {
 					return getEarlyBeanReference(beanName, mbd, bean);
 				}
@@ -572,7 +567,7 @@ else if (!this.allowRawInjectionDespiteWrapping && hasDependentBean(beanName)) {
 	}
 
 	@Override
-	protected Class<?> predictBeanType(String beanName, RootBeanDefinition mbd, Class... typesToMatch) {
+	protected Class<?> predictBeanType(String beanName, RootBeanDefinition mbd, Class<?>... typesToMatch) {
 		Class<?> targetType = mbd.getTargetType();
 		if (targetType == null) {
 			targetType = (mbd.getFactoryMethodName() != null ? getTypeForFactoryMethod(beanName, mbd, typesToMatch) :
@@ -587,7 +582,7 @@ protected Class<?> predictBeanType(String beanName, RootBeanDefinition mbd, Clas
 			for (BeanPostProcessor bp : getBeanPostProcessors()) {
 				if (bp instanceof SmartInstantiationAwareBeanPostProcessor) {
 					SmartInstantiationAwareBeanPostProcessor ibp = (SmartInstantiationAwareBeanPostProcessor) bp;
-					Class predicted = ibp.predictBeanType(targetType, beanName);
+					Class<?> predicted = ibp.predictBeanType(targetType, beanName);
 					if (predicted != null && (typesToMatch.length != 1 || !FactoryBean.class.equals(typesToMatch[0]) ||
 							FactoryBean.class.isAssignableFrom(predicted))) {
 						return predicted;
@@ -599,7 +594,7 @@ protected Class<?> predictBeanType(String beanName, RootBeanDefinition mbd, Clas
 	}
 
 	/**
-	 * Determine the bean type for the given bean definition which is based on
+	 * Determine the target type for the given bean definition which is based on
 	 * a factory method. Only called if there is no singleton instance registered
 	 * for the target bean already.
 	 * <p>This implementation determines the type matching {@link #createBean}'s
@@ -609,7 +604,7 @@ protected Class<?> predictBeanType(String beanName, RootBeanDefinition mbd, Clas
 	 * @param mbd the merged bean definition for the bean
 	 * @param typesToMatch the types to match in case of internal type matching purposes
 	 * (also signals that the returned {@code Class} will never be exposed to application code)
-	 * @return the type for the bean if determinable, or {@code null} else
+	 * @return the type for the bean if determinable, or {@code null} otherwise
 	 * @see #createBean
 	 */
 	protected Class<?> getTypeForFactoryMethod(String beanName, RootBeanDefinition mbd, Class[] typesToMatch) {
@@ -635,31 +630,61 @@ protected Class<?> getTypeForFactoryMethod(String beanName, RootBeanDefinition m
 			return null;
 		}
 
-		List<ValueHolder> argumentValues = mbd.getConstructorArgumentValues().getGenericArgumentValues();
-		Object[] args = new Object[argumentValues.size()];
-		for (int i = 0; i < args.length; i++) {
-			args[i] = argumentValues.get(i).getValue();
-		}
-
 		// If all factory methods have the same return type, return that type.
 		// Can't clearly figure out exact method due to type converting / autowiring!
+		Class<?> commonType = null;
 		int minNrOfArgs = mbd.getConstructorArgumentValues().getArgumentCount();
 		Method[] candidates = ReflectionUtils.getUniqueDeclaredMethods(factoryClass);
-		Set<Class<?>> returnTypes = new HashSet<Class<?>>(1);
 		for (Method factoryMethod : candidates) {
 			if (Modifier.isStatic(factoryMethod.getModifiers()) == isStatic &&
 					factoryMethod.getName().equals(mbd.getFactoryMethodName()) &&
 					factoryMethod.getParameterTypes().length >= minNrOfArgs) {
-				Class<?> returnType = GenericTypeResolver.resolveReturnTypeForGenericMethod(factoryMethod, args);
-				if (returnType != null) {
-					returnTypes.add(returnType);
+				// No declared type variables to inspect, so just process the standard return type.
+				if (factoryMethod.getTypeParameters().length > 0) {
+					try {
+						// Fully resolve parameter names and argument values.
+						Class<?>[] paramTypes = factoryMethod.getParameterTypes();
+						String[] paramNames = null;
+						ParameterNameDiscoverer pnd = getParameterNameDiscoverer();
+						if (pnd != null) {
+							paramNames = pnd.getParameterNames(factoryMethod);
+						}
+						ConstructorArgumentValues cav = mbd.getConstructorArgumentValues();
+						Set<ConstructorArgumentValues.ValueHolder> usedValueHolders =
+								new HashSet<ConstructorArgumentValues.ValueHolder>(paramTypes.length);
+						Object[] args = new Object[paramTypes.length];
+						for (int i = 0; i < args.length; i++) {
+							ConstructorArgumentValues.ValueHolder valueHolder = cav.getArgumentValue(
+									i, paramTypes[i], (paramNames != null ? paramNames[i] : null), usedValueHolders);
+							if (valueHolder == null) {
+								valueHolder = cav.getGenericArgumentValue(null, null, usedValueHolders);
+							}
+							if (valueHolder != null) {
+								args[i] = valueHolder.getValue();
+								usedValueHolders.add(valueHolder);
+							}
+						}
+						Class<?> returnType = AutowireUtils.resolveReturnTypeForFactoryMethod(
+								factoryMethod, args, getBeanClassLoader());
+						if (returnType != null) {
+							commonType = ClassUtils.determineCommonAncestor(returnType, commonType);
+						}
+					}
+					catch (Throwable ex) {
+						if (logger.isDebugEnabled()) {
+							logger.debug("Failed to resolve generic return type for factory method: " + ex);
+						}
+					}
+				}
+				else {
+					commonType = ClassUtils.determineCommonAncestor(factoryMethod.getReturnType(), commonType);
 				}
 			}
 		}
 
-		if (returnTypes.size() == 1) {
+		if (commonType != null) {
 			// Clear return type found: all factory methods return same type.
-			return returnTypes.iterator().next();
+			return commonType;
 		}
 		else {
 			// Ambiguous return types found: return null to indicate "not determinable".
@@ -684,26 +709,24 @@ class Holder { Class<?> value = null; }
 		final Holder objectType = new Holder();
 		String factoryBeanName = mbd.getFactoryBeanName();
 		final String factoryMethodName = mbd.getFactoryMethodName();
+
 		if (factoryBeanName != null && factoryMethodName != null) {
 			// Try to obtain the FactoryBean's object type without instantiating it at all.
 			BeanDefinition fbDef = getBeanDefinition(factoryBeanName);
 			if (fbDef instanceof AbstractBeanDefinition && ((AbstractBeanDefinition) fbDef).hasBeanClass()) {
-				Class<?> fbClass = ((AbstractBeanDefinition) fbDef).getBeanClass();
-				if (ClassUtils.isCglibProxyClass(fbClass)) {
-					// CGLIB subclass methods hide generic parameters. look at the superclass.
-					fbClass = fbClass.getSuperclass();
-				}
+				// CGLIB subclass methods hide generic parameters; look at the original user class.
+				Class<?> fbClass = ClassUtils.getUserClass(((AbstractBeanDefinition) fbDef).getBeanClass());
 				// Find the given factory method, taking into account that in the case of
 				// @Bean methods, there may be parameters present.
 				ReflectionUtils.doWithMethods(fbClass,
-					new ReflectionUtils.MethodCallback() {
-						public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
-							if (method.getName().equals(factoryMethodName) &&
-									FactoryBean.class.isAssignableFrom(method.getReturnType())) {
-								objectType.value = GenericTypeResolver.resolveReturnTypeArgument(method, FactoryBean.class);
+						new ReflectionUtils.MethodCallback() {
+							public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
+								if (method.getName().equals(factoryMethodName) &&
+										FactoryBean.class.isAssignableFrom(method.getReturnType())) {
+									objectType.value = GenericTypeResolver.resolveReturnTypeArgument(method, FactoryBean.class);
+								}
 							}
-						}
-					});
+						});
 				if (objectType.value != null) {
 					return objectType.value;
 				}
@@ -720,10 +743,14 @@ public void doWith(Method method) throws IllegalArgumentException, IllegalAccess
 			if (objectType.value != null) {
 				return objectType.value;
 			}
+			else {
+				// No type found for shortcut FactoryBean instance:
+				// fall back to full creation of the FactoryBean instance.
+				return super.getTypeForFactoryBean(beanName, mbd);
+			}
 		}
 
-		// No type found - fall back to full creation of the FactoryBean instance.
-		return super.getTypeForFactoryBean(beanName, mbd);
+		return null;
 	}
 
 	/**
@@ -742,7 +769,7 @@ protected Object getEarlyBeanReference(String beanName, RootBeanDefinition mbd,
 					SmartInstantiationAwareBeanPostProcessor ibp = (SmartInstantiationAwareBeanPostProcessor) bp;
 					exposedObject = ibp.getEarlyBeanReference(exposedObject, beanName);
 					if (exposedObject == null) {
-						return exposedObject;
+						return null;
 					}
 				}
 			}
@@ -757,20 +784,20 @@ protected Object getEarlyBeanReference(String beanName, RootBeanDefinition mbd,
 
 	/**
 	 * Obtain a "shortcut" singleton FactoryBean instance to use for a
-	 * {@code getObjectType()} call, without full initialization
-	 * of the FactoryBean.
+	 * {@code getObjectType()} call, without full initialization of the FactoryBean.
 	 * @param beanName the name of the bean
 	 * @param mbd the bean definition for the bean
 	 * @return the FactoryBean instance, or {@code null} to indicate
 	 * that we couldn't obtain a shortcut FactoryBean instance
 	 */
-	private FactoryBean getSingletonFactoryBeanForTypeCheck(String beanName, RootBeanDefinition mbd) {
+	private FactoryBean<?> getSingletonFactoryBeanForTypeCheck(String beanName, RootBeanDefinition mbd) {
 		synchronized (getSingletonMutex()) {
 			BeanWrapper bw = this.factoryBeanInstanceCache.get(beanName);
 			if (bw != null) {
-				return (FactoryBean) bw.getWrappedInstance();
+				return (FactoryBean<?>) bw.getWrappedInstance();
 			}
-			if (isSingletonCurrentlyInCreation(beanName)) {
+			if (isSingletonCurrentlyInCreation(beanName) ||
+					(mbd.getFactoryBeanName() != null && isSingletonCurrentlyInCreation(mbd.getFactoryBeanName()))) {
 				return null;
 			}
 			Object instance = null;
@@ -788,7 +815,7 @@ private FactoryBean getSingletonFactoryBeanForTypeCheck(String beanName, RootBea
 				// Finished partial creation of this bean.
 				afterSingletonCreation(beanName);
 			}
-			FactoryBean fb = getFactoryBean(beanName, instance);
+			FactoryBean<?> fb = getFactoryBean(beanName, instance);
 			if (bw != null) {
 				this.factoryBeanInstanceCache.put(beanName, bw);
 			}
@@ -798,14 +825,13 @@ private FactoryBean getSingletonFactoryBeanForTypeCheck(String beanName, RootBea
 
 	/**
 	 * Obtain a "shortcut" non-singleton FactoryBean instance to use for a
-	 * {@code getObjectType()} call, without full initialization
-	 * of the FactoryBean.
+	 * {@code getObjectType()} call, without full initialization of the FactoryBean.
 	 * @param beanName the name of the bean
 	 * @param mbd the bean definition for the bean
 	 * @return the FactoryBean instance, or {@code null} to indicate
 	 * that we couldn't obtain a shortcut FactoryBean instance
 	 */
-	private FactoryBean getNonSingletonFactoryBeanForTypeCheck(String beanName, RootBeanDefinition mbd) {
+	private FactoryBean<?> getNonSingletonFactoryBeanForTypeCheck(String beanName, RootBeanDefinition mbd) {
 		if (isPrototypeCurrentlyInCreation(beanName)) {
 			return null;
 		}
@@ -836,7 +862,7 @@ private FactoryBean getNonSingletonFactoryBeanForTypeCheck(String beanName, Root
 	 * @throws BeansException if any post-processing failed
 	 * @see MergedBeanDefinitionPostProcessor#postProcessMergedBeanDefinition
 	 */
-	protected void applyMergedBeanDefinitionPostProcessors(RootBeanDefinition mbd, Class beanType, String beanName)
+	protected void applyMergedBeanDefinitionPostProcessors(RootBeanDefinition mbd, Class<?> beanType, String beanName)
 			throws BeansException {
 
 		try {
@@ -887,7 +913,7 @@ protected Object resolveBeforeInstantiation(String beanName, RootBeanDefinition
 	 * @throws BeansException if any post-processing failed
 	 * @see InstantiationAwareBeanPostProcessor#postProcessBeforeInstantiation
 	 */
-	protected Object applyBeanPostProcessorsBeforeInstantiation(Class beanClass, String beanName)
+	protected Object applyBeanPostProcessorsBeforeInstantiation(Class<?> beanClass, String beanName)
 			throws BeansException {
 
 		for (BeanPostProcessor bp : getBeanPostProcessors()) {
@@ -916,7 +942,7 @@ protected Object applyBeanPostProcessorsBeforeInstantiation(Class beanClass, Str
 	 */
 	protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd, Object[] args) {
 		// Make sure bean class is actually resolved at this point.
-		Class beanClass = resolveBeanClass(mbd, beanName);
+		Class<?> beanClass = resolveBeanClass(mbd, beanName);
 
 		if (beanClass != null && !Modifier.isPublic(beanClass.getModifiers()) && !mbd.isNonPublicAccessAllowed()) {
 			throw new BeanCreationException(mbd.getResourceDescription(), beanName,
@@ -948,7 +974,7 @@ protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd
 		}
 
 		// Need to determine the constructor...
-		Constructor[] ctors = determineConstructorsFromBeanPostProcessors(beanClass, beanName);
+		Constructor<?>[] ctors = determineConstructorsFromBeanPostProcessors(beanClass, beanName);
 		if (ctors != null ||
 				mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_CONSTRUCTOR ||
 				mbd.hasConstructorArgumentValues() || !ObjectUtils.isEmpty(args))  {
@@ -968,14 +994,14 @@ protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd
 	 * @throws org.springframework.beans.BeansException in case of errors
 	 * @see org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor#determineCandidateConstructors
 	 */
-	protected Constructor[] determineConstructorsFromBeanPostProcessors(Class beanClass, String beanName)
+	protected Constructor<?>[] determineConstructorsFromBeanPostProcessors(Class<?> beanClass, String beanName)
 			throws BeansException {
 
 		if (beanClass != null && hasInstantiationAwareBeanPostProcessors()) {
 			for (BeanPostProcessor bp : getBeanPostProcessors()) {
 				if (bp instanceof SmartInstantiationAwareBeanPostProcessor) {
 					SmartInstantiationAwareBeanPostProcessor ibp = (SmartInstantiationAwareBeanPostProcessor) bp;
-					Constructor[] ctors = ibp.determineCandidateConstructors(beanClass, beanName);
+					Constructor<?>[] ctors = ibp.determineCandidateConstructors(beanClass, beanName);
 					if (ctors != null) {
 						return ctors;
 					}
@@ -1046,7 +1072,7 @@ protected BeanWrapper instantiateUsingFactoryMethod(
 	 * @return BeanWrapper for the new instance
 	 */
 	protected BeanWrapper autowireConstructor(
-			String beanName, RootBeanDefinition mbd, Constructor[] ctors, Object[] explicitArgs) {
+			String beanName, RootBeanDefinition mbd, Constructor<?>[] ctors, Object[] explicitArgs) {
 
 		return new ConstructorResolver(this).autowireConstructor(beanName, mbd, ctors, explicitArgs);
 	}
@@ -1349,7 +1375,7 @@ protected void applyPropertyValues(String beanName, BeanDefinition mbd, BeanWrap
 		MutablePropertyValues mpvs = null;
 		List<PropertyValue> original;
 
-		if (System.getSecurityManager()!= null) {
+		if (System.getSecurityManager() != null) {
 			if (bw instanceof BeanWrapperImpl) {
 				((BeanWrapperImpl) bw).setSecurityContext(getAccessControlContext());
 			}
@@ -1642,7 +1668,7 @@ protected void removeSingleton(String beanName) {
 
 
 	/**
-	 * Special DependencyDescriptor variant for autowire="byType".
+	 * Special DependencyDescriptor variant for Spring's good old autowire="byType" mode.
 	 * Always optional; never considering the parameter name for choosing a primary candidate.
 	 */
 	@SuppressWarnings("serial")
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
index f93ea1b408..5094ad71dd 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,8 +38,8 @@
 /**
  * Base class for concrete, full-fledged
  * {@link org.springframework.beans.factory.config.BeanDefinition} classes,
- * factoring out common properties of {@link RootBeanDefinition} and
- * {@link ChildBeanDefinition}.
+ * factoring out common properties of {@link GenericBeanDefinition},
+ * {@link RootBeanDefinition} and {@link ChildBeanDefinition}.
  *
  * <p>The autowire constants match the ones defined in the
  * {@link org.springframework.beans.factory.config.AutowireCapableBeanFactory}
@@ -123,11 +123,14 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	public static final int DEPENDENCY_CHECK_ALL = 3;
 
 	/**
-	 * Constant that indicates the container should attempt to infer the {@link
-	 * #setDestroyMethodName destroy method name} for a bean as opposed to explicit
-	 * specification of a method name. The value {@value} is specifically designed to
-	 * include characters otherwise illegal in a method name, ensuring no possibility of
-	 * collisions with legitimately named methods having the same name.
+	 * Constant that indicates the container should attempt to infer the
+	 * {@link #setDestroyMethodName destroy method name} for a bean as opposed to
+	 * explicit specification of a method name. The value {@value} is specifically
+	 * designed to include characters otherwise illegal in a method name, ensuring
+	 * no possibility of collisions with legitimately named methods having the same
+	 * name.
+	 * <p>Currently, the method names detected during destroy method inference
+	 * are "close" and "shutdown", if present on the specific bean class.
 	 */
 	public static final String INFER_METHOD = "(inferred)";
 
@@ -383,7 +386,7 @@ public Class<?> getBeanClass() throws IllegalStateException {
 			throw new IllegalStateException(
 					"Bean class name [" + beanClassObject + "] has not been resolved into an actual Class");
 		}
-		return (Class) beanClassObject;
+		return (Class<?>) beanClassObject;
 	}
 
 	public void setBeanClassName(String beanClassName) {
@@ -393,7 +396,7 @@ public void setBeanClassName(String beanClassName) {
 	public String getBeanClassName() {
 		Object beanClassObject = this.beanClass;
 		if (beanClassObject instanceof Class) {
-			return ((Class) beanClassObject).getName();
+			return ((Class<?>) beanClassObject).getName();
 		}
 		else {
 			return (String) beanClassObject;
@@ -408,12 +411,12 @@ public String getBeanClassName() {
 	 * @return the resolved bean class
 	 * @throws ClassNotFoundException if the class name could be resolved
 	 */
-	public Class resolveBeanClass(ClassLoader classLoader) throws ClassNotFoundException {
+	public Class<?> resolveBeanClass(ClassLoader classLoader) throws ClassNotFoundException {
 		String className = getBeanClassName();
 		if (className == null) {
 			return null;
 		}
-		Class resolvedClass = ClassUtils.forName(className, classLoader);
+		Class<?> resolvedClass = ClassUtils.forName(className, classLoader);
 		this.beanClass = resolvedClass;
 		return resolvedClass;
 	}
@@ -551,8 +554,8 @@ public int getResolvedAutowireMode() {
 			// Work out whether to apply setter autowiring or constructor autowiring.
 			// If it has a no-arg constructor it's deemed to be setter autowiring,
 			// otherwise we'll try constructor autowiring.
-			Constructor[] constructors = getBeanClass().getConstructors();
-			for (Constructor constructor : constructors) {
+			Constructor<?>[] constructors = getBeanClass().getConstructors();
+			for (Constructor<?> constructor : constructors) {
 				if (constructor.getParameterTypes().length == 0) {
 					return AUTOWIRE_BY_TYPE;
 				}
@@ -677,7 +680,8 @@ public void copyQualifiersFrom(AbstractBeanDefinition source) {
 
 	/**
 	 * Specify whether to allow access to non-public constructors and methods,
-	 * for the case of externalized metadata pointing to those.
+	 * for the case of externalized metadata pointing to those. The default is
+	 * {@code true}; switch this to {@code false} for public access only.
 	 * <p>This applies to constructor resolution, factory method resolution,
 	 * and also init/destroy methods. Bean property accessors have to be public
 	 * in any case and are not affected by this setting.
@@ -699,7 +703,7 @@ public boolean isNonPublicAccessAllowed() {
 	/**
 	 * Specify whether to resolve constructors in lenient mode ({@code true},
 	 * which is the default) or to switch to strict resolution (throwing an exception
-	 * in case of ambigious constructors that all match when converting the arguments,
+	 * in case of ambiguous constructors that all match when converting the arguments,
 	 * whereas lenient mode would use the one with the 'closest' type matches).
 	 */
 	public void setLenientConstructorResolution(boolean lenientConstructorResolution) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
index b07e211d16..32db844c25 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
 
 	private ClassLoader beanClassLoader;
 
-	private Environment environment = new StandardEnvironment();
+	private Environment environment;
 
 	private BeanNameGenerator beanNameGenerator = new DefaultBeanNameGenerator();
 
@@ -90,7 +90,7 @@ protected AbstractBeanDefinitionReader(BeanDefinitionRegistry registry) {
 
 		// Inherit Environment if possible
 		if (this.registry instanceof EnvironmentCapable) {
-			this.environment = ((EnvironmentCapable)this.registry).getEnvironment();
+			this.environment = ((EnvironmentCapable) this.registry).getEnvironment();
 		}
 		else {
 			this.environment = new StandardEnvironment();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
index 9e97ba2faf..779263092d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -123,7 +123,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	/** Resolution strategy for expressions in bean definition values */
 	private BeanExpressionResolver beanExpressionResolver;
 
-	/** Spring 3.0 ConversionService to use instead of PropertyEditors */
+	/** Spring ConversionService to use instead of PropertyEditors */
 	private ConversionService conversionService;
 
 	/** Custom PropertyEditorRegistrars to apply to the beans of this factory */
@@ -159,10 +159,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	private final Map<String, RootBeanDefinition> mergedBeanDefinitions =
 			new ConcurrentHashMap<String, RootBeanDefinition>(64);
 
-	/**
-	 * Names of beans that have already been created at least once
-	 * (using a ConcurrentHashMap as a Set)
-	 */
+	/** Names of beans that have already been created at least once */
 	private final Map<String, Boolean> alreadyCreated = new ConcurrentHashMap<String, Boolean>(64);
 
 	/** Names of beans that are currently in creation */
@@ -275,77 +272,83 @@ protected <T> T doGetBean(
 				markBeanAsCreated(beanName);
 			}
 
-			final RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName);
-			checkMergedBeanDefinition(mbd, beanName, args);
-
-			// Guarantee initialization of beans that the current bean depends on.
-			String[] dependsOn = mbd.getDependsOn();
-			if (dependsOn != null) {
-				for (String dependsOnBean : dependsOn) {
-					getBean(dependsOnBean);
-					registerDependentBean(dependsOnBean, beanName);
-				}
-			}
-
-			// Create bean instance.
-			if (mbd.isSingleton()) {
-				sharedInstance = getSingleton(beanName, new ObjectFactory<Object>() {
-					public Object getObject() throws BeansException {
-						try {
-							return createBean(beanName, mbd, args);
-						}
-						catch (BeansException ex) {
-							// Explicitly remove instance from singleton cache: It might have been put there
-							// eagerly by the creation process, to allow for circular reference resolution.
-							// Also remove any beans that received a temporary reference to the bean.
-							destroySingleton(beanName);
-							throw ex;
-						}
+			try {
+				final RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName);
+				checkMergedBeanDefinition(mbd, beanName, args);
+
+				// Guarantee initialization of beans that the current bean depends on.
+				String[] dependsOn = mbd.getDependsOn();
+				if (dependsOn != null) {
+					for (String dependsOnBean : dependsOn) {
+						getBean(dependsOnBean);
+						registerDependentBean(dependsOnBean, beanName);
 					}
-				});
-				bean = getObjectForBeanInstance(sharedInstance, name, beanName, mbd);
-			}
-
-			else if (mbd.isPrototype()) {
-				// It's a prototype -> create a new instance.
-				Object prototypeInstance = null;
-				try {
-					beforePrototypeCreation(beanName);
-					prototypeInstance = createBean(beanName, mbd, args);
-				}
-				finally {
-					afterPrototypeCreation(beanName);
 				}
-				bean = getObjectForBeanInstance(prototypeInstance, name, beanName, mbd);
-			}
 
-			else {
-				String scopeName = mbd.getScope();
-				final Scope scope = this.scopes.get(scopeName);
-				if (scope == null) {
-					throw new IllegalStateException("No Scope registered for scope '" + scopeName + "'");
-				}
-				try {
-					Object scopedInstance = scope.get(beanName, new ObjectFactory<Object>() {
+				// Create bean instance.
+				if (mbd.isSingleton()) {
+					sharedInstance = getSingleton(beanName, new ObjectFactory<Object>() {
 						public Object getObject() throws BeansException {
-							beforePrototypeCreation(beanName);
 							try {
 								return createBean(beanName, mbd, args);
 							}
-							finally {
-								afterPrototypeCreation(beanName);
+							catch (BeansException ex) {
+								// Explicitly remove instance from singleton cache: It might have been put there
+								// eagerly by the creation process, to allow for circular reference resolution.
+								// Also remove any beans that received a temporary reference to the bean.
+								destroySingleton(beanName);
+								throw ex;
 							}
 						}
 					});
-					bean = getObjectForBeanInstance(scopedInstance, name, beanName, mbd);
+					bean = getObjectForBeanInstance(sharedInstance, name, beanName, mbd);
+				}
+
+				else if (mbd.isPrototype()) {
+					// It's a prototype -> create a new instance.
+					Object prototypeInstance = null;
+					try {
+						beforePrototypeCreation(beanName);
+						prototypeInstance = createBean(beanName, mbd, args);
+					}
+					finally {
+						afterPrototypeCreation(beanName);
+					}
+					bean = getObjectForBeanInstance(prototypeInstance, name, beanName, mbd);
 				}
-				catch (IllegalStateException ex) {
-					throw new BeanCreationException(beanName,
-							"Scope '" + scopeName + "' is not active for the current thread; " +
-							"consider defining a scoped proxy for this bean if you intend to refer to it from a singleton",
-							ex);
+
+				else {
+					String scopeName = mbd.getScope();
+					final Scope scope = this.scopes.get(scopeName);
+					if (scope == null) {
+						throw new IllegalStateException("No Scope registered for scope '" + scopeName + "'");
+					}
+					try {
+						Object scopedInstance = scope.get(beanName, new ObjectFactory<Object>() {
+							public Object getObject() throws BeansException {
+								beforePrototypeCreation(beanName);
+								try {
+									return createBean(beanName, mbd, args);
+								}
+								finally {
+									afterPrototypeCreation(beanName);
+								}
+							}
+						});
+						bean = getObjectForBeanInstance(scopedInstance, name, beanName, mbd);
+					}
+					catch (IllegalStateException ex) {
+						throw new BeanCreationException(beanName,
+								"Scope '" + scopeName + "' is not active for the current thread; " +
+								"consider defining a scoped proxy for this bean if you intend to refer to it from a singleton",
+								ex);
+					}
 				}
 			}
+			catch (BeansException ex) {
+				cleanupAfterBeanCreationFailure(beanName);
+				throw ex;
+			}
 		}
 
 		// Check if required type matches the type of the actual bean instance.
@@ -497,8 +500,8 @@ else if (containsSingleton(beanName) && !containsBeanDefinition(beanName)) {
 			// Retrieve corresponding bean definition.
 			RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName);
 
-			Class[] typesToMatch = (FactoryBean.class.equals(typeToMatch) ?
-					new Class[] {typeToMatch} : new Class[] {FactoryBean.class, typeToMatch});
+			Class<?>[] typesToMatch = (FactoryBean.class.equals(typeToMatch) ?
+					new Class<?>[] {typeToMatch} : new Class<?>[] {FactoryBean.class, typeToMatch});
 
 			// Check decorated bean definition, if any: We assume it'll be easier
 			// to determine the decorated bean's type than the proxy's type.
@@ -511,26 +514,32 @@ else if (containsSingleton(beanName) && !containsBeanDefinition(beanName)) {
 				}
 			}
 
-			Class<?> beanClass = predictBeanType(beanName, mbd, typesToMatch);
-			if (beanClass == null) {
+			Class<?> beanType = predictBeanType(beanName, mbd, typesToMatch);
+			if (beanType == null) {
 				return false;
 			}
 
 			// Check bean class whether we're dealing with a FactoryBean.
-			if (FactoryBean.class.isAssignableFrom(beanClass)) {
+			if (FactoryBean.class.isAssignableFrom(beanType)) {
 				if (!BeanFactoryUtils.isFactoryDereference(name)) {
 					// If it's a FactoryBean, we want to look at what it creates, not the factory class.
-					Class<?> type = getTypeForFactoryBean(beanName, mbd);
-					return (type != null && typeToMatch.isAssignableFrom(type));
-				}
-				else {
-					return typeToMatch.isAssignableFrom(beanClass);
+					beanType = getTypeForFactoryBean(beanName, mbd);
+					if (beanType == null) {
+						return false;
+					}
 				}
 			}
-			else {
-				return !BeanFactoryUtils.isFactoryDereference(name) &&
-						typeToMatch.isAssignableFrom(beanClass);
+			else if (BeanFactoryUtils.isFactoryDereference(name)) {
+				// Special case: A SmartInstantiationAwareBeanPostProcessor returned a non-FactoryBean
+				// type but we nevertheless are being asked to dereference a FactoryBean...
+				// Let's check the original bean class and proceed with it if it is a FactoryBean.
+				beanType = predictBeanType(beanName, mbd, FactoryBean.class);
+				if (beanType == null || !FactoryBean.class.isAssignableFrom(beanType)) {
+					return false;
+				}
 			}
+
+			return typeToMatch.isAssignableFrom(beanType);
 		}
 	}
 
@@ -1219,7 +1228,7 @@ protected void checkMergedBeanDefinition(RootBeanDefinition mbd, String beanName
 		// Check validity of the usage of the args parameter. This can
 		// only be used for prototypes constructed via a factory method.
 		if (args != null && !mbd.isPrototype()) {
-			throw new BeanDefinitionStoreException(
+			throw new BeanDefinitionStoreException(mbd.getResourceDescription(), beanName,
 					"Can only specify arguments for the getBean method when referring to a prototype bean definition");
 		}
 	}
@@ -1335,8 +1344,8 @@ protected Class<?> predictBeanType(String beanName, RootBeanDefinition mbd, Clas
 	 * @param mbd the corresponding bean definition
 	 */
 	protected boolean isFactoryBean(String beanName, RootBeanDefinition mbd) {
-		Class<?> beanClass = predictBeanType(beanName, mbd, FactoryBean.class);
-		return (beanClass != null && FactoryBean.class.isAssignableFrom(beanClass));
+		Class<?> beanType = predictBeanType(beanName, mbd, FactoryBean.class);
+		return (beanType != null && FactoryBean.class.isAssignableFrom(beanType));
 	}
 
 	/**
@@ -1379,7 +1388,17 @@ protected Class<?> getTypeForFactoryBean(String beanName, RootBeanDefinition mbd
 	 * @param beanName the name of the bean
 	 */
 	protected void markBeanAsCreated(String beanName) {
-		this.alreadyCreated.put(beanName, Boolean.TRUE);
+		if (!this.alreadyCreated.containsKey(beanName)) {
+			this.alreadyCreated.put(beanName, Boolean.TRUE);
+		}
+	}
+
+	/**
+	 * Perform appropriate cleanup of cached metadata after bean creation failed.
+	 * @param beanName the name of the bean
+	 */
+	protected void cleanupAfterBeanCreationFailure(String beanName) {
+		this.alreadyCreated.remove(beanName);
 	}
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
index f8ffd5798b..1ef3ceafe6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,20 +23,27 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Proxy;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Set;
 
+import org.springframework.beans.BeanMetadataElement;
 import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.config.TypedStringValue;
+import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
 /**
- * Utility class that contains various methods useful for
- * the implementation of autowire-capable bean factories.
+ * Utility class that contains various methods useful for the implementation of
+ * autowire-capable bean factories.
  *
  * @author Juergen Hoeller
  * @author Mark Fisher
+ * @author Sam Brannen
  * @since 1.1.2
  * @see AbstractAutowireCapableBeanFactory
  */
@@ -49,9 +56,9 @@ abstract class AutowireUtils {
 	 * decreasing number of arguments.
 	 * @param constructors the constructor array to sort
 	 */
-	public static void sortConstructors(Constructor[] constructors) {
-		Arrays.sort(constructors, new Comparator<Constructor>() {
-			public int compare(Constructor c1, Constructor c2) {
+	public static void sortConstructors(Constructor<?>[] constructors) {
+		Arrays.sort(constructors, new Comparator<Constructor<?>>() {
+			public int compare(Constructor<?> c1, Constructor<?> c2) {
 				boolean p1 = Modifier.isPublic(c1.getModifiers());
 				boolean p2 = Modifier.isPublic(c2.getModifiers());
 				if (p1 != p2) {
@@ -103,7 +110,7 @@ public static boolean isExcludedFromDependencyCheck(PropertyDescriptor pd) {
 		}
 		// It was declared by CGLIB, but we might still want to autowire it
 		// if it was actually declared by the superclass.
-		Class superclass = wm.getDeclaringClass().getSuperclass();
+		Class<?> superclass = wm.getDeclaringClass().getSuperclass();
 		return !ClassUtils.hasMethod(superclass, wm.getName(), wm.getParameterTypes());
 	}
 
@@ -114,11 +121,11 @@ public static boolean isExcludedFromDependencyCheck(PropertyDescriptor pd) {
 	 * @param interfaces the Set of interfaces (Class objects)
 	 * @return whether the setter method is defined by an interface
 	 */
-	public static boolean isSetterDefinedInInterface(PropertyDescriptor pd, Set<Class> interfaces) {
+	public static boolean isSetterDefinedInInterface(PropertyDescriptor pd, Set<Class<?>> interfaces) {
 		Method setter = pd.getWriteMethod();
 		if (setter != null) {
-			Class targetClass = setter.getDeclaringClass();
-			for (Class ifc : interfaces) {
+			Class<?> targetClass = setter.getDeclaringClass();
+			for (Class<?> ifc : interfaces) {
 				if (ifc.isAssignableFrom(targetClass) &&
 						ClassUtils.hasMethod(ifc, setter.getName(), setter.getParameterTypes())) {
 					return true;
@@ -135,12 +142,12 @@ public static boolean isSetterDefinedInInterface(PropertyDescriptor pd, Set<Clas
 	 * @param requiredType the type to assign the result to
 	 * @return the resolved value
 	 */
-	public static Object resolveAutowiringValue(Object autowiringValue, Class requiredType) {
+	public static Object resolveAutowiringValue(Object autowiringValue, Class<?> requiredType) {
 		if (autowiringValue instanceof ObjectFactory && !requiredType.isInstance(autowiringValue)) {
-			ObjectFactory factory = (ObjectFactory) autowiringValue;
+			ObjectFactory<?> factory = (ObjectFactory<?>) autowiringValue;
 			if (autowiringValue instanceof Serializable && requiredType.isInterface()) {
 				autowiringValue = Proxy.newProxyInstance(requiredType.getClassLoader(),
-						new Class[] {requiredType}, new ObjectFactoryDelegatingInvocationHandler(factory));
+						new Class<?>[] {requiredType}, new ObjectFactoryDelegatingInvocationHandler(factory));
 			}
 			else {
 				return factory.getObject();
@@ -149,6 +156,124 @@ public static Object resolveAutowiringValue(Object autowiringValue, Class requir
 		return autowiringValue;
 	}
 
+	/**
+	 * Determine the target type for the generic return type of the given
+	 * <em>generic factory method</em>, where formal type variables are declared
+	 * on the given method itself.
+	 * <p>For example, given a factory method with the following signature,
+	 * if {@code resolveReturnTypeForFactoryMethod()} is invoked with the reflected
+	 * method for {@code creatProxy()} and an {@code Object[]} array containing
+	 * {@code MyService.class}, {@code resolveReturnTypeForFactoryMethod()} will
+	 * infer that the target return type is {@code MyService}.
+	 * <pre class="code">{@code public static <T> T createProxy(Class<T> clazz)}</pre>
+	 * <h4>Possible Return Values</h4>
+	 * <ul>
+	 * <li>the target return type, if it can be inferred</li>
+	 * <li>the {@linkplain Method#getReturnType() standard return type}, if
+	 * the given {@code method} does not declare any {@linkplain
+	 * Method#getTypeParameters() formal type variables}</li>
+	 * <li>the {@linkplain Method#getReturnType() standard return type}, if the
+	 * target return type cannot be inferred (e.g., due to type erasure)</li>
+	 * <li>{@code null}, if the length of the given arguments array is shorter
+	 * than the length of the {@linkplain
+	 * Method#getGenericParameterTypes() formal argument list} for the given
+	 * method</li>
+	 * </ul>
+	 * @param method the method to introspect (never {@code null})
+	 * @param args the arguments that will be supplied to the method when it is
+	 * invoked (never {@code null})
+	 * @param classLoader the ClassLoader to resolve class names against, if necessary
+	 * (never {@code null})
+	 * @return the resolved target return type, the standard return type, or {@code null}
+	 * @since 3.2.5
+	 */
+	public static Class<?> resolveReturnTypeForFactoryMethod(Method method, Object[] args, ClassLoader classLoader) {
+		Assert.notNull(method, "Method must not be null");
+		Assert.notNull(args, "Argument array must not be null");
+		Assert.notNull(classLoader, "ClassLoader must not be null");
+
+		TypeVariable<Method>[] declaredTypeVariables = method.getTypeParameters();
+		Type genericReturnType = method.getGenericReturnType();
+		Type[] methodParameterTypes = method.getGenericParameterTypes();
+		Assert.isTrue(args.length == methodParameterTypes.length, "Argument array does not match parameter count");
+
+		// Ensure that the type variable (e.g., T) is declared directly on the method
+		// itself (e.g., via <T>), not on the enclosing class or interface.
+		boolean locallyDeclaredTypeVariableMatchesReturnType = false;
+		for (TypeVariable<Method> currentTypeVariable : declaredTypeVariables) {
+			if (currentTypeVariable.equals(genericReturnType)) {
+				locallyDeclaredTypeVariableMatchesReturnType = true;
+				break;
+			}
+		}
+
+		if (locallyDeclaredTypeVariableMatchesReturnType) {
+			for (int i = 0; i < methodParameterTypes.length; i++) {
+				Type methodParameterType = methodParameterTypes[i];
+				Object arg = args[i];
+				if (methodParameterType.equals(genericReturnType)) {
+					if (arg instanceof TypedStringValue) {
+						TypedStringValue typedValue = ((TypedStringValue) arg);
+						if (typedValue.hasTargetType()) {
+							return typedValue.getTargetType();
+						}
+						try {
+							return typedValue.resolveTargetType(classLoader);
+						}
+						catch (ClassNotFoundException ex) {
+							throw new IllegalStateException("Failed to resolve value type [" +
+									typedValue.getTargetTypeName() + "] for factory method argument", ex);
+						}
+					}
+					// Only consider argument type if it is a simple value...
+					if (arg != null && !(arg instanceof BeanMetadataElement)) {
+						return arg.getClass();
+					}
+					return method.getReturnType();
+				}
+				else if (methodParameterType instanceof ParameterizedType) {
+					ParameterizedType parameterizedType = (ParameterizedType) methodParameterType;
+					Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
+					for (Type typeArg : actualTypeArguments) {
+						if (typeArg.equals(genericReturnType)) {
+							if (arg instanceof Class) {
+								return (Class<?>) arg;
+							}
+							else {
+								String className = null;
+								if (arg instanceof String) {
+									className = (String) arg;
+								}
+								else if (arg instanceof TypedStringValue) {
+									TypedStringValue typedValue = ((TypedStringValue) arg);
+									String targetTypeName = typedValue.getTargetTypeName();
+									if (targetTypeName == null || Class.class.getName().equals(targetTypeName)) {
+										className = typedValue.getValue();
+									}
+								}
+								if (className != null) {
+									try {
+										return ClassUtils.forName(className, classLoader);
+									}
+									catch (ClassNotFoundException ex) {
+										throw new IllegalStateException("Could not resolve class name [" + arg +
+												"] for factory method argument", ex);
+									}
+								}
+								// Consider adding logic to determine the class of the typeArg, if possible.
+								// For now, just fall back...
+								return method.getReturnType();
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// Fall back...
+		return method.getReturnType();
+	}
+
 
 	/**
 	 * Reflective InvocationHandler for lazy access to the current target object.
@@ -156,9 +281,9 @@ public static Object resolveAutowiringValue(Object autowiringValue, Class requir
 	@SuppressWarnings("serial")
 	private static class ObjectFactoryDelegatingInvocationHandler implements InvocationHandler, Serializable {
 
-		private final ObjectFactory objectFactory;
+		private final ObjectFactory<?> objectFactory;
 
-		public ObjectFactoryDelegatingInvocationHandler(ObjectFactory objectFactory) {
+		public ObjectFactoryDelegatingInvocationHandler(ObjectFactory<?> objectFactory) {
 			this.objectFactory = objectFactory;
 		}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java
index f5d1e77781..bd8b8f51b5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 
 /**
  * Simple interface for bean definition readers.
- * Specifies load methods with Resource parameters.
+ * Specifies load methods with Resource and String location parameters.
  *
  * <p>Concrete bean definition readers can of course add additional
  * load and register methods for bean definitions, specific to
@@ -45,23 +45,23 @@ public interface BeanDefinitionReader {
 	 */
 	BeanDefinitionRegistry getRegistry();
 
-		/**
-		 * Return the resource loader to use for resource locations.
-		 * Can be checked for the <b>ResourcePatternResolver</b> interface and cast
-		 * accordingly, for loading multiple resources for a given resource pattern.
-		 * <p>Null suggests that absolute resource loading is not available
-		 * for this bean definition reader.
-		 * <p>This is mainly meant to be used for importing further resources
-		 * from within a bean definition resource, for example via the "import"
-		 * tag in XML bean definitions. It is recommended, however, to apply
-		 * such imports relative to the defining resource; only explicit full
-		 * resource locations will trigger absolute resource loading.
-		 * <p>There is also a {@code loadBeanDefinitions(String)} method available,
-		 * for loading bean definitions from a resource location (or location pattern).
-		 * This is a convenience to avoid explicit ResourceLoader handling.
-		 * @see #loadBeanDefinitions(String)
-		 * @see org.springframework.core.io.support.ResourcePatternResolver
-		 */
+	/**
+	 * Return the resource loader to use for resource locations.
+	 * Can be checked for the <b>ResourcePatternResolver</b> interface and cast
+	 * accordingly, for loading multiple resources for a given resource pattern.
+	 * <p>Null suggests that absolute resource loading is not available
+	 * for this bean definition reader.
+	 * <p>This is mainly meant to be used for importing further resources
+	 * from within a bean definition resource, for example via the "import"
+	 * tag in XML bean definitions. It is recommended, however, to apply
+	 * such imports relative to the defining resource; only explicit full
+	 * resource locations will trigger absolute resource loading.
+	 * <p>There is also a {@code loadBeanDefinitions(String)} method available,
+	 * for loading bean definitions from a resource location (or location pattern).
+	 * This is a convenience to avoid explicit ResourceLoader handling.
+	 * @see #loadBeanDefinitions(String)
+	 * @see org.springframework.core.io.support.ResourcePatternResolver
+	 */
 	ResourceLoader getResourceLoader();
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
index 4ee6d218fa..18aaa23d03 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,6 +81,7 @@ public BeanDefinitionValueResolver(
 		this.typeConverter = typeConverter;
 	}
 
+
 	/**
 	 * Given a PropertyValue, return a value, resolving any references to other
 	 * beans in the factory if necessary. The value could be:
@@ -123,12 +124,14 @@ else if (value instanceof BeanDefinitionHolder) {
 		else if (value instanceof BeanDefinition) {
 			// Resolve plain BeanDefinition, without contained name: use dummy name.
 			BeanDefinition bd = (BeanDefinition) value;
-			return resolveInnerBean(argName, "(inner bean)", bd);
+			String innerBeanName = "(inner bean)" + BeanFactoryUtils.GENERATED_BEAN_NAME_SEPARATOR +
+					ObjectUtils.getIdentityHexString(bd);
+			return resolveInnerBean(argName, innerBeanName, bd);
 		}
 		else if (value instanceof ManagedArray) {
 			// May need to resolve contained runtime references.
 			ManagedArray array = (ManagedArray) value;
-			Class elementType = array.resolvedElementType;
+			Class<?> elementType = array.resolvedElementType;
 			if (elementType == null) {
 				String elementTypeName = array.getElementTypeName();
 				if (StringUtils.hasText(elementTypeName)) {
@@ -164,7 +167,7 @@ else if (value instanceof ManagedMap) {
 		else if (value instanceof ManagedProperties) {
 			Properties original = (Properties) value;
 			Properties copy = new Properties();
-			for (Map.Entry propEntry : original.entrySet()) {
+			for (Map.Entry<Object, Object> propEntry : original.entrySet()) {
 				Object propKey = propEntry.getKey();
 				Object propValue = propEntry.getValue();
 				if (propKey instanceof TypedStringValue) {
@@ -260,19 +263,21 @@ private Object resolveInnerBean(Object argName, String innerBeanName, BeanDefini
 			if (mbd.isSingleton()) {
 				actualInnerBeanName = adaptInnerBeanName(innerBeanName);
 			}
+			this.beanFactory.registerContainedBean(actualInnerBeanName, this.beanName);
 			// Guarantee initialization of beans that the inner bean depends on.
 			String[] dependsOn = mbd.getDependsOn();
 			if (dependsOn != null) {
 				for (String dependsOnBean : dependsOn) {
-					this.beanFactory.getBean(dependsOnBean);
 					this.beanFactory.registerDependentBean(dependsOnBean, actualInnerBeanName);
+					this.beanFactory.getBean(dependsOnBean);
 				}
 			}
+			// Actually create the inner bean instance now...
 			Object innerBean = this.beanFactory.createBean(actualInnerBeanName, mbd, null);
-			this.beanFactory.registerContainedBean(actualInnerBeanName, this.beanName);
 			if (innerBean instanceof FactoryBean) {
-				boolean synthetic = (mbd != null && mbd.isSynthetic());
-				return this.beanFactory.getObjectFromFactoryBean((FactoryBean) innerBean, actualInnerBeanName, !synthetic);
+				boolean synthetic = mbd.isSynthetic();
+				return this.beanFactory.getObjectFromFactoryBean(
+						(FactoryBean<?>) innerBean, actualInnerBeanName, !synthetic);
 			}
 			else {
 				return innerBean;
@@ -335,7 +340,7 @@ private Object resolveReference(Object argName, RuntimeBeanReference ref) {
 	/**
 	 * For each element in the managed array, resolve reference if necessary.
 	 */
-	private Object resolveManagedArray(Object argName, List<?> ml, Class elementType) {
+	private Object resolveManagedArray(Object argName, List<?> ml, Class<?> elementType) {
 		Object resolved = Array.newInstance(elementType, ml.size());
 		for (int i = 0; i < ml.size(); i++) {
 			Array.set(resolved, i,
@@ -347,7 +352,7 @@ private Object resolveManagedArray(Object argName, List<?> ml, Class elementType
 	/**
 	 * For each element in the managed list, resolve reference if necessary.
 	 */
-	private List resolveManagedList(Object argName, List<?> ml) {
+	private List<?> resolveManagedList(Object argName, List<?> ml) {
 		List<Object> resolved = new ArrayList<Object>(ml.size());
 		for (int i = 0; i < ml.size(); i++) {
 			resolved.add(
@@ -359,7 +364,7 @@ private List resolveManagedList(Object argName, List<?> ml) {
 	/**
 	 * For each element in the managed set, resolve reference if necessary.
 	 */
-	private Set resolveManagedSet(Object argName, Set<?> ms) {
+	private Set<?> resolveManagedSet(Object argName, Set<?> ms) {
 		Set<Object> resolved = new LinkedHashSet<Object>(ms.size());
 		int i = 0;
 		for (Object m : ms) {
@@ -372,9 +377,9 @@ private Set resolveManagedSet(Object argName, Set<?> ms) {
 	/**
 	 * For each element in the managed map, resolve reference if necessary.
 	 */
-	private Map resolveManagedMap(Object argName, Map<?, ?> mm) {
+	private Map<?, ?> resolveManagedMap(Object argName, Map<?, ?> mm) {
 		Map<Object, Object> resolved = new LinkedHashMap<Object, Object>(mm.size());
-		for (Map.Entry entry : mm.entrySet()) {
+		for (Map.Entry<?, ?> entry : mm.entrySet()) {
 			Object resolvedKey = resolveValueIfNecessary(argName, entry.getKey());
 			Object resolvedValue = resolveValueIfNecessary(
 					new KeyedArgName(argName, entry.getKey()), entry.getValue());
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java
index dc601c3bd4..076e209838 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.BeanFactory;
-
+import org.springframework.cglib.core.SpringNamingPolicy;
 import org.springframework.cglib.proxy.Callback;
 import org.springframework.cglib.proxy.CallbackFilter;
 import org.springframework.cglib.proxy.Enhancer;
@@ -33,8 +33,9 @@
 
 /**
  * Default object instantiation strategy for use in BeanFactories.
- * Uses CGLIB to generate subclasses dynamically if methods need to be
- * overridden by the container, to implement Method Injection.
+ *
+ * <p>Uses CGLIB to generate subclasses dynamically if methods need to be
+ * overridden by the container to implement <em>Method Injection</em>.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -50,13 +51,13 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 
 	/**
 	 * Index in the CGLIB callback array for a method that should
-	 * be overridden to provide method lookup.
+	 * be overridden to provide <em>method lookup</em>.
 	 */
 	private static final int LOOKUP_OVERRIDE = 1;
 
 	/**
 	 * Index in the CGLIB callback array for a method that should
-	 * be overridden using generic Methodreplacer functionality.
+	 * be overridden using generic <em>method replacer</em> functionality.
 	 */
 	private static final int METHOD_REPLACER = 2;
 
@@ -72,7 +73,7 @@ protected Object instantiateWithMethodInjection(
 	@Override
 	protected Object instantiateWithMethodInjection(
 			RootBeanDefinition beanDefinition, String beanName, BeanFactory owner,
-			Constructor ctor, Object[] args) {
+			Constructor<?> ctor, Object[] args) {
 
 		return new CglibSubclassCreator(beanDefinition, owner).instantiate(ctor, args);
 	}
@@ -96,17 +97,18 @@ public CglibSubclassCreator(RootBeanDefinition beanDefinition, BeanFactory owner
 		}
 
 		/**
-		 * Create a new instance of a dynamically generated subclasses implementing the
+		 * Create a new instance of a dynamically generated subclass implementing the
 		 * required lookups.
 		 * @param ctor constructor to use. If this is {@code null}, use the
 		 * no-arg constructor (no parameterization, or Setter Injection)
 		 * @param args arguments to use for the constructor.
-		 * Ignored if the ctor parameter is {@code null}.
-		 * @return new instance of the dynamically generated class
+		 * Ignored if the {@code ctor} parameter is {@code null}.
+		 * @return new instance of the dynamically generated subclass
 		 */
-		public Object instantiate(Constructor ctor, Object[] args) {
+		public Object instantiate(Constructor<?> ctor, Object[] args) {
 			Enhancer enhancer = new Enhancer();
 			enhancer.setSuperclass(this.beanDefinition.getBeanClass());
+			enhancer.setNamingPolicy(SpringNamingPolicy.INSTANCE);
 			enhancer.setCallbackFilter(new CallbackFilterImpl());
 			enhancer.setCallbacks(new Callback[] {
 					NoOp.INSTANCE,
@@ -114,9 +116,7 @@ public Object instantiate(Constructor ctor, Object[] args) {
 					new ReplaceOverrideMethodInterceptor()
 			});
 
-			return (ctor == null) ?
-					enhancer.create() :
-					enhancer.create(ctor.getParameterTypes(), args);
+			return (ctor != null ? enhancer.create(ctor.getParameterTypes(), args) : enhancer.create());
 		}
 
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java
index b03ca67dcd..72ab68bdf5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@ public ChildBeanDefinition(
 	 * @param pvs the property values to apply
 	 */
 	public ChildBeanDefinition(
-			String parentName, Class beanClass, ConstructorArgumentValues cargs, MutablePropertyValues pvs) {
+			String parentName, Class<?> beanClass, ConstructorArgumentValues cargs, MutablePropertyValues pvs) {
 
 		super(cargs, pvs);
 		this.parentName = parentName;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
index 384866ffdd..e97652c565 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,12 +54,9 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Helper class for resolving constructors and factory methods.
+ * Delegate for resolving constructors and factory methods.
  * Performs constructor resolution through argument matching.
  *
- * <p>Operates on an {@link AbstractBeanFactory} and an {@link InstantiationStrategy}.
- * Used by {@link AbstractAutowireCapableBeanFactory}.
- *
  * @author Juergen Hoeller
  * @author Rob Harrop
  * @author Mark Fisher
@@ -103,12 +100,12 @@ public ConstructorResolver(AbstractAutowireCapableBeanFactory beanFactory) {
 	 * @return a BeanWrapper for the new instance
 	 */
 	public BeanWrapper autowireConstructor(
-			final String beanName, final RootBeanDefinition mbd, Constructor[] chosenCtors, final Object[] explicitArgs) {
+			final String beanName, final RootBeanDefinition mbd, Constructor<?>[] chosenCtors, final Object[] explicitArgs) {
 
 		BeanWrapperImpl bw = new BeanWrapperImpl();
 		this.beanFactory.initBeanWrapper(bw);
 
-		Constructor constructorToUse = null;
+		Constructor<?> constructorToUse = null;
 		ArgumentsHolder argsHolderToUse = null;
 		Object[] argsToUse = null;
 
@@ -118,7 +115,7 @@ public BeanWrapper autowireConstructor(
 		else {
 			Object[] argsToResolve = null;
 			synchronized (mbd.constructorArgumentLock) {
-				constructorToUse = (Constructor) mbd.resolvedConstructorOrFactoryMethod;
+				constructorToUse = (Constructor<?>) mbd.resolvedConstructorOrFactoryMethod;
 				if (constructorToUse != null && mbd.constructorArgumentsResolved) {
 					// Found a cached constructor...
 					argsToUse = mbd.resolvedConstructorArguments;
@@ -149,9 +146,9 @@ public BeanWrapper autowireConstructor(
 			}
 
 			// Take specified constructors, if any.
-			Constructor[] candidates = chosenCtors;
+			Constructor<?>[] candidates = chosenCtors;
 			if (candidates == null) {
-				Class beanClass = mbd.getBeanClass();
+				Class<?> beanClass = mbd.getBeanClass();
 				try {
 					candidates = (mbd.isNonPublicAccessAllowed() ?
 							beanClass.getDeclaredConstructors() : beanClass.getConstructors());
@@ -159,17 +156,17 @@ public BeanWrapper autowireConstructor(
 				catch (Throwable ex) {
 					throw new BeanCreationException(mbd.getResourceDescription(), beanName,
 							"Resolution of declared constructors on bean Class [" + beanClass.getName() +
-									"] from ClassLoader [" + beanClass.getClassLoader() + "] failed", ex);
+							"] from ClassLoader [" + beanClass.getClassLoader() + "] failed", ex);
 				}
 			}
 			AutowireUtils.sortConstructors(candidates);
 			int minTypeDiffWeight = Integer.MAX_VALUE;
-			Set<Constructor> ambiguousConstructors = null;
+			Set<Constructor<?>> ambiguousConstructors = null;
 			List<Exception> causes = null;
 
 			for (int i = 0; i < candidates.length; i++) {
 				Constructor<?> candidate = candidates[i];
-				Class[] paramTypes = candidate.getParameterTypes();
+				Class<?>[] paramTypes = candidate.getParameterTypes();
 
 				if (constructorToUse != null && argsToUse.length > paramTypes.length) {
 					// Already found greedy constructor that can be satisfied ->
@@ -185,7 +182,7 @@ public BeanWrapper autowireConstructor(
 					try {
 						String[] paramNames = null;
 						if (constructorPropertiesAnnotationAvailable) {
-							paramNames = ConstructorPropertiesChecker.evaluateAnnotation(candidate, paramTypes.length);
+							paramNames = ConstructorPropertiesChecker.evaluate(candidate, paramTypes.length);
 						}
 						if (paramNames == null) {
 							ParameterNameDiscoverer pnd = this.beanFactory.getParameterNameDiscoverer();
@@ -239,7 +236,7 @@ public BeanWrapper autowireConstructor(
 				}
 				else if (constructorToUse != null && typeDiffWeight == minTypeDiffWeight) {
 					if (ambiguousConstructors == null) {
-						ambiguousConstructors = new LinkedHashSet<Constructor>();
+						ambiguousConstructors = new LinkedHashSet<Constructor<?>>();
 						ambiguousConstructors.add(constructorToUse);
 					}
 					ambiguousConstructors.add(candidate);
@@ -267,7 +264,7 @@ else if (ambiguousConstructors != null && !mbd.isLenientConstructorResolution())
 			Object beanInstance;
 
 			if (System.getSecurityManager() != null) {
-				final Constructor ctorToUse = constructorToUse;
+				final Constructor<?> ctorToUse = constructorToUse;
 				final Object[] argumentsToUse = argsToUse;
 				beanInstance = AccessController.doPrivileged(new PrivilegedAction<Object>() {
 					public Object run() {
@@ -295,18 +292,22 @@ public Object run() {
 	 * @param mbd the bean definition to check
 	 */
 	public void resolveFactoryMethodIfPossible(RootBeanDefinition mbd) {
-		Class factoryClass;
+		Class<?> factoryClass;
+		boolean isStatic;
 		if (mbd.getFactoryBeanName() != null) {
 			factoryClass = this.beanFactory.getType(mbd.getFactoryBeanName());
+			isStatic = false;
 		}
 		else {
 			factoryClass = mbd.getBeanClass();
+			isStatic = true;
 		}
 		factoryClass = ClassUtils.getUserClass(factoryClass);
-		Method[] candidates = ReflectionUtils.getAllDeclaredMethods(factoryClass);
+
+		Method[] candidates = getCandidateMethods(factoryClass, mbd);
 		Method uniqueCandidate = null;
 		for (Method candidate : candidates) {
-			if (mbd.isFactoryMethod(candidate)) {
+			if (Modifier.isStatic(candidate.getModifiers()) == isStatic && mbd.isFactoryMethod(candidate)) {
 				if (uniqueCandidate == null) {
 					uniqueCandidate = candidate;
 				}
@@ -321,6 +322,27 @@ else if (!Arrays.equals(uniqueCandidate.getParameterTypes(), candidate.getParame
 		}
 	}
 
+	/**
+	 * Retrieve all candidate methods for the given class, considering
+	 * the {@link RootBeanDefinition#isNonPublicAccessAllowed()} flag.
+	 * Called as the starting point for factory method determination.
+	 */
+	private Method[] getCandidateMethods(final Class<?> factoryClass, final RootBeanDefinition mbd) {
+		if (System.getSecurityManager() != null) {
+			return AccessController.doPrivileged(new PrivilegedAction<Method[]>() {
+				@Override
+				public Method[] run() {
+					return (mbd.isNonPublicAccessAllowed() ?
+							ReflectionUtils.getAllDeclaredMethods(factoryClass) : factoryClass.getMethods());
+				}
+			});
+		}
+		else {
+			return (mbd.isNonPublicAccessAllowed() ?
+					ReflectionUtils.getAllDeclaredMethods(factoryClass) : factoryClass.getMethods());
+		}
+	}
+
 	/**
 	 * Instantiate the bean using a named factory method. The method may be static, if the
 	 * bean definition parameter specifies a class, rather than a "factory-bean", or
@@ -336,12 +358,14 @@ else if (!Arrays.equals(uniqueCandidate.getParameterTypes(), candidate.getParame
 	 * method, or {@code null} if none (-> use constructor argument values from bean definition)
 	 * @return a BeanWrapper for the new instance
 	 */
-	public BeanWrapper instantiateUsingFactoryMethod(final String beanName, final RootBeanDefinition mbd, final Object[] explicitArgs) {
+	public BeanWrapper instantiateUsingFactoryMethod(
+			final String beanName, final RootBeanDefinition mbd, final Object[] explicitArgs) {
+
 		BeanWrapperImpl bw = new BeanWrapperImpl();
 		this.beanFactory.initBeanWrapper(bw);
 
 		Object factoryBean;
-		Class factoryClass;
+		Class<?> factoryClass;
 		boolean isStatic;
 
 		String factoryBeanName = mbd.getFactoryBeanName();
@@ -353,7 +377,7 @@ public BeanWrapper instantiateUsingFactoryMethod(final String beanName, final Ro
 			factoryBean = this.beanFactory.getBean(factoryBeanName);
 			if (factoryBean == null) {
 				throw new BeanCreationException(mbd.getResourceDescription(), beanName,
-						"factory-bean '" + factoryBeanName + "' returned null");
+						"factory-bean '" + factoryBeanName + "' (or a BeanPostProcessor involved) returned null");
 			}
 			factoryClass = factoryBean.getClass();
 			isStatic = false;
@@ -397,27 +421,11 @@ public BeanWrapper instantiateUsingFactoryMethod(final String beanName, final Ro
 			// Need to determine the factory method...
 			// Try all methods with this name to see if they match the given arguments.
 			factoryClass = ClassUtils.getUserClass(factoryClass);
-			Method[] rawCandidates;
-
-			final Class factoryClazz = factoryClass;
-			if (System.getSecurityManager() != null) {
-				rawCandidates = AccessController.doPrivileged(new PrivilegedAction<Method[]>() {
-					public Method[] run() {
-						return (mbd.isNonPublicAccessAllowed() ?
-								ReflectionUtils.getAllDeclaredMethods(factoryClazz) : factoryClazz.getMethods());
-					}
-				});
-			}
-			else {
-				rawCandidates = (mbd.isNonPublicAccessAllowed() ?
-						ReflectionUtils.getAllDeclaredMethods(factoryClazz) : factoryClazz.getMethods());
-			}
 
+			Method[] rawCandidates = getCandidateMethods(factoryClass, mbd);
 			List<Method> candidateSet = new ArrayList<Method>();
 			for (Method candidate : rawCandidates) {
-				if (Modifier.isStatic(candidate.getModifiers()) == isStatic &&
-						candidate.getName().equals(mbd.getFactoryMethodName()) &&
-						mbd.isFactoryMethod(candidate)) {
+				if (Modifier.isStatic(candidate.getModifiers()) == isStatic && mbd.isFactoryMethod(candidate)) {
 					candidateSet.add(candidate);
 				}
 			}
@@ -445,7 +453,7 @@ public Method[] run() {
 
 			for (int i = 0; i < candidates.length; i++) {
 				Method candidate = candidates[i];
-				Class[] paramTypes = candidate.getParameterTypes();
+				Class<?>[] paramTypes = candidate.getParameterTypes();
 
 				if (paramTypes.length >= minNrOfArgs) {
 					ArgumentsHolder argsHolder;
@@ -503,7 +511,15 @@ public Method[] run() {
 						minTypeDiffWeight = typeDiffWeight;
 						ambiguousFactoryMethods = null;
 					}
-					else if (factoryMethodToUse != null && typeDiffWeight == minTypeDiffWeight) {
+					// Find out about ambiguity: In case of the same type difference weight
+					// for methods with the same number of parameters, collect such candidates
+					// and eventually raise an ambiguity exception.
+					// However, only perform that check in non-lenient constructor resolution mode,
+					// and explicitly ignore overridden methods (with the same parameter signature).
+					else if (factoryMethodToUse != null && typeDiffWeight == minTypeDiffWeight &&
+							!mbd.isLenientConstructorResolution() &&
+							paramTypes.length == factoryMethodToUse.getParameterTypes().length &&
+							!Arrays.equals(paramTypes, factoryMethodToUse.getParameterTypes())) {
 						if (ambiguousFactoryMethods == null) {
 							ambiguousFactoryMethods = new LinkedHashSet<Method>();
 							ambiguousFactoryMethods.add(factoryMethodToUse);
@@ -514,24 +530,30 @@ else if (factoryMethodToUse != null && typeDiffWeight == minTypeDiffWeight) {
 			}
 
 			if (factoryMethodToUse == null) {
-				boolean hasArgs = (resolvedValues.getArgumentCount() > 0);
-				String argDesc = "";
-				if (hasArgs) {
-					List<String> argTypes = new ArrayList<String>();
-					for (ValueHolder value : resolvedValues.getIndexedArgumentValues().values()) {
-						String argType = (value.getType() != null ?
-								ClassUtils.getShortName(value.getType()) : value.getValue().getClass().getSimpleName());
+				List<String> argTypes = new ArrayList<String>(minNrOfArgs);
+				if (explicitArgs != null) {
+					for (Object arg : explicitArgs) {
+						argTypes.add(arg != null ? arg.getClass().getSimpleName() : "null");
+					}
+				}
+				else {
+					Set<ValueHolder> valueHolders = new LinkedHashSet<ValueHolder>(resolvedValues.getArgumentCount());
+					valueHolders.addAll(resolvedValues.getIndexedArgumentValues().values());
+					valueHolders.addAll(resolvedValues.getGenericArgumentValues());
+					for (ValueHolder value : valueHolders) {
+						String argType = (value.getType() != null ? ClassUtils.getShortName(value.getType()) :
+								(value.getValue() != null ? value.getValue().getClass().getSimpleName() : "null"));
 						argTypes.add(argType);
 					}
-					argDesc = StringUtils.collectionToCommaDelimitedString(argTypes);
 				}
+				String argDesc = StringUtils.collectionToCommaDelimitedString(argTypes);
 				throw new BeanCreationException(mbd.getResourceDescription(), beanName,
 						"No matching factory method found: " +
 						(mbd.getFactoryBeanName() != null ?
 							"factory bean '" + mbd.getFactoryBeanName() + "'; " : "") +
 						"factory method '" + mbd.getFactoryMethodName() + "(" + argDesc + ")'. " +
 						"Check that a method with the specified name " +
-						(hasArgs ? "and arguments " : "") +
+						(minNrOfArgs > 0 ? "and arguments " : "") +
 						"exists and that it is " +
 						(isStatic ? "static" : "non-static") + ".");
 			}
@@ -540,7 +562,7 @@ else if (void.class.equals(factoryMethodToUse.getReturnType())) {
 						"Invalid factory method '" + mbd.getFactoryMethodName() +
 						"': needs to have a non-void return type!");
 			}
-			else if (ambiguousFactoryMethods != null && !mbd.isLenientConstructorResolution()) {
+			else if (ambiguousFactoryMethods != null) {
 				throw new BeanCreationException(mbd.getResourceDescription(), beanName,
 						"Ambiguous factory method matches found in bean '" + beanName + "' " +
 						"(hint: specify index/type/name arguments for simple parameters to avoid type ambiguities): " +
@@ -591,8 +613,8 @@ private int resolveConstructorArguments(
 			String beanName, RootBeanDefinition mbd, BeanWrapper bw,
 			ConstructorArgumentValues cargs, ConstructorArgumentValues resolvedValues) {
 
-		TypeConverter converter = (this.beanFactory.getCustomTypeConverter() != null ?
-				this.beanFactory.getCustomTypeConverter() : bw);
+		TypeConverter customConverter = this.beanFactory.getCustomTypeConverter();
+		TypeConverter converter = (customConverter != null ? customConverter : bw);
 		BeanDefinitionValueResolver valueResolver =
 				new BeanDefinitionValueResolver(this.beanFactory, beanName, mbd, converter);
 
@@ -644,12 +666,12 @@ private int resolveConstructorArguments(
 	 */
 	private ArgumentsHolder createArgumentArray(
 			String beanName, RootBeanDefinition mbd, ConstructorArgumentValues resolvedValues,
-			BeanWrapper bw, Class[] paramTypes, String[] paramNames, Object methodOrCtor,
+			BeanWrapper bw, Class<?>[] paramTypes, String[] paramNames, Object methodOrCtor,
 			boolean autowiring) throws UnsatisfiedDependencyException {
 
 		String methodType = (methodOrCtor instanceof Constructor ? "constructor" : "factory method");
-		TypeConverter converter = (this.beanFactory.getCustomTypeConverter() != null ?
-				this.beanFactory.getCustomTypeConverter() : bw);
+		TypeConverter customConverter = this.beanFactory.getCustomTypeConverter();
+		TypeConverter converter = (customConverter != null ? customConverter : bw);
 
 		ArgumentsHolder args = new ArgumentsHolder(paramTypes.length);
 		Set<ConstructorArgumentValues.ValueHolder> usedValueHolders =
@@ -750,12 +772,13 @@ private ArgumentsHolder createArgumentArray(
 	private Object[] resolvePreparedArguments(
 			String beanName, RootBeanDefinition mbd, BeanWrapper bw, Member methodOrCtor, Object[] argsToResolve) {
 
-		Class[] paramTypes = (methodOrCtor instanceof Method ?
-				((Method) methodOrCtor).getParameterTypes() : ((Constructor) methodOrCtor).getParameterTypes());
-		TypeConverter converter = (this.beanFactory.getCustomTypeConverter() != null ?
-				this.beanFactory.getCustomTypeConverter() : bw);
+		TypeConverter customConverter = this.beanFactory.getCustomTypeConverter();
+		TypeConverter converter = (customConverter != null ? customConverter : bw);
 		BeanDefinitionValueResolver valueResolver =
 				new BeanDefinitionValueResolver(this.beanFactory, beanName, mbd, converter);
+		Class<?>[] paramTypes = (methodOrCtor instanceof Method ?
+				((Method) methodOrCtor).getParameterTypes() : ((Constructor<?>) methodOrCtor).getParameterTypes());
+
 		Object[] resolvedArgs = new Object[argsToResolve.length];
 		for (int argIndex = 0; argIndex < argsToResolve.length; argIndex++) {
 			Object argValue = argsToResolve[argIndex];
@@ -822,7 +845,7 @@ public ArgumentsHolder(Object[] args) {
 			this.preparedArguments = args;
 		}
 
-		public int getTypeDifferenceWeight(Class[] paramTypes) {
+		public int getTypeDifferenceWeight(Class<?>[] paramTypes) {
 			// If valid arguments found, determine type difference weight.
 			// Try type difference weight on both the converted arguments and
 			// the raw arguments. If the raw weight is better, use it.
@@ -832,7 +855,7 @@ public int getTypeDifferenceWeight(Class[] paramTypes) {
 			return (rawTypeDiffWeight < typeDiffWeight ? rawTypeDiffWeight : typeDiffWeight);
 		}
 
-		public int getAssignabilityWeight(Class[] paramTypes) {
+		public int getAssignabilityWeight(Class<?>[] paramTypes) {
 			for (int i = 0; i < paramTypes.length; i++) {
 				if (!ClassUtils.isAssignableValue(paramTypes[i], this.arguments[i])) {
 					return Integer.MAX_VALUE;
@@ -873,7 +896,7 @@ private static class AutowiredArgumentMarker {
 	 */
 	private static class ConstructorPropertiesChecker {
 
-		public static String[] evaluateAnnotation(Constructor<?> candidate, int paramCount) {
+		public static String[] evaluate(Constructor<?> candidate, int paramCount) {
 			ConstructorProperties cp = candidate.getAnnotation(ConstructorProperties.class);
 			if (cp != null) {
 				String[] names = cp.value();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
index e88e04f469..07c1620bfb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -60,6 +59,7 @@
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
@@ -103,9 +103,9 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	private static Class<?> javaxInjectProviderClass = null;
 
 	static {
-		ClassLoader cl = DefaultListableBeanFactory.class.getClassLoader();
 		try {
-			javaxInjectProviderClass = cl.loadClass("javax.inject.Provider");
+			javaxInjectProviderClass =
+					ClassUtils.forName("javax.inject.Provider", DefaultListableBeanFactory.class.getClassLoader());
 		}
 		catch (ClassNotFoundException ex) {
 			// JSR-330 API not available - Provider interface simply not supported then.
@@ -135,14 +135,14 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	/** Map of bean definition objects, keyed by bean name */
 	private final Map<String, BeanDefinition> beanDefinitionMap = new ConcurrentHashMap<String, BeanDefinition>(64);
 
-	/** Map of singleton and non-singleton bean names keyed by dependency type */
+	/** Map of singleton and non-singleton bean names, keyed by dependency type */
 	private final Map<Class<?>, String[]> allBeanNamesByType = new ConcurrentHashMap<Class<?>, String[]>(64);
 
-	/** Map of singleton-only bean names keyed by dependency type */
+	/** Map of singleton-only bean names, keyed by dependency type */
 	private final Map<Class<?>, String[]> singletonBeanNamesByType = new ConcurrentHashMap<Class<?>, String[]>(64);
 
 	/** List of bean definition names, in registration order */
-	private final List<String> beanDefinitionNames = new ArrayList<String>();
+	private final List<String> beanDefinitionNames = new ArrayList<String>(64);
 
 	/** Whether bean definition metadata may be cached for all beans */
 	private boolean configurationFrozen = false;
@@ -261,7 +261,7 @@ public <T> T getBean(Class<T> requiredType) throws BeansException {
 		if (beanNames.length > 1) {
 			ArrayList<String> autowireCandidates = new ArrayList<String>();
 			for (String beanName : beanNames) {
-				if (getBeanDefinition(beanName).isAutowireCandidate()) {
+				if (!containsBeanDefinition(beanName) || getBeanDefinition(beanName).isAutowireCandidate()) {
 					autowireCandidates.add(beanName);
 				}
 			}
@@ -323,7 +323,7 @@ public String[] getBeanNamesForType(Class<?> type) {
 	}
 
 	public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
-		if (!isConfigurationFrozen()  || type == null || !allowEagerInit) {
+		if (!isConfigurationFrozen() || type == null || !allowEagerInit) {
 			return doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);
 		}
 		Map<Class<?>, String[]> cache =
@@ -333,7 +333,9 @@ public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons,
 			return resolvedBeanNames;
 		}
 		resolvedBeanNames = doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);
-		cache.put(type, resolvedBeanNames);
+		if (ClassUtils.isCacheSafe(type, getBeanClassLoader())) {
+			cache.put(type, resolvedBeanNames);
+		}
 		return resolvedBeanNames;
 	}
 
@@ -460,12 +462,15 @@ public <T> Map<String, T> getBeansOfType(Class<T> type, boolean includeNonSingle
 	}
 
 	public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotationType) {
-		Set<String> beanNames = new LinkedHashSet<String>(getBeanDefinitionCount());
-		beanNames.addAll(Arrays.asList(getBeanDefinitionNames()));
-		beanNames.addAll(Arrays.asList(getSingletonNames()));
 		Map<String, Object> results = new LinkedHashMap<String, Object>();
-		for (String beanName : beanNames) {
-			if (findAnnotationOnBean(beanName, annotationType) != null) {
+		for (String beanName : getBeanDefinitionNames()) {
+			BeanDefinition beanDefinition = getBeanDefinition(beanName);
+			if (!beanDefinition.isAbstract() && findAnnotationOnBean(beanName, annotationType) != null) {
+				results.put(beanName, getBean(beanName));
+			}
+		}
+		for (String beanName : getSingletonNames()) {
+			if (!results.containsKey(beanName) && findAnnotationOnBean(beanName, annotationType) != null) {
 				results.put(beanName, getBean(beanName));
 			}
 		}
@@ -478,7 +483,9 @@ public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> an
 	 * found on the given class itself, as well as checking its raw bean class
 	 * if not found on the exposed bean reference (e.g. in case of a proxy).
 	 */
-	public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType) {
+	public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType)
+			throws NoSuchBeanDefinitionException{
+
 		A ann = null;
 		Class<?> beanType = getType(beanName);
 		if (beanType != null) {
@@ -502,10 +509,12 @@ public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> a
 	//---------------------------------------------------------------------
 
 	public void registerResolvableDependency(Class<?> dependencyType, Object autowiredValue) {
-		Assert.notNull(dependencyType, "Type must not be null");
+		Assert.notNull(dependencyType, "Dependency type must not be null");
 		if (autowiredValue != null) {
-			Assert.isTrue((autowiredValue instanceof ObjectFactory || dependencyType.isInstance(autowiredValue)),
-					"Value [" + autowiredValue + "] does not implement specified type [" + dependencyType.getName() + "]");
+			if (!(autowiredValue instanceof ObjectFactory || dependencyType.isInstance(autowiredValue))) {
+				throw new IllegalArgumentException("Value [" + autowiredValue +
+						"] does not implement specified dependency type [" + dependencyType.getName() + "]");
+			}
 			this.resolvableDependencies.put(dependencyType, autowiredValue);
 		}
 	}
@@ -595,12 +604,15 @@ public void preInstantiateSingletons() throws BeansException {
 		if (this.logger.isInfoEnabled()) {
 			this.logger.info("Pre-instantiating singletons in " + this);
 		}
+
 		List<String> beanNames;
 		synchronized (this.beanDefinitionMap) {
 			// Iterate over a copy to allow for init methods which in turn register new bean definitions.
 			// While this may not be part of the regular factory bootstrap, it does otherwise work fine.
 			beanNames = new ArrayList<String>(this.beanDefinitionNames);
 		}
+
+		// Trigger initialization of all non-lazy singleton beans...
 		for (String beanName : beanNames) {
 			RootBeanDefinition bd = getMergedLocalBeanDefinition(beanName);
 			if (!bd.isAbstract() && bd.isSingleton() && !bd.isLazyInit()) {
@@ -650,8 +662,10 @@ public void registerBeanDefinition(String beanName, BeanDefinition beanDefinitio
 			}
 		}
 
+		BeanDefinition oldBeanDefinition;
+
 		synchronized (this.beanDefinitionMap) {
-			Object oldBeanDefinition = this.beanDefinitionMap.get(beanName);
+			oldBeanDefinition = this.beanDefinitionMap.get(beanName);
 			if (oldBeanDefinition != null) {
 				if (!this.allowBeanDefinitionOverriding) {
 					throw new BeanDefinitionStoreException(beanDefinition.getResourceDescription(), beanName,
@@ -672,7 +686,9 @@ public void registerBeanDefinition(String beanName, BeanDefinition beanDefinitio
 			this.beanDefinitionMap.put(beanName, beanDefinition);
 		}
 
-		resetBeanDefinition(beanName);
+		if (oldBeanDefinition != null || containsSingleton(beanName)) {
+			resetBeanDefinition(beanName);
+		}
 	}
 
 	public void removeBeanDefinition(String beanName) throws NoSuchBeanDefinitionException {
@@ -707,9 +723,6 @@ protected void resetBeanDefinition(String beanName) {
 		// (e.g. the default StaticMessageSource in a StaticApplicationContext).
 		destroySingleton(beanName);
 
-		// Remove any assumptions about by-type mappings.
-		clearByTypeCache();
-
 		// Reset all bean definitions that have the given bean as parent (recursively).
 		for (String bdName : this.beanDefinitionNames) {
 			if (!beanName.equals(bdName)) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
index cbf7c872ff..99bf3c3cc0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 	private final Map<String, Object> singletonObjects = new ConcurrentHashMap<String, Object>(64);
 
 	/** Cache of singleton factories: bean name --> ObjectFactory */
-	private final Map<String, ObjectFactory> singletonFactories = new HashMap<String, ObjectFactory>(16);
+	private final Map<String, ObjectFactory<?>> singletonFactories = new HashMap<String, ObjectFactory<?>>(16);
 
 	/** Cache of early singleton objects: bean name --> bean instance */
 	private final Map<String, Object> earlySingletonObjects = new HashMap<String, Object>(16);
@@ -181,7 +181,7 @@ protected Object getSingleton(String beanName, boolean allowEarlyReference) {
 			synchronized (this.singletonObjects) {
 				singletonObject = this.earlySingletonObjects.get(beanName);
 				if (singletonObject == null && allowEarlyReference) {
-					ObjectFactory singletonFactory = this.singletonFactories.get(beanName);
+					ObjectFactory<?> singletonFactory = this.singletonFactories.get(beanName);
 					if (singletonFactory != null) {
 						singletonObject = singletonFactory.getObject();
 						this.earlySingletonObjects.put(beanName, singletonObject);
@@ -201,7 +201,7 @@ protected Object getSingleton(String beanName, boolean allowEarlyReference) {
 	 * with, if necessary
 	 * @return the registered singleton object
 	 */
-	public Object getSingleton(String beanName, ObjectFactory singletonFactory) {
+	public Object getSingleton(String beanName, ObjectFactory<?> singletonFactory) {
 		Assert.notNull(beanName, "'beanName' must not be null");
 		synchronized (this.singletonObjects) {
 			Object singletonObject = this.singletonObjects.get(beanName);
@@ -317,7 +317,7 @@ public boolean isSingletonCurrentlyInCreation(String beanName) {
 
 	/**
 	 * Callback before singleton creation.
-	 * <p>Default implementation register the singleton as currently in creation.
+	 * <p>The default implementation register the singleton as currently in creation.
 	 * @param beanName the name of the singleton about to be created
 	 * @see #isSingletonCurrentlyInCreation
 	 */
@@ -539,13 +539,13 @@ protected void destroyBean(String beanName, DisposableBean bean) {
 	}
 
 	/**
-	 * Expose the singleton mutex to subclasses.
+	 * Exposes the singleton mutex to subclasses and external collaborators.
 	 * <p>Subclasses should synchronize on the given Object if they perform
 	 * any sort of extended singleton creation phase. In particular, subclasses
 	 * should <i>not</i> have their own mutexes involved in singleton creation,
 	 * to avoid the potential for deadlocks in lazy-init situations.
 	 */
-	protected final Object getSingletonMutex() {
+	public final Object getSingletonMutex() {
 		return this.singletonObjects;
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
index 6a498344a9..ae394ca7c8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,11 +65,12 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 
 	private static final Log logger = LogFactory.getLog(DisposableBeanAdapter.class);
 
-	private static Class closeableInterface;
+	private static Class<?> closeableInterface;
 
 	static {
 		try {
-			closeableInterface = DisposableBeanAdapter.class.getClassLoader().loadClass("java.lang.AutoCloseable");
+			closeableInterface = ClassUtils.forName("java.lang.AutoCloseable",
+					DisposableBeanAdapter.class.getClassLoader());
 		}
 		catch (ClassNotFoundException ex) {
 			closeableInterface = Closeable.class;
@@ -85,14 +86,14 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 
 	private final boolean nonPublicAccessAllowed;
 
+	private final AccessControlContext acc;
+
 	private String destroyMethodName;
 
 	private transient Method destroyMethod;
 
 	private List<DestructionAwareBeanPostProcessor> beanPostProcessors;
 
-	private final AccessControlContext acc;
-
 
 	/**
 	 * Create a new DisposableBeanAdapter for the given bean.
@@ -149,9 +150,9 @@ private DisposableBeanAdapter(Object bean, String beanName, boolean invokeDispos
 		this.beanName = beanName;
 		this.invokeDisposableBean = invokeDisposableBean;
 		this.nonPublicAccessAllowed = nonPublicAccessAllowed;
+		this.acc = null;
 		this.destroyMethodName = destroyMethodName;
 		this.beanPostProcessors = postProcessors;
-		this.acc = null;
 	}
 
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
index 71a22243f7..c5239b5aa4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,11 +52,11 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 	 * @return the FactoryBean's object type,
 	 * or {@code null} if the type cannot be determined yet
 	 */
-	protected Class getTypeForFactoryBean(final FactoryBean factoryBean) {
+	protected Class<?> getTypeForFactoryBean(final FactoryBean<?> factoryBean) {
 		try {
 			if (System.getSecurityManager() != null) {
-				return AccessController.doPrivileged(new PrivilegedAction<Class>() {
-					public Class run() {
+				return AccessController.doPrivileged(new PrivilegedAction<Class<?>>() {
+					public Class<?> run() {
 						return factoryBean.getObjectType();
 					}
 				}, getAccessControlContext());
@@ -89,24 +89,50 @@ protected Object getCachedObjectForFactoryBean(String beanName) {
 	 * Obtain an object to expose from the given FactoryBean.
 	 * @param factory the FactoryBean instance
 	 * @param beanName the name of the bean
-	 * @param shouldPostProcess whether the bean is subject for post-processing
+	 * @param shouldPostProcess whether the bean is subject to post-processing
 	 * @return the object obtained from the FactoryBean
 	 * @throws BeanCreationException if FactoryBean object creation failed
 	 * @see org.springframework.beans.factory.FactoryBean#getObject()
 	 */
-	protected Object getObjectFromFactoryBean(FactoryBean factory, String beanName, boolean shouldPostProcess) {
+	protected Object getObjectFromFactoryBean(FactoryBean<?> factory, String beanName, boolean shouldPostProcess) {
 		if (factory.isSingleton() && containsSingleton(beanName)) {
 			synchronized (getSingletonMutex()) {
 				Object object = this.factoryBeanObjectCache.get(beanName);
 				if (object == null) {
-					object = doGetObjectFromFactoryBean(factory, beanName, shouldPostProcess);
-					this.factoryBeanObjectCache.put(beanName, (object != null ? object : NULL_OBJECT));
+					object = doGetObjectFromFactoryBean(factory, beanName);
+					// Only post-process and store if not put there already during getObject() call above
+					// (e.g. because of circular reference processing triggered by custom getBean calls)
+					Object alreadyThere = this.factoryBeanObjectCache.get(beanName);
+					if (alreadyThere != null) {
+						object = alreadyThere;
+					}
+					else {
+						if (object != null && shouldPostProcess) {
+							try {
+								object = postProcessObjectFromFactoryBean(object, beanName);
+							}
+							catch (Throwable ex) {
+								throw new BeanCreationException(beanName,
+										"Post-processing of FactoryBean's singleton object failed", ex);
+							}
+						}
+						this.factoryBeanObjectCache.put(beanName, (object != null ? object : NULL_OBJECT));
+					}
 				}
 				return (object != NULL_OBJECT ? object : null);
 			}
 		}
 		else {
-			return doGetObjectFromFactoryBean(factory, beanName, shouldPostProcess);
+			Object object = doGetObjectFromFactoryBean(factory, beanName);
+			if (object != null && shouldPostProcess) {
+				try {
+					object = postProcessObjectFromFactoryBean(object, beanName);
+				}
+				catch (Throwable ex) {
+					throw new BeanCreationException(beanName, "Post-processing of FactoryBean's object failed", ex);
+				}
+			}
+			return object;
 		}
 	}
 
@@ -114,13 +140,11 @@ protected Object getObjectFromFactoryBean(FactoryBean factory, String beanName,
 	 * Obtain an object to expose from the given FactoryBean.
 	 * @param factory the FactoryBean instance
 	 * @param beanName the name of the bean
-	 * @param shouldPostProcess whether the bean is subject for post-processing
 	 * @return the object obtained from the FactoryBean
 	 * @throws BeanCreationException if FactoryBean object creation failed
 	 * @see org.springframework.beans.factory.FactoryBean#getObject()
 	 */
-	private Object doGetObjectFromFactoryBean(
-			final FactoryBean factory, final String beanName, final boolean shouldPostProcess)
+	private Object doGetObjectFromFactoryBean(final FactoryBean<?> factory, final String beanName)
 			throws BeanCreationException {
 
 		Object object;
@@ -149,23 +173,12 @@ public Object run() throws Exception {
 			throw new BeanCreationException(beanName, "FactoryBean threw exception on object creation", ex);
 		}
 
-
 		// Do not accept a null value for a FactoryBean that's not fully
 		// initialized yet: Many FactoryBeans just return null then.
 		if (object == null && isSingletonCurrentlyInCreation(beanName)) {
 			throw new BeanCurrentlyInCreationException(
 					beanName, "FactoryBean which is currently in creation returned null from getObject");
 		}
-
-		if (object != null && shouldPostProcess) {
-			try {
-				object = postProcessObjectFromFactoryBean(object, beanName);
-			}
-			catch (Throwable ex) {
-				throw new BeanCreationException(beanName, "Post-processing of the FactoryBean's object failed", ex);
-			}
-		}
-
 		return object;
 	}
 
@@ -190,12 +203,12 @@ protected Object postProcessObjectFromFactoryBean(Object object, String beanName
 	 * @return the bean instance as FactoryBean
 	 * @throws BeansException if the given bean cannot be exposed as a FactoryBean
 	 */
-	protected FactoryBean getFactoryBean(String beanName, Object beanInstance) throws BeansException {
+	protected FactoryBean<?> getFactoryBean(String beanName, Object beanInstance) throws BeansException {
 		if (!(beanInstance instanceof FactoryBean)) {
 			throw new BeanCreationException(beanName,
 					"Bean instance of type [" + beanInstance.getClass() + "] is not a FactoryBean");
 		}
-		return (FactoryBean) beanInstance;
+		return (FactoryBean<?>) beanInstance;
 	}
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java
index 82fddd2106..b8f0370cf3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,7 +87,12 @@ public boolean equals(Object other) {
 
 	@Override
 	public String toString() {
-		return "Generic bean: " + super.toString();
+		StringBuilder sb = new StringBuilder("Generic bean");
+		if (this.parentName != null) {
+			sb.append(" with parent '").append(this.parentName).append("'");
+		}
+		sb.append(": ").append(super.toString());
+		return sb.toString();
 	}
 
 }
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java
index 560943d309..6aa560ce01 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,10 +37,9 @@ public class LookupOverride extends MethodOverride {
 
 	/**
 	 * Construct a new LookupOverride.
-	 * @param methodName the name of the method to override.
-	 * This method must have no arguments.
-	 * @param beanName name of the bean in the current BeanFactory
-	 * that the overriden method should return
+	 * @param methodName the name of the method to override
+	 * @param beanName the name of the bean in the current BeanFactory
+	 * that the overridden method should return
 	 */
 	public LookupOverride(String methodName, String beanName) {
 		super(methodName);
@@ -48,6 +47,7 @@ public LookupOverride(String methodName, String beanName) {
 		this.beanName = beanName;
 	}
 
+
 	/**
 	 * Return the name of the bean that should be returned by this method.
 	 */
@@ -55,9 +55,8 @@ public String getBeanName() {
 		return this.beanName;
 	}
 
-
 	/**
-	 * Match method of the given name, with no parameters.
+	 * Match the method of the given name, with no parameters.
 	 */
 	@Override
 	public boolean matches(Method method) {
@@ -65,11 +64,6 @@ public boolean matches(Method method) {
 	}
 
 
-	@Override
-	public String toString() {
-		return "LookupOverride for method '" + getMethodName() + "'; will return bean '" + this.beanName + "'";
-	}
-
 	@Override
 	public boolean equals(Object other) {
 		return (other instanceof LookupOverride && super.equals(other) &&
@@ -81,4 +75,9 @@ public int hashCode() {
 		return (29 * super.hashCode() + ObjectUtils.nullSafeHashCode(this.beanName));
 	}
 
+	@Override
+	public String toString() {
+		return "LookupOverride for method '" + getMethodName() + "'; will return bean '" + this.beanName + "'";
+	}
+
 }
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java
index ecc984a7ce..33f969db4f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,14 +23,15 @@
 import org.springframework.util.ObjectUtils;
 
 /**
- * Object representing the override of a method on a managed
- * object by the IoC container.
+ * Object representing the override of a method on a managed object by the IoC
+ * container.
  *
- * <p>Note that the override mechanism is <i>not</i> intended as a
- * generic means of inserting crosscutting code: use AOP for that.
+ * <p>Note that the override mechanism is <em>not</em> intended as a generic
+ * means of inserting crosscutting code: use AOP for that.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 1.1
  */
 public abstract class MethodOverride implements BeanMetadataElement {
@@ -51,6 +52,7 @@ protected MethodOverride(String methodName) {
 		this.methodName = methodName;
 	}
 
+
 	/**
 	 * Return the name of the method to be overridden.
 	 */
@@ -59,17 +61,18 @@ public String getMethodName() {
 	}
 
 	/**
-	 * Set whether the overridden method has to be considered as overloaded
-	 * (that is, whether arg type matching has to happen).
-	 * <p>Default is "true"; can be switched to "false" to optimize runtime performance.
+	 * Set whether the overridden method is <em>overloaded</em> (i.e., whether argument
+	 * type matching needs to occur to disambiguate methods of the same name).
+	 * <p>Default is {@code true}; can be switched to {@code false} to optimize
+	 * runtime performance.
 	 */
 	protected void setOverloaded(boolean overloaded) {
 		this.overloaded = overloaded;
 	}
 
 	/**
-	 * Return whether the overridden method has to be considered as overloaded
-	 * (that is, whether arg type matching has to happen).
+	 * Return whether the overridden method is <em>overloaded</em> (i.e., whether argument
+	 * type matching needs to occur to disambiguate methods of the same name).
 	 */
 	protected boolean isOverloaded() {
 		return this.overloaded;
@@ -87,11 +90,10 @@ public Object getSource() {
 		return this.source;
 	}
 
-
 	/**
-	 * Subclasses must override this to indicate whether they match
-	 * the given method. This allows for argument list checking
-	 * as well as method name checking.
+	 * Subclasses must override this to indicate whether they <em>match</em> the
+	 * given method. This allows for argument list checking as well as method
+	 * name checking.
 	 * @param method the method to check
 	 * @return whether this override matches the given method
 	 */
@@ -108,7 +110,6 @@ public boolean equals(Object other) {
 		}
 		MethodOverride that = (MethodOverride) other;
 		return (ObjectUtils.nullSafeEquals(this.methodName, that.methodName) &&
-				this.overloaded == that.overloaded &&
 				ObjectUtils.nullSafeEquals(this.source, that.source));
 	}
 
@@ -116,7 +117,6 @@ public boolean equals(Object other) {
 	public int hashCode() {
 		int hashCode = ObjectUtils.nullSafeHashCode(this.methodName);
 		hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.source);
-		hashCode = 29 * hashCode + (this.overloaded ? 1 : 0);
 		return hashCode;
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java
index e570a24c57..55ef696b59 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,6 +52,7 @@ public ReplaceOverride(String methodName, String methodReplacerBeanName) {
 		this.methodReplacerBeanName = methodReplacerBeanName;
 	}
 
+
 	/**
 	 * Return the name of the bean implementing MethodReplacer.
 	 */
@@ -68,28 +69,22 @@ public void addTypeIdentifier(String identifier) {
 		this.typeIdentifiers.add(identifier);
 	}
 
-
 	@Override
 	public boolean matches(Method method) {
-		// TODO could cache result for efficiency
 		if (!method.getName().equals(getMethodName())) {
-			// It can't match.
 			return false;
 		}
-
 		if (!isOverloaded()) {
-			// No overloaded: don't worry about arg type matching.
+			// Not overloaded: don't worry about arg type matching...
 			return true;
 		}
-
-		// If we get to here, we need to insist on precise argument matching.
+		// If we get here, we need to insist on precise argument matching...
 		if (this.typeIdentifiers.size() != method.getParameterTypes().length) {
 			return false;
 		}
 		for (int i = 0; i < this.typeIdentifiers.size(); i++) {
 			String identifier = this.typeIdentifiers.get(i);
 			if (!method.getParameterTypes()[i].getName().contains(identifier)) {
-				// This parameter cannot match.
 				return false;
 			}
 		}
@@ -97,12 +92,6 @@ public boolean matches(Method method) {
 	}
 
 
-	@Override
-	public String toString() {
-		return "Replace override for method '" + getMethodName() + "; will call bean '" +
-				this.methodReplacerBeanName + "'";
-	}
-
 	@Override
 	public boolean equals(Object other) {
 		if (!(other instanceof ReplaceOverride) || !super.equals(other)) {
@@ -121,4 +110,10 @@ public int hashCode() {
 		return hashCode;
 	}
 
+	@Override
+	public String toString() {
+		return "Replace override for method '" + getMethodName() + "; will call bean '" +
+				this.methodReplacerBeanName + "'";
+	}
+
 }
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java
index 64d0555d49..c209e49ff8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java
@@ -18,8 +18,8 @@
 
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -48,19 +48,10 @@
 @SuppressWarnings("serial")
 public class RootBeanDefinition extends AbstractBeanDefinition {
 
-	// using a ConcurrentHashMap as a Set
-	private final Map<Member, Boolean> externallyManagedConfigMembers = new ConcurrentHashMap<Member, Boolean>(0);
-
-	// using a ConcurrentHashMap as a Set
-	private final Map<String, Boolean> externallyManagedInitMethods = new ConcurrentHashMap<String, Boolean>(0);
-
-	// using a ConcurrentHashMap as a Set
-	private final Map<String, Boolean> externallyManagedDestroyMethods = new ConcurrentHashMap<String, Boolean>(0);
+	boolean allowCaching = true;
 
 	private BeanDefinitionHolder decoratedDefinition;
 
-	boolean allowCaching = true;
-
 	private volatile Class<?> targetType;
 
 	boolean isFactoryMethodUnique = false;
@@ -87,6 +78,12 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
 	/** Package-visible field that indicates a before-instantiation post-processor having kicked in */
 	volatile Boolean beforeInstantiationResolved;
 
+	private Set<Member> externallyManagedConfigMembers;
+
+	private Set<String> externallyManagedInitMethods;
+
+	private Set<String> externallyManagedDestroyMethods;
+
 
 	/**
 	 * Create a new RootBeanDefinition, to be configured through its bean
@@ -107,7 +104,7 @@ public RootBeanDefinition() {
 	 * Create a new RootBeanDefinition for a singleton.
 	 * @param beanClass the class of the bean to instantiate
 	 */
-	public RootBeanDefinition(Class beanClass) {
+	public RootBeanDefinition(Class<?> beanClass) {
 		super();
 		setBeanClass(beanClass);
 	}
@@ -147,7 +144,7 @@ public RootBeanDefinition(Class beanClass, int autowireMode) {
 	 * @param dependencyCheck whether to perform a dependency check for objects
 	 * (not applicable to autowiring a constructor, thus ignored there)
 	 */
-	public RootBeanDefinition(Class beanClass, int autowireMode, boolean dependencyCheck) {
+	public RootBeanDefinition(Class<?> beanClass, int autowireMode, boolean dependencyCheck) {
 		super();
 		setBeanClass(beanClass);
 		setAutowireMode(autowireMode);
@@ -191,7 +188,7 @@ public RootBeanDefinition(Class beanClass, MutablePropertyValues pvs, boolean si
 	 * @param cargs the constructor argument values to apply
 	 * @param pvs the property values to apply
 	 */
-	public RootBeanDefinition(Class beanClass, ConstructorArgumentValues cargs, MutablePropertyValues pvs) {
+	public RootBeanDefinition(Class<?> beanClass, ConstructorArgumentValues cargs, MutablePropertyValues pvs) {
 		super(cargs, pvs);
 		setBeanClass(beanClass);
 	}
@@ -225,7 +222,11 @@ public RootBeanDefinition(String beanClassName, ConstructorArgumentValues cargs,
 	 * @param original the original bean definition to copy from
 	 */
 	public RootBeanDefinition(RootBeanDefinition original) {
-		this((BeanDefinition) original);
+		super((BeanDefinition) original);
+		this.allowCaching = original.allowCaching;
+		this.decoratedDefinition = original.decoratedDefinition;
+		this.targetType = original.targetType;
+		this.isFactoryMethodUnique = original.isFactoryMethodUnique;
 	}
 
 	/**
@@ -235,13 +236,6 @@ public RootBeanDefinition(RootBeanDefinition original) {
 	 */
 	RootBeanDefinition(BeanDefinition original) {
 		super(original);
-		if (original instanceof RootBeanDefinition) {
-			RootBeanDefinition originalRbd = (RootBeanDefinition) original;
-			this.decoratedDefinition = originalRbd.decoratedDefinition;
-			this.allowCaching = originalRbd.allowCaching;
-			this.targetType = originalRbd.targetType;
-			this.isFactoryMethodUnique = originalRbd.isFactoryMethodUnique;
-		}
 	}
 
 
@@ -255,6 +249,20 @@ public void setParentName(String parentName) {
 		}
 	}
 
+	/**
+	 * Register a target definition that is being decorated by this bean definition.
+	 */
+	public void setDecoratedDefinition(BeanDefinitionHolder decoratedDefinition) {
+		this.decoratedDefinition = decoratedDefinition;
+	}
+
+	/**
+	 * Return the target definition that is being decorated by this bean definition, if any.
+	 */
+	public BeanDefinitionHolder getDecoratedDefinition() {
+		return this.decoratedDefinition;
+	}
+
 	/**
 	 * Specify the target type of this bean definition, if known in advance.
 	 */
@@ -297,37 +305,52 @@ public Method getResolvedFactoryMethod() {
 		}
 	}
 
-
 	public void registerExternallyManagedConfigMember(Member configMember) {
-		this.externallyManagedConfigMembers.put(configMember, Boolean.TRUE);
+		synchronized (this.postProcessingLock) {
+			if (this.externallyManagedConfigMembers == null) {
+				this.externallyManagedConfigMembers = new HashSet<Member>(1);
+			}
+			this.externallyManagedConfigMembers.add(configMember);
+		}
 	}
 
 	public boolean isExternallyManagedConfigMember(Member configMember) {
-		return this.externallyManagedConfigMembers.containsKey(configMember);
+		synchronized (this.postProcessingLock) {
+			return (this.externallyManagedConfigMembers != null &&
+					this.externallyManagedConfigMembers.contains(configMember));
+		}
 	}
 
 	public void registerExternallyManagedInitMethod(String initMethod) {
-		this.externallyManagedInitMethods.put(initMethod, Boolean.TRUE);
+		synchronized (this.postProcessingLock) {
+			if (this.externallyManagedInitMethods == null) {
+				this.externallyManagedInitMethods = new HashSet<String>(1);
+			}
+			this.externallyManagedInitMethods.add(initMethod);
+		}
 	}
 
 	public boolean isExternallyManagedInitMethod(String initMethod) {
-		return this.externallyManagedInitMethods.containsKey(initMethod);
+		synchronized (this.postProcessingLock) {
+			return (this.externallyManagedInitMethods != null &&
+					this.externallyManagedInitMethods.contains(initMethod));
+		}
 	}
 
 	public void registerExternallyManagedDestroyMethod(String destroyMethod) {
-		this.externallyManagedDestroyMethods.put(destroyMethod, Boolean.TRUE);
+		synchronized (this.postProcessingLock) {
+			if (this.externallyManagedDestroyMethods == null) {
+				this.externallyManagedDestroyMethods = new HashSet<String>(1);
+			}
+			this.externallyManagedDestroyMethods.add(destroyMethod);
+		}
 	}
 
 	public boolean isExternallyManagedDestroyMethod(String destroyMethod) {
-		return this.externallyManagedDestroyMethods.containsKey(destroyMethod);
-	}
-
-	public void setDecoratedDefinition(BeanDefinitionHolder decoratedDefinition) {
-		this.decoratedDefinition = decoratedDefinition;
-	}
-
-	public BeanDefinitionHolder getDecoratedDefinition() {
-		return this.decoratedDefinition;
+		synchronized (this.postProcessingLock) {
+			return (this.externallyManagedDestroyMethods != null &&
+					this.externallyManagedDestroyMethods.contains(destroyMethod));
+		}
 	}
 
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java
index b06904221f..cdc12a1dbf 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java
@@ -62,14 +62,14 @@ public Object instantiate(RootBeanDefinition beanDefinition, String beanName, Be
 			synchronized (beanDefinition.constructorArgumentLock) {
 				constructorToUse = (Constructor<?>) beanDefinition.resolvedConstructorOrFactoryMethod;
 				if (constructorToUse == null) {
-					final Class clazz = beanDefinition.getBeanClass();
+					final Class<?> clazz = beanDefinition.getBeanClass();
 					if (clazz.isInterface()) {
 						throw new BeanInstantiationException(clazz, "Specified class is an interface");
 					}
 					try {
 						if (System.getSecurityManager() != null) {
 							constructorToUse = AccessController.doPrivileged(new PrivilegedExceptionAction<Constructor>() {
-								public Constructor run() throws Exception {
+								public Constructor<?> run() throws Exception {
 									return clazz.getDeclaredConstructor((Class[]) null);
 								}
 							});
@@ -132,7 +132,7 @@ public Object run() {
 	 * Instantiation should use the given constructor and parameters.
 	 */
 	protected Object instantiateWithMethodInjection(RootBeanDefinition beanDefinition,
-			String beanName, BeanFactory owner, Constructor ctor, Object[] args) {
+			String beanName, BeanFactory owner, Constructor<?> ctor, Object[] args) {
 
 		throw new UnsupportedOperationException(
 				"Method Injection not supported in SimpleInstantiationStrategy");
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
index 4eef1b4751..16681cc4f3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ public Object getBean(String name) throws BeansException {
 
 		if (bean instanceof FactoryBean && !BeanFactoryUtils.isFactoryDereference(name)) {
 			try {
-				return ((FactoryBean) bean).getObject();
+				return ((FactoryBean<?>) bean).getObject();
 			}
 			catch (Exception ex) {
 				throw new BeanCreationException(beanName, "FactoryBean threw exception on object creation", ex);
@@ -129,7 +129,7 @@ else if (beanNames.length > 1) {
 	public Object getBean(String name, Object... args) throws BeansException {
 		if (args != null) {
 			throw new UnsupportedOperationException(
-					"StaticListableBeanFactory does not support explicit bean creation arguments)");
+					"StaticListableBeanFactory does not support explicit bean creation arguments");
 		}
 		return getBean(name);
 	}
@@ -141,18 +141,18 @@ public boolean containsBean(String name) {
 	public boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
 		Object bean = getBean(name);
 		// In case of FactoryBean, return singleton status of created object.
-		return (bean instanceof FactoryBean && ((FactoryBean) bean).isSingleton());
+		return (bean instanceof FactoryBean && ((FactoryBean<?>) bean).isSingleton());
 	}
 
 	public boolean isPrototype(String name) throws NoSuchBeanDefinitionException {
 		Object bean = getBean(name);
 		// In case of FactoryBean, return prototype status of created object.
-		return ((bean instanceof SmartFactoryBean && ((SmartFactoryBean) bean).isPrototype()) ||
-				(bean instanceof FactoryBean && !((FactoryBean) bean).isSingleton()));
+		return ((bean instanceof SmartFactoryBean && ((SmartFactoryBean<?>) bean).isPrototype()) ||
+				(bean instanceof FactoryBean && !((FactoryBean<?>) bean).isSingleton()));
 	}
 
-	public boolean isTypeMatch(String name, Class targetType) throws NoSuchBeanDefinitionException {
-		Class type = getType(name);
+	public boolean isTypeMatch(String name, Class<?> targetType) throws NoSuchBeanDefinitionException {
+		Class<?> type = getType(name);
 		return (targetType == null || (type != null && targetType.isAssignableFrom(type)));
 	}
 
@@ -167,7 +167,7 @@ public Class<?> getType(String name) throws NoSuchBeanDefinitionException {
 
 		if (bean instanceof FactoryBean && !BeanFactoryUtils.isFactoryDereference(name)) {
 			// If it's a FactoryBean, we want to look at what it creates, not the factory class.
-			return ((FactoryBean) bean).getObjectType();
+			return ((FactoryBean<?>) bean).getObjectType();
 		}
 		return bean.getClass();
 	}
@@ -193,18 +193,18 @@ public String[] getBeanDefinitionNames() {
 		return StringUtils.toStringArray(this.beans.keySet());
 	}
 
-	public String[] getBeanNamesForType(Class type) {
+	public String[] getBeanNamesForType(Class<?> type) {
 		return getBeanNamesForType(type, true, true);
 	}
 
-	public String[] getBeanNamesForType(Class type, boolean includeNonSingletons, boolean includeFactoryBeans) {
+	public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons, boolean includeFactoryBeans) {
 		boolean isFactoryType = (type != null && FactoryBean.class.isAssignableFrom(type));
 		List<String> matches = new ArrayList<String>();
 		for (String name : this.beans.keySet()) {
 			Object beanInstance = this.beans.get(name);
 			if (beanInstance instanceof FactoryBean && !isFactoryType) {
 				if (includeFactoryBeans) {
-					Class objectType = ((FactoryBean) beanInstance).getObjectType();
+					Class<?> objectType = ((FactoryBean<?>) beanInstance).getObjectType();
 					if (objectType != null && (type == null || type.isAssignableFrom(objectType))) {
 						matches.add(name);
 					}
@@ -237,8 +237,8 @@ public <T> Map<String, T> getBeansOfType(Class<T> type, boolean includeNonSingle
 			if (beanInstance instanceof FactoryBean && !isFactoryType) {
 				if (includeFactoryBeans) {
 					// Match object created by FactoryBean.
-					FactoryBean factory = (FactoryBean) beanInstance;
-					Class objectType = factory.getObjectType();
+					FactoryBean<?> factory = (FactoryBean<?>) beanInstance;
+					Class<?> objectType = factory.getObjectType();
 					if ((includeNonSingletons || factory.isSingleton()) &&
 							objectType != null && (type == null || type.isAssignableFrom(objectType))) {
 						matches.put(beanName, getBean(beanName, type));
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java
index 0bfcb375da..70adeede2b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java
@@ -149,7 +149,7 @@ protected void doParse(Element element, ParserContext parserContext, BeanDefinit
 	 */
 	protected boolean isEligibleAttribute(Attr attribute, ParserContext parserContext) {
 		boolean eligible = isEligibleAttribute(attribute);
-		if(!eligible) {
+		if (!eligible) {
 			String fullName = attribute.getName();
 			eligible = (!fullName.equals("xmlns") && !fullName.startsWith("xmlns:") &&
 					isEligibleAttribute(parserContext.getDelegate().getLocalName(attribute)));
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java
index ffe9d294d9..a41138fd36 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,9 @@ public interface BeanDefinitionDocumentReader {
 	 * Set the Environment to use when reading bean definitions.
 	 * <p>Used for evaluating profile information to determine whether a
 	 * {@code <beans/>} document/element should be included or ignored.
+	 * @deprecated in favor of Environment access via XmlReaderContext
 	 */
+	@Deprecated
 	void setEnvironment(Environment environment);
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
index de4c3e695e..6be94c1a89 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,6 @@
 import org.springframework.beans.factory.support.MethodOverrides;
 import org.springframework.beans.factory.support.ReplaceOverride;
 import org.springframework.core.env.Environment;
-import org.springframework.core.env.StandardEnvironment;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
@@ -246,12 +245,12 @@ public class BeanDefinitionParserDelegate {
 
 	private final XmlReaderContext readerContext;
 
+	private final Environment environment;
+
 	private final DocumentDefaultsDefinition defaults = new DocumentDefaultsDefinition();
 
 	private final ParseState parseState = new ParseState();
 
-	private Environment environment;
-
 	/**
 	 * Stores all used bean names so we can enforce uniqueness on a per
 	 * beans-element basis. Duplicate bean ids/names may not exist within the
@@ -261,26 +260,24 @@ public class BeanDefinitionParserDelegate {
 
 
 	/**
-	 * Create a new BeanDefinitionParserDelegate associated with the
-	 * supplied {@link XmlReaderContext} and {@link Environment}.
+	 * Create a new BeanDefinitionParserDelegate associated with the supplied
+	 * {@link XmlReaderContext}.
+	 */
+	public BeanDefinitionParserDelegate(XmlReaderContext readerContext) {
+		this(readerContext, readerContext.getReader().getEnvironment());
+	}
+
+	/**
+	 * Create a new BeanDefinitionParserDelegate associated with the supplied
+	 * {@link XmlReaderContext}.
 	 */
 	public BeanDefinitionParserDelegate(XmlReaderContext readerContext, Environment environment) {
 		Assert.notNull(readerContext, "XmlReaderContext must not be null");
-		Assert.notNull(readerContext, "Environment must not be null");
+		Assert.notNull(environment, "Environment must not be null");
 		this.readerContext = readerContext;
 		this.environment = environment;
 	}
 
-	/**
-	 * Create a new BeanDefinitionParserDelegate associated with the
-	 * supplied {@link XmlReaderContext} and a new {@link StandardEnvironment}.
-	 * @deprecated since Spring 3.1 in favor of
-	 * {@link #BeanDefinitionParserDelegate(XmlReaderContext, Environment)}
-	 */
-	@Deprecated
-	public BeanDefinitionParserDelegate(XmlReaderContext readerContext) {
-		this(readerContext, new StandardEnvironment());
-	}
 
 	/**
 	 * Get the {@link XmlReaderContext} associated with this helper instance.
@@ -326,6 +323,13 @@ protected void error(String message, Element source, Throwable cause) {
 	}
 
 
+	/**
+	 * Initialize the default settings assuming a {@code null} parent delegate.
+	 */
+	public void initDefaults(Element root) {
+		initDefaults(root, null);
+	}
+
 	/**
 	 * Initialize the default lazy-init, autowire, dependency check settings,
 	 * init-method, destroy-method and merge settings. Support nested 'beans'
@@ -339,16 +343,6 @@ public void initDefaults(Element root, BeanDefinitionParserDelegate parent) {
 		this.readerContext.fireDefaultsRegistered(this.defaults);
 	}
 
-	/**
-	 * Initialize the default settings assuming a {@code null} parent delegate.
-	 * @deprecated in Spring 3.1 in favor of
-	 * {@link #initDefaults(Element, BeanDefinitionParserDelegate)}
-	 */
-	@Deprecated
-	public void initDefaults(Element root) {
-		initDefaults(root, null);
-	}
-
 	/**
 	 * Populate the given DocumentDefaultsDefinition instance with the default lazy-init,
 	 * autowire, dependency check settings, init-method, destroy-method and merge settings.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
index a422d5b4fc..63bdfc3ec7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,6 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.ResourcePatternUtils;
-import org.springframework.util.Assert;
 import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 
@@ -84,19 +83,13 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume
 	private BeanDefinitionParserDelegate delegate;
 
 
-	/**
-	 * {@inheritDoc}
-	 * <p>Default value is {@code null}; property is required for parsing any
-	 * {@code <beans/>} element with a {@code profile} attribute present.
-	 * @see #doRegisterBeanDefinitions
-	 */
+	@Deprecated
 	public void setEnvironment(Environment environment) {
 		this.environment = environment;
 	}
 
 	/**
-	 * {@inheritDoc}
-	 * <p>This implementation parses bean definitions according to the "spring-beans" XSD
+	 * This implementation parses bean definitions according to the "spring-beans" XSD
 	 * (or DTD, historically).
 	 * <p>Opens a DOM Document; then initializes the default settings
 	 * specified at the {@code <beans/>} level; then parses the contained bean definitions.
@@ -108,20 +101,35 @@ public void registerBeanDefinitions(Document doc, XmlReaderContext readerContext
 		doRegisterBeanDefinitions(root);
 	}
 
+	/**
+	 * Return the descriptor for the XML resource that this parser works on.
+	 */
+	protected final XmlReaderContext getReaderContext() {
+		return this.readerContext;
+	}
+
+	/**
+	 * Invoke the {@link org.springframework.beans.factory.parsing.SourceExtractor} to pull the
+	 * source metadata from the supplied {@link Element}.
+	 */
+	protected Object extractSource(Element ele) {
+		return getReaderContext().extractSource(ele);
+	}
+
+	private Environment getEnvironment() {
+		return (this.environment != null ? this.environment : getReaderContext().getReader().getEnvironment());
+	}
+
 
 	/**
 	 * Register each bean definition within the given root {@code <beans/>} element.
-	 * @throws IllegalStateException if {@code <beans profile="..."} attribute is present
-	 * and Environment property has not been set
-	 * @see #setEnvironment
 	 */
 	protected void doRegisterBeanDefinitions(Element root) {
 		String profileSpec = root.getAttribute(PROFILE_ATTRIBUTE);
 		if (StringUtils.hasText(profileSpec)) {
-			Assert.state(this.environment != null, "Environment must be set for evaluating profiles");
 			String[] specifiedProfiles = StringUtils.tokenizeToStringArray(
 					profileSpec, BeanDefinitionParserDelegate.MULTI_VALUE_ATTRIBUTE_DELIMITERS);
-			if (!this.environment.acceptsProfiles(specifiedProfiles)) {
+			if (!getEnvironment().acceptsProfiles(specifiedProfiles)) {
 				return;
 			}
 		}
@@ -133,7 +141,7 @@ protected void doRegisterBeanDefinitions(Element root) {
 		// then ultimately reset this.delegate back to its original (parent) reference.
 		// this behavior emulates a stack of delegates without actually necessitating one.
 		BeanDefinitionParserDelegate parent = this.delegate;
-		this.delegate = createHelper(this.readerContext, root, parent);
+		this.delegate = createDelegate(this.readerContext, root, parent);
 
 		preProcessXml(root);
 		parseBeanDefinitions(root, this.delegate);
@@ -142,30 +150,24 @@ protected void doRegisterBeanDefinitions(Element root) {
 		this.delegate = parent;
 	}
 
-	protected BeanDefinitionParserDelegate createHelper(
+	protected BeanDefinitionParserDelegate createDelegate(
 			XmlReaderContext readerContext, Element root, BeanDefinitionParserDelegate parentDelegate) {
 
-		BeanDefinitionParserDelegate delegate = new BeanDefinitionParserDelegate(readerContext, environment);
-		delegate.initDefaults(root, parentDelegate);
+		BeanDefinitionParserDelegate delegate = createHelper(readerContext, root, parentDelegate);
+		if (delegate == null) {
+			delegate = new BeanDefinitionParserDelegate(readerContext, getEnvironment());
+			delegate.initDefaults(root, parentDelegate);
+		}
 		return delegate;
 	}
 
-	/**
-	 * Return the descriptor for the XML resource that this parser works on.
-	 */
-	protected final XmlReaderContext getReaderContext() {
-		return this.readerContext;
-	}
+	@Deprecated
+	protected BeanDefinitionParserDelegate createHelper(
+			XmlReaderContext readerContext, Element root, BeanDefinitionParserDelegate parentDelegate) {
 
-	/**
-	 * Invoke the {@link org.springframework.beans.factory.parsing.SourceExtractor} to pull the
-	 * source metadata from the supplied {@link Element}.
-	 */
-	protected Object extractSource(Element ele) {
-		return this.readerContext.extractSource(ele);
+		return null;
 	}
 
-
 	/**
 	 * Parse the elements at the root level in the document:
 	 * "import", "alias", "bean".
@@ -220,7 +222,7 @@ protected void importBeanDefinitionResource(Element ele) {
 		}
 
 		// Resolve system properties: e.g. "${user.dir}"
-		location = environment.resolveRequiredPlaceholders(location);
+		location = getEnvironment().resolveRequiredPlaceholders(location);
 
 		Set<Resource> actualResources = new LinkedHashSet<Resource>(4);
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
index 4110ed0a22..171de343a3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,20 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.beans.factory.xml;
 
 import java.util.Collection;
 
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.core.Conventions;
 import org.springframework.util.StringUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
 /**
  * Simple {@code NamespaceHandler} implementation that maps custom
@@ -34,8 +36,7 @@
  * that this {@code NamespaceHandler} does not have a corresponding schema
  * since there is no way to know in advance all possible attribute names.
  *
- * <p>
- * An example of the usage of this {@code NamespaceHandler} is shown below:
+ * <p>An example of the usage of this {@code NamespaceHandler} is shown below:
  *
  * <pre class="code">
  * &lt;bean id=&quot;author&quot; class=&quot;..TestBean&quot; c:name=&quot;Enescu&quot; c:work-ref=&quot;compositions&quot;/&gt;
@@ -51,14 +52,17 @@
  * support for indexes or types. Further more, the names are used as hints by
  * the container which, by default, does type introspection.
  *
- * @see SimplePropertyNamespaceHandler
  * @author Costin Leau
+ * @since 3.1
+ * @see SimplePropertyNamespaceHandler
  */
 public class SimpleConstructorNamespaceHandler implements NamespaceHandler {
 
 	private static final String REF_SUFFIX = "-ref";
+
 	private static final String DELIMITER_PREFIX = "_";
 
+
 	public void init() {
 	}
 
@@ -99,7 +103,8 @@ public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition,
 					int index = -1;
 					try {
 						index = Integer.parseInt(arg);
-					} catch (NumberFormatException ex) {
+					}
+					catch (NumberFormatException ex) {
 						parserContext.getReaderContext().error(
 								"Constructor argument '" + argName + "' specifies an invalid integer", attr);
 					}
@@ -133,11 +138,8 @@ public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition,
 	}
 
 	private boolean containsArgWithName(String name, ConstructorArgumentValues cvs) {
-		if (!checkName(name, cvs.getGenericArgumentValues())) {
-			return checkName(name, cvs.getIndexedArgumentValues().values());
-		}
-
-		return true;
+		return (checkName(name, cvs.getGenericArgumentValues()) ||
+				checkName(name, cvs.getIndexedArgumentValues().values()));
 	}
 
 	private boolean checkName(String name, Collection<ValueHolder> values) {
@@ -148,4 +150,5 @@ private boolean checkName(String name, Collection<ValueHolder> values) {
 		}
 		return false;
 	}
+
 }
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
index 16b58500bc..860799adc8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,6 +135,7 @@ public XmlBeanDefinitionReader(BeanDefinitionRegistry registry) {
 		super(registry);
 	}
 
+
 	/**
 	 * Set whether to use XML validation. Default is {@code true}.
 	 * <p>This method switches namespace awareness on if validation is turned off,
@@ -486,9 +487,10 @@ protected int detectValidationMode(Resource resource) {
 	 * @see #setDocumentReaderClass
 	 * @see BeanDefinitionDocumentReader#registerBeanDefinitions
 	 */
+	@SuppressWarnings("deprecation")
 	public int registerBeanDefinitions(Document doc, Resource resource) throws BeanDefinitionStoreException {
 		BeanDefinitionDocumentReader documentReader = createBeanDefinitionDocumentReader();
-		documentReader.setEnvironment(this.getEnvironment());
+		documentReader.setEnvironment(getEnvironment());
 		int countBefore = getRegistry().getBeanDefinitionCount();
 		documentReader.registerBeanDefinitions(doc, createReaderContext(resource));
 		return getRegistry().getBeanDefinitionCount() - countBefore;
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java
index 985ba1723c..a27d708e0c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -97,6 +97,7 @@ public CustomBooleanEditor(String trueString, String falseString, boolean allowE
 		this.allowEmpty = allowEmpty;
 	}
 
+
 	@Override
 	public void setAsText(String text) throws IllegalArgumentException {
 		String input = (text != null ? text.trim() : null);
@@ -104,20 +105,20 @@ public void setAsText(String text) throws IllegalArgumentException {
 			// Treat empty String as null value.
 			setValue(null);
 		}
-		else if (this.trueString != null && input.equalsIgnoreCase(this.trueString)) {
+		else if (this.trueString != null && this.trueString.equalsIgnoreCase(input)) {
 			setValue(Boolean.TRUE);
 		}
-		else if (this.falseString != null && input.equalsIgnoreCase(this.falseString)) {
+		else if (this.falseString != null && this.falseString.equalsIgnoreCase(input)) {
 			setValue(Boolean.FALSE);
 		}
 		else if (this.trueString == null &&
-				(input.equalsIgnoreCase(VALUE_TRUE) || input.equalsIgnoreCase(VALUE_ON) ||
-				input.equalsIgnoreCase(VALUE_YES) || input.equals(VALUE_1))) {
+				(VALUE_TRUE.equalsIgnoreCase(input) || VALUE_ON.equalsIgnoreCase(input) ||
+						VALUE_YES.equalsIgnoreCase(input) || VALUE_1.equals(input))) {
 			setValue(Boolean.TRUE);
 		}
 		else if (this.falseString == null &&
-				(input.equalsIgnoreCase(VALUE_FALSE) || input.equalsIgnoreCase(VALUE_OFF) ||
-				input.equalsIgnoreCase(VALUE_NO) || input.equals(VALUE_0))) {
+				(VALUE_FALSE.equalsIgnoreCase(input) || VALUE_OFF.equalsIgnoreCase(input) ||
+						VALUE_NO.equalsIgnoreCase(input) || VALUE_0.equals(input))) {
 			setValue(Boolean.FALSE);
 		}
 		else {
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java
index 24467400fa..7a827c9481 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,13 @@
 
 package org.springframework.beans.propertyeditors;
 
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
 import java.beans.PropertyEditorSupport;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
 /**
  * {@link java.beans.PropertyEditor} implementation for
  * {@link java.util.ResourceBundle ResourceBundles}.
@@ -87,7 +87,8 @@ public void setAsText(String text) throws IllegalArgumentException {
 		int indexOfBaseNameSeparator = rawBaseName.indexOf(BASE_NAME_SEPARATOR);
 		if (indexOfBaseNameSeparator == -1) {
 			bundle = ResourceBundle.getBundle(rawBaseName);
-		} else {
+		}
+		else {
 			// it potentially has locale information
 			String baseName = rawBaseName.substring(0, indexOfBaseNameSeparator);
 			if (!StringUtils.hasText(baseName)) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java b/spring-beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java
index 3f4abc6568..e2df19e3ca 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/ResourceEditorRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,9 +78,12 @@ public ResourceEditorRegistrar(ResourceLoader resourceLoader) {
 	}
 
 	/**
-	 * Create a new ResourceEditorRegistrar for the given ResourceLoader
+	 * Create a new ResourceEditorRegistrar for the given {@link ResourceLoader}
+	 * and {@link PropertyResolver}.
 	 * @param resourceLoader the ResourceLoader (or ResourcePatternResolver)
 	 * to create editors for (usually an ApplicationContext)
+	 * @param propertyResolver the PropertyResolver (usually an Environment)
+	 * @see org.springframework.core.env.Environment
 	 * @see org.springframework.core.io.support.ResourcePatternResolver
 	 * @see org.springframework.context.ApplicationContext
 	 */
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
index b35e6aabf7..246421c634 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
@@ -16,8 +16,6 @@
 
 package org.springframework.beans;
 
-import static org.junit.Assert.*;
-
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
@@ -25,6 +23,7 @@
 import java.util.List;
 
 import org.junit.Test;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.core.io.Resource;
@@ -33,6 +32,7 @@
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
 
 /**
  * Unit tests for {@link BeanUtils}.
@@ -79,8 +79,7 @@ public void testGetPropertyDescriptors() throws Exception {
 	@Test
 	public void testBeanPropertyIsArray() {
 		PropertyDescriptor[] descriptors = BeanUtils.getPropertyDescriptors(ContainerBean.class);
-		for (int i = 0; i < descriptors.length; i++) {
-			PropertyDescriptor descriptor = descriptors[i];
+		for (PropertyDescriptor descriptor : descriptors) {
 			if ("containedBeans".equals(descriptor.getName())) {
 				assertTrue("Property should be an array", descriptor.getPropertyType().isArray());
 				assertEquals(descriptor.getPropertyType().getComponentType(), ContainedBean.class);
@@ -171,7 +170,7 @@ public void testCopyPropertiesWithIgnore() throws Exception {
 		assertTrue("Touchy empty", tb2.getTouchy() == null);
 
 		// "spouse", "touchy", "age" should not be copied
-		BeanUtils.copyProperties(tb, tb2, new String[]{"spouse", "touchy", "age"});
+		BeanUtils.copyProperties(tb, tb2, "spouse", "touchy", "age");
 		assertTrue("Name copied", tb2.getName() == null);
 		assertTrue("Age still empty", tb2.getAge() == 0);
 		assertTrue("Touchy still empty", tb2.getTouchy() == null);
@@ -182,10 +181,23 @@ public void testCopyPropertiesWithIgnoredNonExistingProperty() {
 		NameAndSpecialProperty source = new NameAndSpecialProperty();
 		source.setName("name");
 		TestBean target = new TestBean();
-		BeanUtils.copyProperties(source, target, new String[]{"specialProperty"});
+		BeanUtils.copyProperties(source, target, "specialProperty");
 		assertEquals(target.getName(), "name");
 	}
 
+	@Test
+	public void testCopyPropertiesWithInvalidProperty() {
+		InvalidProperty source = new InvalidProperty();
+		source.setName("name");
+		source.setFlag1(true);
+		source.setFlag2(true);
+		InvalidProperty target = new InvalidProperty();
+		BeanUtils.copyProperties(source, target);
+		assertEquals(target.getName(), "name");
+		assertTrue(target.getFlag1());
+		assertTrue(target.getFlag2());
+	}
+
 	@Test
 	public void testResolveSimpleSignature() throws Exception {
 		Method desiredMethod = MethodSignatureBean.class.getMethod("doSomething");
@@ -257,7 +269,8 @@ public void testSPR6063() {
 		assertEquals(String.class, keyDescr.getPropertyType());
 		for (PropertyDescriptor propertyDescriptor : descrs) {
 			if (propertyDescriptor.getName().equals(keyDescr.getName())) {
-				assertEquals(propertyDescriptor.getName() + " has unexpected type", keyDescr.getPropertyType(), propertyDescriptor.getPropertyType());
+				assertEquals(propertyDescriptor.getName() + " has unexpected type",
+						keyDescr.getPropertyType(), propertyDescriptor.getPropertyType());
 			}
 		}
 	}
@@ -292,6 +305,51 @@ public int getSpecialProperty() {
 	}
 
 
+	@SuppressWarnings("unused")
+	private static class InvalidProperty {
+
+		private String name;
+
+		private String value;
+
+		private boolean flag1;
+
+		private boolean flag2;
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setValue(int value) {
+			this.value = Integer.toString(value);
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public void setFlag1(boolean flag1) {
+			this.flag1 = flag1;
+		}
+
+		public Boolean getFlag1() {
+			return this.flag1;
+		}
+
+		public void setFlag2(Boolean flag2) {
+			this.flag2 = flag2;
+		}
+
+		public boolean getFlag2() {
+			return this.flag2;
+		}
+	}
+
+
 	@SuppressWarnings("unused")
 	private static class ContainerBean {
 
@@ -347,6 +405,7 @@ public void doSomethingWithAMultiDimensionalArray(String[][] strings) {
 		}
 	}
 
+
 	private interface MapEntry<K, V> {
 
 		K getKey();
@@ -358,6 +417,7 @@ private interface MapEntry<K, V> {
 		void setValue(V value);
 	}
 
+
 	private static class Bean implements MapEntry<String, String> {
 
 		private String key;
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
index 9ec9af033b..7533d39a7b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,6 @@
 
 package org.springframework.beans;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.beans.PropertyEditorSupport;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -44,11 +37,16 @@
 
 import org.apache.commons.logging.LogFactory;
 import org.junit.Test;
+
 import org.springframework.beans.factory.annotation.Autowire;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
 import org.springframework.beans.propertyeditors.StringArrayPropertyEditor;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.beans.support.DerivedFromProtectedBaseBean;
+import org.springframework.core.convert.ConversionFailedException;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.tests.Assume;
 import org.springframework.tests.TestGroup;
 import org.springframework.tests.sample.beans.BooleanTestBean;
@@ -56,13 +54,11 @@
 import org.springframework.tests.sample.beans.IndexedTestBean;
 import org.springframework.tests.sample.beans.NumberTestBean;
 import org.springframework.tests.sample.beans.TestBean;
-import org.springframework.core.convert.ConversionFailedException;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.util.StopWatch;
 import org.springframework.util.StringUtils;
 
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 /**
  * @author Rod Johnson
@@ -1553,14 +1549,55 @@ public void testWildcardedGenericEnum() {
 	@Test
 	public void cornerSpr10115() {
 		Spr10115Bean foo = new Spr10115Bean();
-		BeanWrapperImpl bwi = new BeanWrapperImpl();
-		bwi.setWrappedInstance(foo);
+		BeanWrapperImpl bwi = new BeanWrapperImpl(foo);
 		bwi.setPropertyValue("prop1", "val1");
 		assertEquals("val1", Spr10115Bean.prop1);
 	}
 
+	@Test
+	public void testArrayToObject() {
+		ArrayToObject foo = new ArrayToObject();
+		BeanWrapperImpl bwi = new BeanWrapperImpl(foo);
+
+		Object[] array = new Object[] {"1","2"};
+		bwi.setPropertyValue("object", array);
+		assertThat(foo.getObject(), equalTo((Object) array));
+
+		array = new Object[] {"1"};
+		bwi.setPropertyValue("object", array);
+		assertThat(foo.getObject(), equalTo((Object) array));
+	}
+
+	@Test
+	public void testPropertyTypeMismatch() {
+		PropertyTypeMismatch foo = new PropertyTypeMismatch();
+		BeanWrapperImpl bwi = new BeanWrapperImpl(foo);
+		bwi.setPropertyValue("object", "a String");
+		assertEquals("a String", foo.value);
+		assertEquals(8, bwi.getPropertyValue("object"));
+	}
+
+	@Test
+	public void testGenericArraySetter() {
+		SkipReaderStub foo = new SkipReaderStub();
+		BeanWrapperImpl bwi = new BeanWrapperImpl(foo);
+		List<String> values = new LinkedList<String>();
+		values.add("1");
+		values.add("2");
+		values.add("3");
+		values.add("4");
+		bwi.setPropertyValue("items", values);
+		Object[] result = foo.items;
+		assertEquals(4, result.length);
+		assertEquals("1", result[0]);
+		assertEquals("2", result[1]);
+		assertEquals("3", result[2]);
+		assertEquals("4", result[3]);
+	}
+
 
 	static class Spr10115Bean {
+
 		private static String prop1;
 
 		public static void setProp1(String prop1) {
@@ -1944,4 +1981,49 @@ public enum TestEnum {
 		TEST_VALUE
 	}
 
+
+	public static class ArrayToObject {
+
+		private Object object;
+
+		public void setObject(Object object) {
+			this.object = object;
+		}
+
+		public Object getObject() {
+			return object;
+		}
+	}
+
+
+	public static class PropertyTypeMismatch {
+
+		public String value;
+
+		public void setObject(String object) {
+			this.value = object;
+		}
+
+		public Integer getObject() {
+			return (this.value != null ? this.value.length() : null);
+		}
+	}
+
+
+	public static class SkipReaderStub<T> {
+
+		public T[] items;
+
+		public SkipReaderStub() {
+		}
+
+		public SkipReaderStub(T... items) {
+			this.items = items;
+		}
+
+		public void setItems(T... items) {
+			this.items = items;
+		}
+	}
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
index 30b2013d07..6d235ab84f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,29 +21,19 @@
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
-
-import java.lang.reflect.Method;
 import java.math.BigDecimal;
 
 import org.junit.Test;
 
 import org.springframework.core.JdkVersion;
 import org.springframework.tests.sample.beans.TestBean;
-import org.springframework.util.ClassUtils;
-
-
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.lessThan;
-
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 /**
- * Unit tests for {@link ExtendedBeanInfo}.
- *
  * @author Chris Beams
  * @since 3.1
  */
@@ -207,10 +197,6 @@ public Integer getProperty1() {
 		}
 	}
 
-	interface Spr9453<T> {
-		T getProp();
-	}
-
 	@Test
 	public void cornerSpr9453() throws IntrospectionException {
 		final class Bean implements Spr9453<Class<?>> {
@@ -335,10 +321,8 @@ public void setFoo(Integer foo) { }
 		BeanInfo ebi = new ExtendedBeanInfo(bi);
 
 		assertThat(hasReadMethodForProperty(bi, "foo"), is(true));
-		assertThat(hasWriteMethodForProperty(bi, "foo"), is(false));
-
 		assertThat(hasReadMethodForProperty(ebi, "foo"), is(true));
-		assertThat(hasWriteMethodForProperty(ebi, "foo"), is(false));
+		assertEquals(hasWriteMethodForProperty(bi, "foo"), hasWriteMethodForProperty(ebi, "foo"));
 	}
 
 	@Test
@@ -352,10 +336,8 @@ public void setFoos(int index, Integer foo) { }
 		BeanInfo ebi = new ExtendedBeanInfo(bi);
 
 		assertThat(hasIndexedReadMethodForProperty(bi, "foos"), is(true));
-		assertThat(hasIndexedWriteMethodForProperty(bi, "foos"), is(false));
-
 		assertThat(hasIndexedReadMethodForProperty(ebi, "foos"), is(true));
-		assertThat(hasIndexedWriteMethodForProperty(ebi, "foos"), is(false));
+		assertEquals(hasIndexedWriteMethodForProperty(bi, "foos"), hasIndexedWriteMethodForProperty(ebi, "foos"));
 	}
 
 	/**
@@ -595,7 +577,6 @@ public void cornerSpr10111() throws Exception {
 		new ExtendedBeanInfo(Introspector.getBeanInfo(BigDecimal.class));
 	}
 
-
 	@Test
 	public void subclassWriteMethodWithCovariantReturnType() throws IntrospectionException {
 		@SuppressWarnings("unused") class B {
@@ -792,6 +773,7 @@ public void propertyDescriptorOrderIsEqual() throws IntrospectionException {
 	@Test
 	public void propertyDescriptorComparator() throws IntrospectionException {
 		PropertyDescriptorComparator c = new PropertyDescriptorComparator();
+
 		assertThat(c.compare(new PropertyDescriptor("a", null, null), new PropertyDescriptor("a", null, null)), equalTo(0));
 		assertThat(c.compare(new PropertyDescriptor("abc", null, null), new PropertyDescriptor("abc", null, null)), equalTo(0));
 		assertThat(c.compare(new PropertyDescriptor("a", null, null), new PropertyDescriptor("b", null, null)), lessThan(0));
@@ -863,31 +845,6 @@ public void reproSpr8806() throws IntrospectionException {
 		new ExtendedBeanInfo(Introspector.getBeanInfo(LawLibrary.class));
 	}
 
-	interface Book { }
-
-	interface TextBook extends Book { }
-
-	interface LawBook extends TextBook { }
-
-	interface BookOperations {
-		Book getBook();
-		void setBook(Book book);
-	}
-
-	interface TextBookOperations extends BookOperations {
-		TextBook getBook();
-	}
-
-	abstract class Library {
-		public Book getBook() { return null; }
-		public void setBook(Book book) { }
-	}
-
-	class LawLibrary extends Library implements TextBookOperations {
-		public LawBook getBook() { return null; }
-	}
-
-
 	@Test
 	public void cornerSpr8949() throws IntrospectionException {
 		class A {
@@ -905,23 +862,10 @@ public boolean isTargetMethod() {
 
 		BeanInfo bi = Introspector.getBeanInfo(B.class);
 
-		/* first, demonstrate the 'problem':
-		 * java.beans.Introspector returns the "wrong" declaring class for overridden read
-		 * methods, which in turn violates expectations in {@link ExtendedBeanInfo} regarding
-		 * method equality. Spring's {@link ClassUtils#getMostSpecificMethod(Method, Class)}
-		 * helps out here, and is now put into use in ExtendedBeanInfo as well
-		 */
-		for (PropertyDescriptor pd : bi.getPropertyDescriptors()) {
-			if ("targetMethod".equals(pd.getName())) {
-				Method readMethod = pd.getReadMethod();
-				assertTrue(readMethod.getDeclaringClass().equals(A.class)); // we expected B!
-
-				Method msReadMethod = ClassUtils.getMostSpecificMethod(readMethod, B.class);
-				assertTrue(msReadMethod.getDeclaringClass().equals(B.class)); // and now we get it.
-			}
-		}
-
-		// and now demonstrate that we've indeed fixed the problem
+		// java.beans.Introspector returns the "wrong" declaring class for overridden read
+		// methods, which in turn violates expectations in {@link ExtendedBeanInfo} regarding
+		// method equality. Spring's {@link ClassUtils#getMostSpecificMethod(Method, Class)}
+		// helps out here, and is now put into use in ExtendedBeanInfo as well.
 		BeanInfo ebi = new ExtendedBeanInfo(bi);
 
 		assertThat(hasReadMethodForProperty(bi, "targetMethod"), is(true));
@@ -973,8 +917,65 @@ public void shouldSupportStaticWriteMethod() throws IntrospectionException {
 		}
 	}
 
+	@Test  // SPR-12434
+	public void shouldDetectValidPropertiesAndIgnoreInvalidProperties() throws IntrospectionException {
+		BeanInfo bi = new ExtendedBeanInfo(Introspector.getBeanInfo(java.awt.Window.class));
+		assertThat(hasReadMethodForProperty(bi, "locationByPlatform"), is(true));
+		assertThat(hasWriteMethodForProperty(bi, "locationByPlatform"), is(true));
+		assertThat(hasIndexedReadMethodForProperty(bi, "locationByPlatform"), is(false));
+		assertThat(hasIndexedWriteMethodForProperty(bi, "locationByPlatform"), is(false));
+	}
+
+
+	interface Spr9453<T> {
+
+		T getProp();
+	}
+
+	interface Book {
+	}
+
+	interface TextBook extends Book {
+	}
+
+	interface LawBook extends TextBook {
+	}
+
+	interface BookOperations {
+
+		Book getBook();
+
+		void setBook(Book book);
+	}
+
+	interface TextBookOperations extends BookOperations {
+
+		@Override
+		TextBook getBook();
+	}
+
+	abstract class Library {
+
+		public Book getBook() {
+			return null;
+		}
+
+		public void setBook(Book book) {
+		}
+	}
+
+	class LawLibrary extends Library implements TextBookOperations {
+
+		@Override
+		public LawBook getBook() {
+			return null;
+		}
+	}
+
 	static class WithStaticWriteMethod {
+
 		public static void setProp1(String prop1) {
 		}
 	}
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/SimplePropertyDescriptorTests.java b/spring-beans/src/test/java/org/springframework/beans/SimplePropertyDescriptorTests.java
index 8627083279..b5a9f14e4f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/SimplePropertyDescriptorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/SimplePropertyDescriptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 import static org.junit.Assert.*;
 
 /**
- * Unit tests for {@link SimpleNonIndexedPropertyDescriptor} and
+ * Unit tests for {@link SimplePropertyDescriptor} and
  * {@link SimpleIndexedPropertyDescriptor}.
  *
  * @author Chris Beams
@@ -39,7 +39,7 @@ public class SimplePropertyDescriptorTests {
 	@Test
 	public void toStringOutput() throws IntrospectionException, SecurityException, NoSuchMethodException {
 		{
-			Object pd = new SimpleNonIndexedPropertyDescriptor("foo", null, null);
+			Object pd = new SimplePropertyDescriptor("foo", null, null);
 			assertThat(pd.toString(), containsString(
 					"PropertyDescriptor[name=foo, propertyType=null, readMethod=null"));
 		}
@@ -49,7 +49,7 @@ class C {
 				public Object setFoo(String foo) { return null; }
 			}
 			Method m = C.class.getMethod("setFoo", String.class);
-			Object pd = new SimpleNonIndexedPropertyDescriptor("foo", null, m);
+			Object pd = new SimplePropertyDescriptor("foo", null, m);
 			assertThat(pd.toString(), allOf(
 					containsString("PropertyDescriptor[name=foo"),
 					containsString("propertyType=class java.lang.String"),
@@ -76,10 +76,10 @@ class C {
 
 	@Test
 	public void nonIndexedEquality() throws IntrospectionException, SecurityException, NoSuchMethodException {
-		Object pd1 = new SimpleNonIndexedPropertyDescriptor("foo", null, null);
+		Object pd1 = new SimplePropertyDescriptor("foo", null, null);
 		assertThat(pd1, equalTo(pd1));
 
-		Object pd2 = new SimpleNonIndexedPropertyDescriptor("foo", null, null);
+		Object pd2 = new SimplePropertyDescriptor("foo", null, null);
 		assertThat(pd1, equalTo(pd2));
 		assertThat(pd2, equalTo(pd1));
 
@@ -89,12 +89,12 @@ class C {
 			public String getFoo() { return null; }
 		}
 		Method wm1 = C.class.getMethod("setFoo", String.class);
-		Object pd3 = new SimpleNonIndexedPropertyDescriptor("foo", null, wm1);
+		Object pd3 = new SimplePropertyDescriptor("foo", null, wm1);
 		assertThat(pd1, not(equalTo(pd3)));
 		assertThat(pd3, not(equalTo(pd1)));
 
 		Method rm1 = C.class.getMethod("getFoo");
-		Object pd4 = new SimpleNonIndexedPropertyDescriptor("foo", rm1, null);
+		Object pd4 = new SimplePropertyDescriptor("foo", rm1, null);
 		assertThat(pd1, not(equalTo(pd4)));
 		assertThat(pd4, not(equalTo(pd1)));
 
@@ -147,4 +147,5 @@ class C {
 		assertThat(pd1, not(equalTo(pd7)));
 		assertThat(pd7, not(equalTo(pd1)));
 	}
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
index 553f9cef46..4e4c19b887 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,13 @@
 
 package org.springframework.beans.factory;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.StaticListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -39,6 +34,8 @@
 import org.springframework.tests.sample.beans.factory.DummyFactory;
 import org.springframework.util.ObjectUtils;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
 
 /**
  * @author Rod Johnson
@@ -54,16 +51,16 @@ public final class BeanFactoryUtilsTests {
 	private static final Resource LEAF_CONTEXT = qualifiedResource(CLASS, "leaf.xml");
 	private static final Resource DEPENDENT_BEANS_CONTEXT = qualifiedResource(CLASS, "dependentBeans.xml");
 
-	private ConfigurableListableBeanFactory listableBeanFactory;
+	private DefaultListableBeanFactory listableBeanFactory;
+
+	private DefaultListableBeanFactory dependentBeansFactory;
 
-	private ConfigurableListableBeanFactory dependentBeansBF;
 
 	@Before
 	public void setUp() {
 		// Interesting hierarchical factory to test counts.
 		// Slow to read so we cache it.
 
-
 		DefaultListableBeanFactory grandParent = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(grandParent).loadBeanDefinitions(ROOT_CONTEXT);
 		DefaultListableBeanFactory parent = new DefaultListableBeanFactory(grandParent);
@@ -71,12 +68,13 @@ public void setUp() {
 		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
 		new XmlBeanDefinitionReader(child).loadBeanDefinitions(LEAF_CONTEXT);
 
-		this.dependentBeansBF = new DefaultListableBeanFactory();
-		new XmlBeanDefinitionReader((BeanDefinitionRegistry) this.dependentBeansBF).loadBeanDefinitions(DEPENDENT_BEANS_CONTEXT);
-		dependentBeansBF.preInstantiateSingletons();
+		this.dependentBeansFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(this.dependentBeansFactory).loadBeanDefinitions(DEPENDENT_BEANS_CONTEXT);
+		dependentBeansFactory.preInstantiateSingletons();
 		this.listableBeanFactory = child;
 	}
 
+
 	@Test
 	public void testHierarchicalCountBeansWithNonHierarchicalFactory() {
 		StaticListableBeanFactory lbf = new StaticListableBeanFactory();
@@ -93,22 +91,21 @@ public void testHierarchicalCountBeansWithOverride() throws Exception {
 		// Leaf count
 		assertTrue(this.listableBeanFactory.getBeanDefinitionCount() == 1);
 		// Count minus duplicate
-		assertTrue("Should count 7 beans, not "
-				+ BeanFactoryUtils.countBeansIncludingAncestors(this.listableBeanFactory),
-			BeanFactoryUtils.countBeansIncludingAncestors(this.listableBeanFactory) == 7);
+		assertTrue("Should count 7 beans, not " + BeanFactoryUtils.countBeansIncludingAncestors(this.listableBeanFactory),
+				BeanFactoryUtils.countBeansIncludingAncestors(this.listableBeanFactory) == 7);
 	}
 
 	@Test
 	public void testHierarchicalNamesWithNoMatch() throws Exception {
-		List<String> names = Arrays.asList(BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory,
-			NoOp.class));
+		List<String> names = Arrays.asList(
+				BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, NoOp.class));
 		assertEquals(0, names.size());
 	}
 
 	@Test
 	public void testHierarchicalNamesWithMatchOnlyInRoot() throws Exception {
-		List<String> names = Arrays.asList(BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory,
-			IndexedTestBean.class));
+		List<String> names = Arrays.asList(
+				BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, IndexedTestBean.class));
 		assertEquals(1, names.size());
 		assertTrue(names.contains("indexedBean"));
 		// Distinguish from default ListableBeanFactory behavior
@@ -117,8 +114,8 @@ public void testHierarchicalNamesWithMatchOnlyInRoot() throws Exception {
 
 	@Test
 	public void testGetBeanNamesForTypeWithOverride() throws Exception {
-		List<String> names = Arrays.asList(BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory,
-			ITestBean.class));
+		List<String> names = Arrays.asList(
+				BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class));
 		// includes 2 TestBeans from FactoryBeans (DummyFactory definitions)
 		assertEquals(4, names.size());
 		assertTrue(names.contains("test"));
@@ -131,7 +128,7 @@ public void testGetBeanNamesForTypeWithOverride() throws Exception {
 	public void testNoBeansOfType() {
 		StaticListableBeanFactory lbf = new StaticListableBeanFactory();
 		lbf.addBean("foo", new Object());
-		Map<?, ?> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, ITestBean.class, true, false);
+		Map<String, ?> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, ITestBean.class, true, false);
 		assertTrue(beans.isEmpty());
 	}
 
@@ -148,7 +145,7 @@ public void testFindsBeansOfTypeWithStaticFactory() {
 		lbf.addBean("t3", t3);
 		lbf.addBean("t4", t4);
 
-		Map<?, ?> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, ITestBean.class, true, false);
+		Map<String, ?> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, ITestBean.class, true, false);
 		assertEquals(2, beans.size());
 		assertEquals(t1, beans.get("t1"));
 		assertEquals(t2, beans.get("t2"));
@@ -192,8 +189,8 @@ public void testFindsBeansOfTypeWithDefaultFactory() {
 		this.listableBeanFactory.registerSingleton("t3", t3);
 		this.listableBeanFactory.registerSingleton("t4", t4);
 
-		Map<?, ?> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true,
-			false);
+		Map<String, ?> beans =
+				BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, false);
 		assertEquals(6, beans.size());
 		assertEquals(test3, beans.get("test3"));
 		assertEquals(test, beans.get("test"));
@@ -201,12 +198,9 @@ public void testFindsBeansOfTypeWithDefaultFactory() {
 		assertEquals(t2, beans.get("t2"));
 		assertEquals(t3.getObject(), beans.get("t3"));
 		assertTrue(beans.get("t4") instanceof TestBean);
-		// t3 and t4 are found here as of Spring 2.0, since they are
-		// pre-registered
-		// singleton instances, while testFactory1 and testFactory are *not*
-		// found
-		// because they are FactoryBean definitions that haven't been
-		// initialized yet.
+		// t3 and t4 are found here as of Spring 2.0, since they are pre-registered
+		// singleton instances, while testFactory1 and testFactory are *not* found
+		// because they are FactoryBean definitions that haven't been initialized yet.
 
 		beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, false, true);
 		Object testFactory1 = this.listableBeanFactory.getBean("testFactory1");
@@ -248,8 +242,8 @@ public void testHierarchicalResolutionWithOverride() throws Exception {
 		Object test3 = this.listableBeanFactory.getBean("test3");
 		Object test = this.listableBeanFactory.getBean("test");
 
-		Map<?, ?> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true,
-			false);
+		Map<String, ?> beans =
+				BeanFactoryUtils.beansOfTypeIncludingAncestors(this.listableBeanFactory, ITestBean.class, true, false);
 		assertEquals(2, beans.size());
 		assertEquals(test3, beans.get("test3"));
 		assertEquals(test, beans.get("test"));
@@ -284,25 +278,25 @@ public void testHierarchicalResolutionWithOverride() throws Exception {
 
 	@Test
 	public void testADependencies() {
-		String[] deps = this.dependentBeansBF.getDependentBeans("a");
+		String[] deps = this.dependentBeansFactory.getDependentBeans("a");
 		assertTrue(ObjectUtils.isEmpty(deps));
 	}
 
 	@Test
 	public void testBDependencies() {
-		String[] deps = this.dependentBeansBF.getDependentBeans("b");
+		String[] deps = this.dependentBeansFactory.getDependentBeans("b");
 		assertTrue(Arrays.equals(new String[] { "c" }, deps));
 	}
 
 	@Test
 	public void testCDependencies() {
-		String[] deps = this.dependentBeansBF.getDependentBeans("c");
+		String[] deps = this.dependentBeansFactory.getDependentBeans("c");
 		assertTrue(Arrays.equals(new String[] { "int", "long" }, deps));
 	}
 
 	@Test
 	public void testIntDependencies() {
-		String[] deps = this.dependentBeansBF.getDependentBeans("int");
+		String[] deps = this.dependentBeansFactory.getDependentBeans("int");
 		assertTrue(Arrays.equals(new String[] { "buffer" }, deps));
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index 73c2ab592a..a9a1dbe622 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-
 import javax.security.auth.Subject;
 
 import org.apache.commons.logging.Log;
@@ -41,6 +40,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.NotWritablePropertyException;
@@ -104,9 +104,11 @@ public class DefaultListableBeanFactoryTests {
 
 	private static final Log factoryLog = LogFactory.getLog(DefaultListableBeanFactory.class);
 
+
 	@Rule
 	public ExpectedException thrown = ExpectedException.none();
 
+
 	@Test
 	public void testUnreferencedSingletonWasInstantiated() {
 		KnowsIfInstantiated.clearInstantiationRecord();
@@ -188,7 +190,7 @@ public void testPrototypeFactoryBeanIgnoredByNonEagerTypeMatching() {
 	}
 
 	@Test
-	public void testPrototypeSingletonFactoryBeanIgnoredByNonEagerTypeMatching() {
+	public void testSingletonFactoryBeanIgnoredByNonEagerTypeMatching() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		Properties p = new Properties();
 		p.setProperty("x1.(class)", DummyFactory.class.getName());
@@ -712,6 +714,20 @@ public void testCanReferenceParentBeanFromChildViaAlias() {
 				factory.getMergedBeanDefinition("child"), factory.getMergedBeanDefinition("child"));
 	}
 
+	@Test
+	public void testGetTypeWorksAfterParentChildMerging() {
+		RootBeanDefinition parentDefinition = new RootBeanDefinition(TestBean.class);
+		ChildBeanDefinition childDefinition = new ChildBeanDefinition("parent", DerivedTestBean.class, null, null);
+
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerBeanDefinition("parent", parentDefinition);
+		factory.registerBeanDefinition("child", childDefinition);
+		factory.freezeConfiguration();
+
+		assertEquals(TestBean.class, factory.getType("parent"));
+		assertEquals(DerivedTestBean.class, factory.getType("child"));
+	}
+
 	@Test
 	public void testNameAlreadyBound() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
@@ -1196,8 +1212,8 @@ public void testAutowireWithTwoMatchesForConstructorDependency() {
 		}
 		catch (UnsatisfiedDependencyException ex) {
 			// expected
-			assertTrue(ex.getMessage().indexOf("rod") != -1);
-			assertTrue(ex.getMessage().indexOf("rod2") != -1);
+			assertTrue(ex.getMessage().contains("rod"));
+			assertTrue(ex.getMessage().contains("rod2"));
 		}
 	}
 
@@ -1267,13 +1283,13 @@ public void testAutowireBeanByNameWithNoDependencyCheck() {
 		assertNull(bean.getSpouse());
 	}
 
-	@Test(expected=NoSuchBeanDefinitionException.class)
+	@Test(expected = NoSuchBeanDefinitionException.class)
 	public void testGetBeanByTypeWithNoneFound() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		lbf.getBean(TestBean.class);
 	}
 
-	@Test(expected=NoUniqueBeanDefinitionException.class)
+	@Test(expected = NoUniqueBeanDefinitionException.class)
 	public void testGetBeanByTypeWithAmbiguity() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		RootBeanDefinition bd1 = new RootBeanDefinition(TestBean.class);
@@ -1377,7 +1393,7 @@ public void testGetTypeForAbstractFactoryBean() {
 	 * Java method names. In other words, you can't name a method
 	 * {@code set&amp;FactoryBean(...)}.
 	 */
-	@Test(expected=TypeMismatchException.class)
+	@Test(expected = TypeMismatchException.class)
 	public void testAutowireBeanWithFactoryBeanByName() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		RootBeanDefinition bd = new RootBeanDefinition(LazyInitFactory.class);
@@ -1400,8 +1416,8 @@ public void testAutowireBeanByTypeWithTwoMatches() {
 		}
 		catch (UnsatisfiedDependencyException ex) {
 			// expected
-			assertTrue(ex.getMessage().indexOf("test") != -1);
-			assertTrue(ex.getMessage().indexOf("spouse") != -1);
+			assertTrue(ex.getMessage().contains("test"));
+			assertTrue(ex.getMessage().contains("spouse"));
 		}
 	}
 
@@ -1418,8 +1434,8 @@ public void testAutowireBeanByTypeWithTwoMatchesAndParameterNameDiscovery() {
 		}
 		catch (UnsatisfiedDependencyException ex) {
 			// expected
-			assertTrue(ex.getMessage().indexOf("test") != -1);
-			assertTrue(ex.getMessage().indexOf("spouse") != -1);
+			assertTrue(ex.getMessage().contains("test"));
+			assertTrue(ex.getMessage().contains("spouse"));
 		}
 	}
 
@@ -1667,7 +1683,7 @@ public void testBeanDefinitionWithInterface() {
 		}
 		catch (BeanCreationException ex) {
 			assertEquals("test", ex.getBeanName());
-			assertTrue(ex.getMessage().toLowerCase().indexOf("interface") != -1);
+			assertTrue(ex.getMessage().toLowerCase().contains("interface"));
 		}
 	}
 
@@ -1681,7 +1697,7 @@ public void testBeanDefinitionWithAbstractClass() {
 		}
 		catch (BeanCreationException ex) {
 			assertEquals("test", ex.getBeanName());
-			assertTrue(ex.getMessage().toLowerCase().indexOf("abstract") != -1);
+			assertTrue(ex.getMessage().toLowerCase().contains("abstract"));
 		}
 	}
 
@@ -2128,13 +2144,13 @@ private void findTypeOfPrototypeFactoryMethodOnBeanInstance(boolean singleton) {
 		assertEquals(expectedNameFromArgs, tb2.getName());
 	}
 
-	@Test(expected=IllegalStateException.class)
+	@Test(expected = IllegalStateException.class)
 	public void testScopingBeanToUnregisteredScopeResultsInAnException() throws Exception {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(TestBean.class);
 		AbstractBeanDefinition beanDefinition = builder.getBeanDefinition();
 		beanDefinition.setScope("he put himself so low could hardly look me in the face");
 
-		final DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
 		factory.registerBeanDefinition("testBean", beanDefinition);
 		factory.getBean("testBean");
 	}
@@ -2146,8 +2162,7 @@ public void testExplicitScopeInheritanceForChildBeanDefinitions() throws Excepti
 		RootBeanDefinition parent = new RootBeanDefinition();
 		parent.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
 
-		AbstractBeanDefinition child = BeanDefinitionBuilder
-				.childBeanDefinition("parent").getBeanDefinition();
+		AbstractBeanDefinition child = BeanDefinitionBuilder.childBeanDefinition("parent").getBeanDefinition();
 		child.setBeanClass(TestBean.class);
 		child.setScope(theChildScope);
 
@@ -2662,6 +2677,7 @@ public String getUserName() {
 		}
 	}
 
+
 	@SuppressWarnings("unused")
 	private static class KnowsIfInstantiated {
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-abstract.xml b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-abstract.xml
new file mode 100644
index 0000000000..e82ccdc59b
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-abstract.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+	<bean id="abstractFactoryBean" class="org.springframework.beans.factory.FactoryBeanTests$AbstractFactoryBean" abstract="true"/>
+
+</beans>
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-circular.xml b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-circular.xml
new file mode 100644
index 0000000000..1c328aa8d4
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-circular.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.springframework.org/schema/beans
+                       http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+   <bean id="bean1" class="org.springframework.beans.factory.FactoryBeanTests$PassThroughFactoryBean" primary="true">
+      <constructor-arg value="org.springframework.beans.factory.FactoryBeanTests$BeanImpl1"/>
+      <property name="instanceName" value="beanImpl1"/>
+   </bean>
+
+   <bean id="beanImpl1" class="org.springframework.beans.factory.FactoryBeanTests$BeanImpl1">
+      <property name="impl2" ref="bean2"/>
+   </bean>
+
+   <bean id="bean2" class="org.springframework.beans.factory.FactoryBeanTests$PassThroughFactoryBean" primary="true">
+      <constructor-arg value="org.springframework.beans.factory.FactoryBeanTests$BeanImpl2"/>
+      <property name="instanceName" value="beanImpl2"/>
+   </bean>
+
+   <bean id="beanImpl2" class="org.springframework.beans.factory.FactoryBeanTests$BeanImpl2">
+      <property name="impl1" ref="bean1"/>
+   </bean>
+
+</beans>
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
index 62c85b60b2..776cb3763e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,24 @@
 
 package org.springframework.beans.factory;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Test;
+
+import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -38,6 +44,8 @@ public final class FactoryBeanTests {
 	private static final Class<?> CLASS = FactoryBeanTests.class;
 	private static final Resource RETURNS_NULL_CONTEXT = qualifiedResource(CLASS, "returnsNull.xml");
 	private static final Resource WITH_AUTOWIRING_CONTEXT = qualifiedResource(CLASS, "withAutowiring.xml");
+	private static final Resource ABSTRACT_CONTEXT = qualifiedResource(CLASS, "abstract.xml");
+	private static final Resource CIRCULAR_CONTEXT = qualifiedResource(CLASS, "circular.xml");
 
 	@Test
 	public void testFactoryBeanReturnsNull() throws Exception {
@@ -80,6 +88,37 @@ public void testFactoryBeansWithIntermediateFactoryBeanAutowiringFailure() throw
 		assertSame(gamma, beta.getGamma());
 	}
 
+	@Test
+	public void testAbstractFactoryBeanViaAnnotation() throws Exception {
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(ABSTRACT_CONTEXT);
+		factory.getBeansWithAnnotation(Component.class);
+	}
+
+	@Test
+	public void testAbstractFactoryBeanViaType() throws Exception {
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(ABSTRACT_CONTEXT);
+		factory.getBeansOfType(AbstractFactoryBean.class);
+	}
+
+	@Test
+	public void testCircularReferenceWithPostProcessor() {
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(CIRCULAR_CONTEXT);
+
+		CountingPostProcessor counter = new CountingPostProcessor();
+		factory.addBeanPostProcessor(counter);
+
+		BeanImpl1 impl1 = factory.getBean(BeanImpl1.class);
+		assertNotNull(impl1);
+		assertNotNull(impl1.getImpl2());
+		assertNotNull(impl1.getImpl2());
+		assertSame(impl1, impl1.getImpl2().getImpl1());
+		assertEquals(1, counter.getCount("bean1"));
+		assertEquals(1, counter.getCount("bean2"));
+	}
+
 
 	public static class NullReturningFactoryBean implements FactoryBean<Object> {
 
@@ -152,6 +191,7 @@ public static class Gamma {
 	}
 
 
+	@Component
 	public static class BetaFactoryBean implements FactoryBean<Object> {
 
 		private Beta beta;
@@ -176,4 +216,114 @@ public boolean isSingleton() {
 		}
 	}
 
+
+	public abstract static class AbstractFactoryBean implements FactoryBean<Object> {
+	}
+
+
+	public static class PassThroughFactoryBean<T> implements FactoryBean<T>, BeanFactoryAware {
+
+		private Class<T> type;
+
+		private String instanceName;
+
+		private BeanFactory beanFactory;
+
+		private T instance;
+
+		public PassThroughFactoryBean(Class<T> type) {
+			this.type = type;
+		}
+
+		public void setInstanceName(String instanceName) {
+			this.instanceName = instanceName;
+		}
+		@Override
+		public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+			this.beanFactory = beanFactory;
+		}
+
+
+		@Override
+		public T getObject() {
+			if (instance == null) {
+				instance = beanFactory.getBean(instanceName, type);
+			}
+			return instance;
+		}
+
+		@Override
+		public Class<?> getObjectType() {
+			return type;
+		}
+
+		@Override
+		public boolean isSingleton() {
+			return true;
+		}
+	}
+
+
+	public static class CountingPostProcessor implements BeanPostProcessor {
+
+		private final Map<String, AtomicInteger> count = new HashMap<String, AtomicInteger>();
+
+		@Override
+		public Object postProcessBeforeInitialization(Object bean, String beanName) {
+			return bean;
+		}
+
+		@Override
+		public Object postProcessAfterInitialization(Object bean, String beanName) {
+			if (bean instanceof FactoryBean) {
+				return bean;
+			}
+			AtomicInteger c = count.get(beanName);
+			if (c == null) {
+				c = new AtomicInteger(0);
+				count.put(beanName, c);
+			}
+			c.incrementAndGet();
+			return bean;
+		}
+
+		public int getCount(String beanName) {
+			AtomicInteger c = count.get(beanName);
+			if (c != null) {
+				return c.intValue();
+			}
+			else {
+				return 0;
+			}
+		}
+	}
+
+
+	public static class BeanImpl1 {
+
+		private BeanImpl2 impl2;
+
+		public BeanImpl2 getImpl2() {
+			return impl2;
+		}
+
+		public void setImpl2(BeanImpl2 impl2) {
+			this.impl2 = impl2;
+		}
+	}
+
+
+	public static class BeanImpl2 {
+
+		private BeanImpl1 impl1;
+
+		public BeanImpl1 getImpl1() {
+			return impl1;
+		}
+
+		public void setImpl1(BeanImpl1 impl1) {
+			this.impl1 = impl1;
+		}
+	}
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/annotation/AnnotationBeanWiringInfoResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolverTests.java
similarity index 98%
rename from spring-beans/src/test/java/org/springframework/beans/annotation/AnnotationBeanWiringInfoResolverTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolverTests.java
index b623750f36..b4b9ec2a28 100644
--- a/spring-beans/src/test/java/org/springframework/beans/annotation/AnnotationBeanWiringInfoResolverTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolverTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.annotation;
+package org.springframework.beans.factory.annotation;
 
 import static org.junit.Assert.*;
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
index 7181f0b8a1..dc2e7bdf33 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,6 @@
 
 package org.springframework.beans.factory.annotation;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.Serializable;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -33,10 +25,12 @@
 import java.util.Map;
 
 import org.junit.Test;
+
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.AutowireCandidateQualifier;
@@ -49,16 +43,15 @@
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 
+import static org.junit.Assert.*;
 
 /**
- * Unit tests for {@link AutowiredAnnotationBeanPostProcessor}.
- *
  * @author Juergen Hoeller
  * @author Mark Fisher
  * @author Sam Brannen
  * @author Chris Beams
  */
-public final class AutowiredAnnotationBeanPostProcessorTests {
+public class AutowiredAnnotationBeanPostProcessorTests {
 
 	@Test
 	public void testIncompleteBeanDefinition() {
@@ -403,6 +396,23 @@ public void testConstructorResourceInjectionWithMultipleCandidates() {
 		bf.destroySingletons();
 	}
 
+	@Test
+	public void testConstructorResourceInjectionWithNoCandidatesAndNoFallback() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ConstructorWithoutFallbackBean.class));
+
+		try {
+			bf.getBean("annotatedBean");
+			fail("Should have thrown UnsatisfiedDependencyException");
+		}
+		catch (UnsatisfiedDependencyException ex) {
+			// expected
+		}
+	}
+
 	@Test
 	public void testConstructorResourceInjectionWithMultipleCandidatesAsCollection() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
@@ -963,7 +973,6 @@ public static class ResourceInjectionBean {
 
 		private TestBean testBean2;
 
-
 		@Autowired
 		public void setTestBean2(TestBean testBean2) {
 			if (this.testBean2 != null) {
@@ -1265,6 +1274,21 @@ public NestedTestBean[] getNestedTestBeans() {
 	}
 
 
+	public static class ConstructorWithoutFallbackBean {
+
+		protected ITestBean testBean3;
+
+		@Autowired(required = false)
+		public ConstructorWithoutFallbackBean(ITestBean testBean3) {
+			this.testBean3 = testBean3;
+		}
+
+		public ITestBean getTestBean3() {
+			return this.testBean3;
+		}
+	}
+
+
 	public static class ConstructorsCollectionResourceInjectionBean {
 
 		protected ITestBean testBean3;
@@ -1330,7 +1354,6 @@ public static class MapFieldInjectionBean {
 		@Autowired
 		private Map<String, TestBean> testBeanMap;
 
-
 		public Map<String, TestBean> getTestBeanMap() {
 			return this.testBeanMap;
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessorTests.java
similarity index 96%
rename from spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java
rename to spring-beans/src/test/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessorTests.java
index 7c728a55a2..04180cf06a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.annotation;
+package org.springframework.beans.factory.annotation;
 
 import static org.junit.Assert.*;
 
@@ -28,8 +28,6 @@
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.annotation.Required;
-import org.springframework.beans.factory.annotation.RequiredAnnotationBeanPostProcessor;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
index fab64afdcb..6cccbc6d01 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,6 @@
 
 package org.springframework.beans.factory.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -36,8 +27,8 @@
 import java.util.prefs.Preferences;
 import java.util.prefs.PreferencesFactory;
 
-import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.BeanInitializationException;
@@ -52,19 +43,22 @@
 import org.springframework.tests.sample.beans.IndexedTestBean;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*;
+import static org.springframework.tests.TestResourceUtils.*;
 
 /**
  * Unit tests for various {@link PropertyResourceConfigurer} implementations including:
  * {@link PropertyPlaceholderConfigurer}, {@link PropertyOverrideConfigurer} and
  * {@link PreferencesPlaceholderConfigurer}.
  *
- * @see PropertyPlaceholderConfigurerTests
- * @since 02.10.2003
  * @author Juergen Hoeller
  * @author Chris Beams
  * @author Phillip Webb
+ * @since 02.10.2003
+ * @see PropertyPlaceholderConfigurerTests
  */
-public final class PropertyResourceConfigurerTests {
+public class PropertyResourceConfigurerTests {
 
 	static {
 		System.setProperty("java.util.prefs.PreferencesFactory", MockPreferencesFactory.class.getName());
@@ -75,23 +69,15 @@ public final class PropertyResourceConfigurerTests {
 	private static final Resource XTEST_PROPS = qualifiedResource(CLASS, "xtest.properties"); // does not exist
 	private static final Resource TEST_PROPS_XML = qualifiedResource(CLASS, "test.properties.xml");
 
-	private DefaultListableBeanFactory factory;
+	private final DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
 
-	@Before
-	public void setUp() {
-		factory = new DefaultListableBeanFactory();
-	}
 
 	@Test
 	public void testPropertyOverrideConfigurer() {
-		BeanDefinition def1 = BeanDefinitionBuilder
-			.genericBeanDefinition(TestBean.class)
-			.getBeanDefinition();
+		BeanDefinition def1 = BeanDefinitionBuilder.genericBeanDefinition(TestBean.class).getBeanDefinition();
 		factory.registerBeanDefinition("tb1", def1);
 
-		BeanDefinition def2 = BeanDefinitionBuilder
-			.genericBeanDefinition(TestBean.class)
-			.getBeanDefinition();
+		BeanDefinition def2 = BeanDefinitionBuilder.genericBeanDefinition(TestBean.class).getBeanDefinition();
 		factory.registerBeanDefinition("tb2", def2);
 
 		PropertyOverrideConfigurer poc1;
@@ -128,9 +114,7 @@ public void testPropertyOverrideConfigurer() {
 
 	@Test
 	public void testPropertyOverrideConfigurerWithNestedProperty() {
-		BeanDefinition def = BeanDefinitionBuilder
-			.genericBeanDefinition(IndexedTestBean.class)
-			.getBeanDefinition();
+		BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition();
 		factory.registerBeanDefinition("tb", def);
 
 		PropertyOverrideConfigurer poc;
@@ -148,9 +132,7 @@ public void testPropertyOverrideConfigurerWithNestedProperty() {
 
 	@Test
 	public void testPropertyOverrideConfigurerWithNestedPropertyAndDotInBeanName() {
-		BeanDefinition def = BeanDefinitionBuilder
-			.genericBeanDefinition(IndexedTestBean.class)
-			.getBeanDefinition();
+		BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition();
 		factory.registerBeanDefinition("my.tb", def);
 
 		PropertyOverrideConfigurer poc;
@@ -169,9 +151,7 @@ public void testPropertyOverrideConfigurerWithNestedPropertyAndDotInBeanName() {
 
 	@Test
 	public void testPropertyOverrideConfigurerWithNestedMapPropertyAndDotInMapKey() {
-		BeanDefinition def = BeanDefinitionBuilder
-			.genericBeanDefinition(IndexedTestBean.class)
-			.getBeanDefinition();
+		BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition();
 		factory.registerBeanDefinition("tb", def);
 
 		PropertyOverrideConfigurer poc;
@@ -189,9 +169,7 @@ public void testPropertyOverrideConfigurerWithNestedMapPropertyAndDotInMapKey()
 
 	@Test
 	public void testPropertyOverrideConfigurerWithHeldProperties() {
-		BeanDefinition def = BeanDefinitionBuilder
-			.genericBeanDefinition(PropertiesHolder.class)
-			.getBeanDefinition();
+		BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(PropertiesHolder.class).getBeanDefinition();
 		factory.registerBeanDefinition("tb", def);
 
 		PropertyOverrideConfigurer poc;
@@ -205,23 +183,9 @@ public void testPropertyOverrideConfigurerWithHeldProperties() {
 		assertEquals("true", tb.getHeldProperties().getProperty("mail.smtp.auth"));
 	}
 
-	static class PropertiesHolder {
-		private Properties props = new Properties();
-
-		public Properties getHeldProperties() {
-			return props;
-		}
-
-		public void setHeldProperties(Properties props) {
-			this.props = props;
-		}
-	}
-
 	@Test
 	public void testPropertyOverrideConfigurerWithPropertiesFile() {
-		BeanDefinition def = BeanDefinitionBuilder
-			.genericBeanDefinition(IndexedTestBean.class)
-			.getBeanDefinition();
+		BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition();
 		factory.registerBeanDefinition("tb", def);
 
 		PropertyOverrideConfigurer poc = new PropertyOverrideConfigurer();
@@ -235,13 +199,11 @@ public void testPropertyOverrideConfigurerWithPropertiesFile() {
 
 	@Test
 	public void testPropertyOverrideConfigurerWithInvalidPropertiesFile() {
-		BeanDefinition def = BeanDefinitionBuilder
-			.genericBeanDefinition(IndexedTestBean.class)
-			.getBeanDefinition();
+		BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition();
 		factory.registerBeanDefinition("tb", def);
 
 		PropertyOverrideConfigurer poc = new PropertyOverrideConfigurer();
-		poc.setLocations(new Resource[] { TEST_PROPS, XTEST_PROPS });
+		poc.setLocations(TEST_PROPS, XTEST_PROPS);
 		poc.setIgnoreResourceNotFound(true);
 		poc.postProcessBeanFactory(factory);
 
@@ -252,9 +214,7 @@ public void testPropertyOverrideConfigurerWithInvalidPropertiesFile() {
 
 	@Test
 	public void testPropertyOverrideConfigurerWithPropertiesXmlFile() {
-		BeanDefinition def = BeanDefinitionBuilder
-			.genericBeanDefinition(IndexedTestBean.class)
-			.getBeanDefinition();
+		BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition();
 		factory.registerBeanDefinition("tb", def);
 
 		PropertyOverrideConfigurer poc = new PropertyOverrideConfigurer();
@@ -268,9 +228,7 @@ public void testPropertyOverrideConfigurerWithPropertiesXmlFile() {
 
 	@Test
 	public void testPropertyOverrideConfigurerWithConvertProperties() {
-		BeanDefinition def = BeanDefinitionBuilder
-			.genericBeanDefinition(IndexedTestBean.class)
-			.getBeanDefinition();
+		BeanDefinition def = BeanDefinitionBuilder.genericBeanDefinition(IndexedTestBean.class).getBeanDefinition();
 		factory.registerBeanDefinition("tb", def);
 
 		ConvertingOverrideConfigurer bfpp = new ConvertingOverrideConfigurer();
@@ -394,7 +352,6 @@ private void doTestPropertyPlaceholderConfigurer(boolean parentChildSeparation)
 		cas.addGenericArgumentValue("${var}name${age}");
 
 		MutablePropertyValues pvs = new MutablePropertyValues();
-
 		pvs.add("stringArray", new String[] {"${os.name}", "${age}"});
 
 		List<Object> friends = new ManagedList<Object>();
@@ -414,7 +371,7 @@ private void doTestPropertyPlaceholderConfigurer(boolean parentChildSeparation)
 		someMap.put("key1", new RuntimeBeanReference("${ref}"));
 		someMap.put("key2", "${age}name");
 		MutablePropertyValues innerPvs = new MutablePropertyValues();
-		innerPvs.add("touchy", "${os.name}");
+		innerPvs.add("country", "${os.name}");
 		RootBeanDefinition innerBd = new RootBeanDefinition(TestBean.class);
 		innerBd.setPropertyValues(innerPvs);
 		someMap.put("key3", innerBd);
@@ -464,30 +421,28 @@ private void doTestPropertyPlaceholderConfigurer(boolean parentChildSeparation)
 		TestBean inner2 = (TestBean) tb2.getSomeMap().get("mykey4");
 		assertEquals(0, inner1.getAge());
 		assertEquals(null, inner1.getName());
-		assertEquals(System.getProperty("os.name"), inner1.getTouchy());
+		assertEquals(System.getProperty("os.name"), inner1.getCountry());
 		assertEquals(98, inner2.getAge());
 		assertEquals("namemyvarmyvar${", inner2.getName());
-		assertEquals(System.getProperty("os.name"), inner2.getTouchy());
+		assertEquals(System.getProperty("os.name"), inner2.getCountry());
 	}
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithSystemPropertyFallback() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("touchy", "${os.name}").getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("country", "${os.name}").getBeanDefinition());
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
 		ppc.postProcessBeanFactory(factory);
 
 		TestBean tb = (TestBean) factory.getBean("tb");
-		assertEquals(System.getProperty("os.name"), tb.getTouchy());
+		assertEquals(System.getProperty("os.name"), tb.getCountry());
 	}
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithSystemPropertyNotUsed() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("touchy", "${os.name}").getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("country", "${os.name}").getBeanDefinition());
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
 		Properties props = new Properties();
@@ -496,14 +451,13 @@ public void testPropertyPlaceholderConfigurerWithSystemPropertyNotUsed() {
 		ppc.postProcessBeanFactory(factory);
 
 		TestBean tb = (TestBean) factory.getBean("tb");
-		assertEquals("myos", tb.getTouchy());
+		assertEquals("myos", tb.getCountry());
 	}
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithOverridingSystemProperty() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("touchy", "${os.name}").getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("country", "${os.name}").getBeanDefinition());
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
 		Properties props = new Properties();
@@ -513,14 +467,13 @@ public void testPropertyPlaceholderConfigurerWithOverridingSystemProperty() {
 		ppc.postProcessBeanFactory(factory);
 
 		TestBean tb = (TestBean) factory.getBean("tb");
-		assertEquals(System.getProperty("os.name"), tb.getTouchy());
+		assertEquals(System.getProperty("os.name"), tb.getCountry());
 	}
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithUnresolvableSystemProperty() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("touchy", "${user.dir}").getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("touchy", "${user.dir}").getBeanDefinition());
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
 		ppc.setSystemPropertiesMode(PropertyPlaceholderConfigurer.SYSTEM_PROPERTIES_MODE_NEVER);
@@ -537,9 +490,8 @@ public void testPropertyPlaceholderConfigurerWithUnresolvableSystemProperty() {
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithUnresolvablePlaceholder() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("name", "${ref}").getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("name", "${ref}").getBeanDefinition());
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
 
@@ -555,9 +507,8 @@ public void testPropertyPlaceholderConfigurerWithUnresolvablePlaceholder() {
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithIgnoreUnresolvablePlaceholder() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("name", "${ref}").getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("name", "${ref}").getBeanDefinition());
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
 		ppc.setIgnoreUnresolvablePlaceholders(true);
@@ -569,9 +520,8 @@ public void testPropertyPlaceholderConfigurerWithIgnoreUnresolvablePlaceholder()
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithEmptyStringAsNull() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("name", "").getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("name", "").getBeanDefinition());
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
 		ppc.setNullValue("");
@@ -583,9 +533,8 @@ public void testPropertyPlaceholderConfigurerWithEmptyStringAsNull() {
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithEmptyStringInPlaceholderAsNull() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("name", "${ref}").getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("name", "${ref}").getBeanDefinition());
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
 		ppc.setNullValue("");
@@ -600,9 +549,8 @@ public void testPropertyPlaceholderConfigurerWithEmptyStringInPlaceholderAsNull(
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithNestedPlaceholderInKey() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("name", "${my${key}key}").getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("name", "${my${key}key}").getBeanDefinition());
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
 		Properties props = new Properties();
@@ -617,8 +565,7 @@ public void testPropertyPlaceholderConfigurerWithNestedPlaceholderInKey() {
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithPlaceholderInAlias() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class).getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class).getBeanDefinition());
 		factory.registerAlias("tb", "${alias}");
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
@@ -634,8 +581,7 @@ public void testPropertyPlaceholderConfigurerWithPlaceholderInAlias() {
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithSelfReferencingPlaceholderInAlias() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class).getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class).getBeanDefinition());
 		factory.registerAlias("tb", "${alias}");
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
@@ -651,11 +597,10 @@ public void testPropertyPlaceholderConfigurerWithSelfReferencingPlaceholderInAli
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithCircularReference() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("age", "${age}")
-			.addPropertyValue("name", "name${var}")
-			.getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("age", "${age}")
+				.addPropertyValue("name", "name${var}")
+				.getBeanDefinition());
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
 		Properties props = new Properties();
@@ -675,9 +620,8 @@ public void testPropertyPlaceholderConfigurerWithCircularReference() {
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithDefaultProperties() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("touchy", "${test}").getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("touchy", "${test}").getBeanDefinition());
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
 		Properties props = new Properties();
@@ -691,9 +635,8 @@ public void testPropertyPlaceholderConfigurerWithDefaultProperties() {
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithInlineDefault() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("touchy", "${test:mytest}").getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("touchy", "${test:mytest}").getBeanDefinition());
 
 		PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
 		ppc.postProcessBeanFactory(factory);
@@ -704,9 +647,8 @@ public void testPropertyPlaceholderConfigurerWithInlineDefault() {
 
 	@Test
 	public void testPropertyPlaceholderConfigurerWithAliases() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("touchy", "${test}").getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("touchy", "${test}").getBeanDefinition());
 
 		factory.registerAlias("tb", "${myAlias}");
 		factory.registerAlias("${myTarget}", "alias2");
@@ -729,12 +671,11 @@ public void testPropertyPlaceholderConfigurerWithAliases() {
 
 	@Test
 	public void testPreferencesPlaceholderConfigurer() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("name", "${myName}")
-			.addPropertyValue("age", "${myAge}")
-			.addPropertyValue("touchy", "${myTouchy}")
-			.getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("name", "${myName}")
+				.addPropertyValue("age", "${myAge}")
+				.addPropertyValue("touchy", "${myTouchy}")
+				.getBeanDefinition());
 
 		PreferencesPlaceholderConfigurer ppc = new PreferencesPlaceholderConfigurer();
 		Properties props = new Properties();
@@ -757,12 +698,11 @@ public void testPreferencesPlaceholderConfigurer() {
 
 	@Test
 	public void testPreferencesPlaceholderConfigurerWithCustomTreePaths() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("name", "${myName}")
-			.addPropertyValue("age", "${myAge}")
-			.addPropertyValue("touchy", "${myTouchy}")
-			.getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("name", "${myName}")
+				.addPropertyValue("age", "${myAge}")
+				.addPropertyValue("touchy", "${myTouchy}")
+				.getBeanDefinition());
 
 		PreferencesPlaceholderConfigurer ppc = new PreferencesPlaceholderConfigurer();
 		Properties props = new Properties();
@@ -787,12 +727,11 @@ public void testPreferencesPlaceholderConfigurerWithCustomTreePaths() {
 
 	@Test
 	public void testPreferencesPlaceholderConfigurerWithPathInPlaceholder() {
-		factory.registerBeanDefinition("tb",
-			genericBeanDefinition(TestBean.class)
-			.addPropertyValue("name", "${mypath/myName}")
-			.addPropertyValue("age", "${myAge}")
-			.addPropertyValue("touchy", "${myotherpath/myTouchy}")
-			.getBeanDefinition());
+		factory.registerBeanDefinition("tb", genericBeanDefinition(TestBean.class)
+				.addPropertyValue("name", "${mypath/myName}")
+				.addPropertyValue("age", "${myAge}")
+				.addPropertyValue("touchy", "${myotherpath/myTouchy}")
+				.getBeanDefinition());
 
 		PreferencesPlaceholderConfigurer ppc = new PreferencesPlaceholderConfigurer();
 		Properties props = new Properties();
@@ -816,6 +755,20 @@ public void testPreferencesPlaceholderConfigurerWithPathInPlaceholder() {
 	}
 
 
+	static class PropertiesHolder {
+
+		private Properties props = new Properties();
+
+		public Properties getHeldProperties() {
+			return props;
+		}
+
+		public void setHeldProperties(Properties props) {
+			this.props = props;
+		}
+	}
+
+
 	private static class ConvertingOverrideConfigurer extends PropertyOverrideConfigurer {
 
 		@Override
@@ -824,26 +777,28 @@ protected String convertPropertyValue(String originalValue) {
 		}
 	}
 
+
 	/**
 	 * {@link PreferencesFactory} to create {@link MockPreferences}.
 	 */
 	public static class MockPreferencesFactory implements PreferencesFactory {
 
-		private Preferences systemRoot = new MockPreferences();
+		private final Preferences userRoot = new MockPreferences();
 
-		private Preferences userRoot = new MockPreferences();
+		private final Preferences systemRoot = new MockPreferences();
 
 		@Override
 		public Preferences systemRoot() {
-			return systemRoot;
+			return this.systemRoot;
 		}
 
 		@Override
 		public Preferences userRoot() {
-			return userRoot;
+			return this.userRoot;
 		}
 	}
 
+
 	/**
 	 * Mock implementation of {@link Preferences} that behaves the same regardless of the
 	 * underlying operating system and will never throw security exceptions.
@@ -909,4 +864,5 @@ protected void syncSpi() throws BackingStoreException {
 		protected void flushSpi() throws BackingStoreException {
 		}
 	}
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/AutowireUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/AutowireUtilsTests.java
new file mode 100644
index 0000000000..56fcde6ec9
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/AutowireUtilsTests.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.beans.factory.support;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+
+import org.springframework.util.ReflectionUtils;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ */
+public class AutowireUtilsTests {
+
+	@Test
+	public void genericMethodReturnTypes() {
+		Method notParameterized = ReflectionUtils.findMethod(MyTypeWithMethods.class, "notParameterized", new Class[]{});
+		assertEquals(String.class,
+				AutowireUtils.resolveReturnTypeForFactoryMethod(notParameterized, new Object[]{}, getClass().getClassLoader()));
+
+		Method notParameterizedWithArguments = ReflectionUtils.findMethod(MyTypeWithMethods.class, "notParameterizedWithArguments",
+				new Class[] { Integer.class, Boolean.class });
+		assertEquals(String.class,
+				AutowireUtils.resolveReturnTypeForFactoryMethod(notParameterizedWithArguments, new Object[] { 99, true }, getClass().getClassLoader()));
+
+		Method createProxy = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createProxy", new Class[] { Object.class });
+		assertEquals(String.class,
+				AutowireUtils.resolveReturnTypeForFactoryMethod(createProxy, new Object[] { "foo" }, getClass().getClassLoader()));
+
+		Method createNamedProxyWithDifferentTypes = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createNamedProxy",
+				new Class[] { String.class, Object.class });
+		assertEquals(Long.class,
+				AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedProxyWithDifferentTypes, new Object[] { "enigma", 99L }, getClass().getClassLoader()));
+
+		Method createNamedProxyWithDuplicateTypes = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createNamedProxy",
+				new Class[] { String.class, Object.class });
+		assertEquals(String.class,
+				AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedProxyWithDuplicateTypes, new Object[] { "enigma", "foo" }, getClass().getClassLoader()));
+
+		Method createMock = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createMock", new Class[] { Class.class });
+		assertEquals(Runnable.class,
+				AutowireUtils.resolveReturnTypeForFactoryMethod(createMock, new Object[] { Runnable.class }, getClass().getClassLoader()));
+		assertEquals(Runnable.class,
+				AutowireUtils.resolveReturnTypeForFactoryMethod(createMock, new Object[] { Runnable.class.getName() }, getClass().getClassLoader()));
+
+		Method createNamedMock = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createNamedMock", new Class[] { String.class,
+				Class.class });
+		assertEquals(Runnable.class,
+				AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedMock, new Object[] { "foo", Runnable.class }, getClass().getClassLoader()));
+
+		Method createVMock = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createVMock",
+				new Class[] { Object.class, Class.class });
+		assertEquals(Runnable.class,
+				AutowireUtils.resolveReturnTypeForFactoryMethod(createVMock, new Object[] { "foo", Runnable.class }, getClass().getClassLoader()));
+
+		// Ideally we would expect String.class instead of Object.class, but
+		// resolveReturnTypeForFactoryMethod() does not currently support this form of
+		// look-up.
+		Method extractValueFrom = ReflectionUtils.findMethod(MyTypeWithMethods.class, "extractValueFrom",
+				new Class[] { MyInterfaceType.class });
+		assertEquals(Object.class,
+				AutowireUtils.resolveReturnTypeForFactoryMethod(extractValueFrom, new Object[] { new MySimpleInterfaceType() }, getClass().getClassLoader()));
+
+		// Ideally we would expect Boolean.class instead of Object.class, but this
+		// information is not available at run-time due to type erasure.
+		Map<Integer, Boolean> map = new HashMap<Integer, Boolean>();
+		map.put(0, false);
+		map.put(1, true);
+		Method extractMagicValue = ReflectionUtils.findMethod(MyTypeWithMethods.class, "extractMagicValue", new Class[] { Map.class });
+		assertEquals(Object.class, AutowireUtils.resolveReturnTypeForFactoryMethod(extractMagicValue, new Object[] { map }, getClass().getClassLoader()));
+	}
+
+
+	public interface MyInterfaceType<T> {
+	}
+
+	public class MySimpleInterfaceType implements MyInterfaceType<String> {
+	}
+
+	public static class MyTypeWithMethods<T> {
+
+		public MyInterfaceType<Integer> integer() {
+			return null;
+		}
+
+		public MySimpleInterfaceType string() {
+			return null;
+		}
+
+		public Object object() {
+			return null;
+		}
+
+		@SuppressWarnings("rawtypes")
+		public MyInterfaceType raw() {
+			return null;
+		}
+
+		public String notParameterized() {
+			return null;
+		}
+
+		public String notParameterizedWithArguments(Integer x, Boolean b) {
+			return null;
+		}
+
+		/**
+		 * Simulates a factory method that wraps the supplied object in a proxy of the
+		 * same type.
+		 */
+		public static <T> T createProxy(T object) {
+			return null;
+		}
+
+		/**
+		 * Similar to {@link #createProxy(Object)} but adds an additional argument before
+		 * the argument of type {@code T}. Note that they may potentially be of the same
+		 * time when invoked!
+		 */
+		public static <T> T createNamedProxy(String name, T object) {
+			return null;
+		}
+
+		/**
+		 * Simulates factory methods found in libraries such as Mockito and EasyMock.
+		 */
+		public static <MOCK> MOCK createMock(Class<MOCK> toMock) {
+			return null;
+		}
+
+		/**
+		 * Similar to {@link #createMock(Class)} but adds an additional method argument
+		 * before the parameterized argument.
+		 */
+		public static <T> T createNamedMock(String name, Class<T> toMock) {
+			return null;
+		}
+
+		/**
+		 * Similar to {@link #createNamedMock(String, Class)} but adds an additional
+		 * parameterized type.
+		 */
+		public static <V extends Object, T> T createVMock(V name, Class<T> toMock) {
+			return null;
+		}
+
+		/**
+		 * Extract some value of the type supported by the interface (i.e., by a concrete,
+		 * non-generic implementation of the interface).
+		 */
+		public static <T> T extractValueFrom(MyInterfaceType<T> myInterfaceType) {
+			return null;
+		}
+
+		/**
+		 * Extract some magic value from the supplied map.
+		 */
+		public static <K, V> V extractMagicValue(Map<K, V> map) {
+			return null;
+		}
+
+		public void readIntegerInputMessage(MyInterfaceType<Integer> message) {
+		}
+
+		public void readIntegerArrayInputMessage(MyInterfaceType<Integer>[] message) {
+		}
+
+		public void readGenericArrayInputMessage(T[] message) {
+		}
+	}
+
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
index 2480f64fac..f2b33f22dc 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
@@ -16,13 +16,9 @@
 
 package org.springframework.beans.factory.support;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
@@ -37,21 +33,23 @@
 
 import org.junit.Test;
 import org.mockito.Mockito;
+
 import org.springframework.beans.PropertyEditorRegistrar;
 import org.springframework.beans.PropertyEditorRegistry;
 import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.config.TypedStringValue;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.tests.Assume;
 import org.springframework.tests.TestGroup;
-
 import org.springframework.tests.sample.beans.GenericBean;
 import org.springframework.tests.sample.beans.GenericIntegerBean;
 import org.springframework.tests.sample.beans.GenericSetOfIntegerBean;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
 
 /**
  * @author Juergen Hoeller
@@ -115,7 +113,7 @@ public void testGenericListPropertyWithInvalidElementType() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericIntegerBean.class);
 
-		List input = new ArrayList();
+		List<Integer> input = new ArrayList<Integer>();
 		input.add(1);
 		rbd.getPropertyValues().add("testBeanList", input);
 
@@ -655,18 +653,17 @@ public void testSetBean() throws Exception {
 	}
 
 	/**
-	 * Tests support for parameterized {@code factory-method} declarations such
-	 * as Mockito {@code mock()} method which has the following signature.
-	 *
-	 * <pre>{@code
+	 * Tests support for parameterized static {@code factory-method} declarations such as
+	 * Mockito's {@code mock()} method which has the following signature.
+	 * <pre>
+	 * {@code
 	 * public static <T> T mock(Class<T> classToMock)
-	 * }</pre>
-	 *
-	 * See SPR-9493
-	 * @since 3.2
+	 * }
+	 * </pre>
+	 * <p>See SPR-9493
 	 */
 	@Test
-	public void parameterizedFactoryMethod() {
+	public void parameterizedStaticFactoryMethod() {
 		RootBeanDefinition rbd = new RootBeanDefinition(Mockito.class);
 		rbd.setFactoryMethodName("mock");
 		rbd.getConstructorArgumentValues().addGenericArgumentValue(Runnable.class);
@@ -678,6 +675,100 @@ public void parameterizedFactoryMethod() {
 		assertEquals(1, beans.size());
 	}
 
+	/**
+	 * Tests support for parameterized instance {@code factory-method} declarations such
+	 * as EasyMock's {@code IMocksControl.createMock()} method which has the following
+	 * signature.
+	 * <pre>
+	 * {@code
+	 * public <T> T createMock(Class<T> toMock)
+	 * }
+	 * </pre>
+	 * <p>See SPR-10411
+	 */
+	@Test
+	public void parameterizedInstanceFactoryMethod() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+
+		RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
+		bf.registerBeanDefinition("mocksControl", rbd);
+
+		rbd = new RootBeanDefinition();
+		rbd.setFactoryBeanName("mocksControl");
+		rbd.setFactoryMethodName("createMock");
+		rbd.getConstructorArgumentValues().addGenericArgumentValue(Runnable.class);
+		bf.registerBeanDefinition("mock", rbd);
+
+		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
+		assertEquals(1, beans.size());
+	}
+
+	@Test
+	public void parameterizedInstanceFactoryMethodWithNonResolvedClassName() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+
+		RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
+		bf.registerBeanDefinition("mocksControl", rbd);
+
+		rbd = new RootBeanDefinition();
+		rbd.setFactoryBeanName("mocksControl");
+		rbd.setFactoryMethodName("createMock");
+		rbd.getConstructorArgumentValues().addGenericArgumentValue(Runnable.class.getName());
+		bf.registerBeanDefinition("mock", rbd);
+
+		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
+		assertEquals(1, beans.size());
+	}
+
+	@Test
+	public void parameterizedInstanceFactoryMethodWithWrappedClassName() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+
+		RootBeanDefinition rbd = new RootBeanDefinition();
+		rbd.setBeanClassName(Mockito.class.getName());
+		rbd.setFactoryMethodName("mock");
+		// TypedStringValue used to be equivalent to an XML-defined argument String
+		rbd.getConstructorArgumentValues().addGenericArgumentValue(new TypedStringValue(Runnable.class.getName()));
+		bf.registerBeanDefinition("mock", rbd);
+
+		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
+		assertEquals(1, beans.size());
+	}
+
+	@Test
+	public void parameterizedInstanceFactoryMethodWithInvalidClassName() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+
+		RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
+		bf.registerBeanDefinition("mocksControl", rbd);
+
+		rbd = new RootBeanDefinition();
+		rbd.setFactoryBeanName("mocksControl");
+		rbd.setFactoryMethodName("createMock");
+		rbd.getConstructorArgumentValues().addGenericArgumentValue("x");
+		bf.registerBeanDefinition("mock", rbd);
+
+		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
+		assertEquals(0, beans.size());
+	}
+
+	@Test
+	public void parameterizedInstanceFactoryMethodWithIndexedArgument() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+
+		RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
+		bf.registerBeanDefinition("mocksControl", rbd);
+
+		rbd = new RootBeanDefinition();
+		rbd.setFactoryBeanName("mocksControl");
+		rbd.setFactoryMethodName("createMock");
+		rbd.getConstructorArgumentValues().addIndexedArgumentValue(0, Runnable.class);
+		bf.registerBeanDefinition("mock", rbd);
+
+		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
+		assertEquals(1, beans.size());
+	}
+
 
 	@SuppressWarnings("serial")
 	public static class NamedUrlList extends LinkedList<URL> {
@@ -722,4 +813,22 @@ public void setUrlNames(Set<URI> urlNames) throws MalformedURLException {
 		}
 	}
 
+
+	/**
+	 * Pseudo-implementation of EasyMock's {@code MocksControl} class.
+	 */
+	public static class MocksControl {
+
+		@SuppressWarnings("unchecked")
+		public <T> T createMock(Class<T> toMock) {
+			return (T) Proxy.newProxyInstance(BeanFactoryGenericsTests.class.getClassLoader(), new Class<?>[] {toMock},
+					new InvocationHandler() {
+						@Override
+						public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+							throw new UnsupportedOperationException("mocked!");
+						}
+					});
+		}
+	}
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
index f9f1beba04..7e44b200b3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,63 +16,95 @@
 
 package org.springframework.beans.factory.support;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
 
 /**
+ * Unit tests for {@code equals()} and {@code hashCode()} in bean definitions.
+ *
  * @author Rob Harrop
+ * @author Sam Brannen
  */
-public class DefinitionMetadataEqualsHashCodeTests extends TestCase {
+@SuppressWarnings("serial")
+public class DefinitionMetadataEqualsHashCodeTests {
 
-	@SuppressWarnings("serial")
-	public void testRootBeanDefinitionEqualsAndHashCode() throws Exception {
+	@Test
+	public void rootBeanDefinition() {
 		RootBeanDefinition master = new RootBeanDefinition(TestBean.class);
 		RootBeanDefinition equal = new RootBeanDefinition(TestBean.class);
 		RootBeanDefinition notEqual = new RootBeanDefinition(String.class);
-		RootBeanDefinition subclass = new RootBeanDefinition(TestBean.class) {};
+		RootBeanDefinition subclass = new RootBeanDefinition(TestBean.class) {
+		};
 		setBaseProperties(master);
 		setBaseProperties(equal);
 		setBaseProperties(notEqual);
 		setBaseProperties(subclass);
 
-		assertEqualsContract(master, equal, notEqual, subclass);
-		assertEquals("Hash code for equal instances should match", master.hashCode(), equal.hashCode());
+		assertEqualsAndHashCodeContracts(master, equal, notEqual, subclass);
 	}
 
-	@SuppressWarnings("serial")
-	public void testChildBeanDefinitionEqualsAndHashCode() throws Exception {
+	/**
+	 * @since 3.2.8
+	 * @see <a href="https://jira.springsource.org/browse/SPR-11420">SPR-11420</a>
+	 */
+	@Test
+	public void rootBeanDefinitionAndMethodOverridesWithDifferentOverloadedValues() {
+		RootBeanDefinition master = new RootBeanDefinition(TestBean.class);
+		RootBeanDefinition equal = new RootBeanDefinition(TestBean.class);
+
+		setBaseProperties(master);
+		setBaseProperties(equal);
+
+		// Simulate AbstractBeanDefinition.validate() which delegates to
+		// AbstractBeanDefinition.prepareMethodOverrides():
+		master.getMethodOverrides().getOverrides().iterator().next().setOverloaded(false);
+		// But do not simulate validation of the 'equal' bean. As a consequence, a method
+		// override in 'equal' will be marked as overloaded, but the corresponding
+		// override in 'master' will not. But... the bean definitions should still be
+		// considered equal.
+
+		assertEquals("Should be equal", master, equal);
+		assertEquals("Hash code for equal instances must match", master.hashCode(), equal.hashCode());
+	}
+
+	@Test
+	public void childBeanDefinition() {
 		ChildBeanDefinition master = new ChildBeanDefinition("foo");
 		ChildBeanDefinition equal = new ChildBeanDefinition("foo");
 		ChildBeanDefinition notEqual = new ChildBeanDefinition("bar");
-		ChildBeanDefinition subclass = new ChildBeanDefinition("foo"){};
+		ChildBeanDefinition subclass = new ChildBeanDefinition("foo") {
+		};
 		setBaseProperties(master);
 		setBaseProperties(equal);
 		setBaseProperties(notEqual);
 		setBaseProperties(subclass);
 
-		assertEqualsContract(master, equal, notEqual, subclass);
-		assertEquals("Hash code for equal instances should match", master.hashCode(), equal.hashCode());
+		assertEqualsAndHashCodeContracts(master, equal, notEqual, subclass);
 	}
 
-	public void testRuntimeBeanReference() throws Exception {
+	@Test
+	public void runtimeBeanReference() {
 		RuntimeBeanReference master = new RuntimeBeanReference("name");
 		RuntimeBeanReference equal = new RuntimeBeanReference("name");
 		RuntimeBeanReference notEqual = new RuntimeBeanReference("someOtherName");
-		RuntimeBeanReference subclass = new RuntimeBeanReference("name"){};
-		assertEqualsContract(master, equal, notEqual, subclass);
+		RuntimeBeanReference subclass = new RuntimeBeanReference("name") {
+		};
+		assertEqualsAndHashCodeContracts(master, equal, notEqual, subclass);
 	}
+
 	private void setBaseProperties(AbstractBeanDefinition definition) {
 		definition.setAbstract(true);
 		definition.setAttribute("foo", "bar");
 		definition.setAutowireCandidate(false);
 		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
-		//definition.getConstructorArgumentValues().addGenericArgumentValue("foo");
+		// definition.getConstructorArgumentValues().addGenericArgumentValue("foo");
 		definition.setDependencyCheck(AbstractBeanDefinition.DEPENDENCY_CHECK_OBJECTS);
-		definition.setDependsOn(new String[]{"foo", "bar"});
+		definition.setDependsOn(new String[] { "foo", "bar" });
 		definition.setDestroyMethodName("destroy");
 		definition.setEnforceDestroyMethod(false);
 		definition.setEnforceInitMethod(true);
@@ -89,10 +121,15 @@ private void setBaseProperties(AbstractBeanDefinition definition) {
 		definition.setSource("foo");
 	}
 
-	private void assertEqualsContract(Object master, Object equal, Object notEqual, Object subclass) {
+	private void assertEqualsAndHashCodeContracts(Object master, Object equal, Object notEqual, Object subclass) {
 		assertEquals("Should be equal", master, equal);
-		assertFalse("Should not be equal", master.equals(notEqual));
+		assertEquals("Hash code for equal instances should match", master.hashCode(), equal.hashCode());
+
+		assertNotEquals("Should not be equal", master, notEqual);
+		assertNotEquals("Hash code for non-equal instances should not match", master.hashCode(), notEqual.hashCode());
+
 		assertEquals("Subclass should be equal", master, subclass);
+		assertEquals("Hash code for subclass should match", master.hashCode(), subclass.hashCode());
 	}
 
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java
index 411f538045..719381c6b4 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java
@@ -16,59 +16,59 @@
 
 package org.springframework.beans.factory.support;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
+import java.util.Arrays;
 import java.util.Map;
 
+import org.junit.Before;
 import org.junit.Test;
 
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessor;
 import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.support.RootBeanDefinition;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 /**
  * Unit tests for SPR-8954, in which a custom {@link InstantiationAwareBeanPostProcessor}
  * forces the predicted type of a FactoryBean, effectively preventing retrieval of the
  * bean from calls to #getBeansOfType(FactoryBean.class). The implementation of
- * {@link AbstractBeanFactory#isFactoryBean(String, RootBeanDefinition)} now ensures
- * that not only the predicted bean type is considered, but also the original bean
- * definition's beanClass.
+ * {@link AbstractBeanFactory#isFactoryBean(String, RootBeanDefinition)} now ensures that
+ * not only the predicted bean type is considered, but also the original bean definition's
+ * beanClass.
  *
  * @author Chris Beams
  * @author Oliver Gierke
  */
 public class Spr8954Tests {
 
-	@Test
-	public void repro() {
-		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+	private DefaultListableBeanFactory bf;
+
+	@Before
+	public void setUp() {
+		bf = new DefaultListableBeanFactory();
 		bf.registerBeanDefinition("foo", new RootBeanDefinition(FooFactoryBean.class));
 		bf.addBeanPostProcessor(new PredictingBPP());
+	}
 
+	@Test
+	public void repro() {
 		assertThat(bf.getBean("foo"), instanceOf(Foo.class));
 		assertThat(bf.getBean("&foo"), instanceOf(FooFactoryBean.class));
-
 		assertThat(bf.isTypeMatch("&foo", FactoryBean.class), is(true));
 
 		@SuppressWarnings("rawtypes")
 		Map<String, FactoryBean> fbBeans = bf.getBeansOfType(FactoryBean.class);
-		assertThat(1, equalTo(fbBeans.size()));
-		assertThat("&foo", equalTo(fbBeans.keySet().iterator().next()));
+		assertThat(fbBeans.size(), is(1));
+		assertThat(fbBeans.keySet(), hasItem("&foo"));
 
 		Map<String, AnInterface> aiBeans = bf.getBeansOfType(AnInterface.class);
-		assertThat(1, equalTo(aiBeans.size()));
-		assertThat("&foo", equalTo(aiBeans.keySet().iterator().next()));
+		assertThat(aiBeans.size(), is(1));
+		assertThat(aiBeans.keySet(), hasItem("&foo"));
 	}
 
 	@Test
 	public void findsBeansByTypeIfNotInstantiated() {
-		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
-		bf.registerBeanDefinition("foo", new RootBeanDefinition(FooFactoryBean.class));
-		bf.addBeanPostProcessor(new PredictingBPP());
-
 		assertThat(bf.isTypeMatch("&foo", FactoryBean.class), is(true));
 
 		@SuppressWarnings("rawtypes")
@@ -77,8 +77,21 @@ public void findsBeansByTypeIfNotInstantiated() {
 		assertThat("&foo", equalTo(fbBeans.keySet().iterator().next()));
 
 		Map<String, AnInterface> aiBeans = bf.getBeansOfType(AnInterface.class);
-		assertThat(1, equalTo(aiBeans.size()));
-		assertThat("&foo", equalTo(aiBeans.keySet().iterator().next()));
+		assertThat(aiBeans.size(), is(1));
+		assertThat(aiBeans.keySet(), hasItem("&foo"));
+	}
+
+	/**
+	 * SPR-10517
+	 */
+	@Test
+	public void findsFactoryBeanNameByTypeWithoutInstantiation() {
+		String[] names = bf.getBeanNamesForType(AnInterface.class, false, false);
+		assertThat(Arrays.asList(names), hasItem("&foo"));
+
+		Map<String, AnInterface> beans = bf.getBeansOfType(AnInterface.class, false, false);
+		assertThat(beans.size(), is(1));
+		assertThat(beans.keySet(), hasItem("&foo"));
 	}
 
 
@@ -116,8 +129,7 @@ static class PredictingBPP extends InstantiationAwareBeanPostProcessorAdapter {
 
 		@Override
 		public Class<?> predictBeanType(Class<?> beanClass, String beanName) {
-			return FactoryBean.class.isAssignableFrom(beanClass) ?
-					PredictedType.class : null;
+			return FactoryBean.class.isAssignableFrom(beanClass) ? PredictedType.class : null;
 		}
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
index 0d67448bc0..c1ab301059 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.Properties;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
 import org.springframework.beans.factory.BeanCreationException;
@@ -30,6 +29,8 @@
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Juergen Hoeller
  * @author Chris Beams
@@ -259,6 +260,34 @@ public void testFactoryMethodNoMatchingStaticMethod() {
 		}
 	}
 
+	@Test
+	public void testNonExistingFactoryMethod() {
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf);
+		reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
+		try {
+			xbf.getBean("invalidPrototype");
+			fail("Should have thrown BeanCreationException");
+		}
+		catch (BeanCreationException ex) {
+			assertTrue(ex.getMessage().contains("nonExisting(TestBean)"));
+		}
+	}
+
+	@Test
+	public void testFactoryMethodArgumentsForNonExistingMethod() {
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf);
+		reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
+		try {
+			xbf.getBean("invalidPrototype", new TestBean());
+			fail("Should have thrown BeanCreationException");
+		}
+		catch (BeanCreationException ex) {
+			assertTrue(ex.getMessage().contains("nonExisting(TestBean)"));
+		}
+	}
+
 	@Test
 	public void testCanSpecifyFactoryMethodArgumentsOnFactoryMethodPrototype() {
 		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
@@ -360,7 +389,9 @@ public void testFactoryMethodForJavaMailSession() {
 
 }
 
+
 class MailSession {
+
 	private Properties props;
 
 	private MailSession() {
@@ -377,6 +408,6 @@ public static MailSession getDefaultInstance(Properties props) {
 	}
 
 	public Object getProperty(String key) {
-		return props.get(key);
+		return this.props.get(key);
 	}
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java
index ba8c74bfe9..f450baa03e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java
@@ -55,11 +55,11 @@ protected static FactoryMethods newInstance(TestBean tb, int num, String name) {
 		return new FactoryMethods(tb, name, num);
 	}
 
-	static FactoryMethods newInstance(TestBean tb, int num, Integer something) {
+	static ExtendedFactoryMethods newInstance(TestBean tb, int num, Integer something) {
 		if (something != null) {
 			throw new IllegalStateException("Should never be called with non-null value");
 		}
-		return new FactoryMethods(tb, null, num);
+		return new ExtendedFactoryMethods(tb, null, num);
 	}
 
 	@SuppressWarnings("unused")
@@ -120,4 +120,12 @@ public void setName(String name) {
 		this.name = name;
 	}
 
+
+	public static class ExtendedFactoryMethods extends FactoryMethods {
+
+		ExtendedFactoryMethods(TestBean tb, String name, int num) {
+			super(tb, name, num);
+		}
+	}
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
index 62c5962f86..abb935865f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
@@ -41,10 +41,12 @@ public class ProfileXmlBeanDefinitionTests {
 
 	private static final String PROD_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-prodProfile.xml";
 	private static final String DEV_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-devProfile.xml";
+	private static final String NOT_DEV_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-notDevProfile.xml";
 	private static final String ALL_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-noProfile.xml";
 	private static final String MULTI_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-multiProfile.xml";
+	private static final String MULTI_NOT_DEV_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml";
 	private static final String MULTI_ELIGIBLE_SPACE_DELIMITED_XML = "ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml";
-	private static final String UNKOWN_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-unknownProfile.xml";
+	private static final String UNKNOWN_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-unknownProfile.xml";
 	private static final String DEFAULT_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-defaultProfile.xml";
 	private static final String CUSTOM_DEFAULT_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-customDefaultProfile.xml";
 	private static final String DEFAULT_AND_DEV_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml";
@@ -71,10 +73,15 @@ public void testProfilePermutations() {
 		assertThat(beanFactoryFor(PROD_ELIGIBLE_XML, MULTI_ACTIVE), containsTargetBean());
 
 		assertThat(beanFactoryFor(DEV_ELIGIBLE_XML, NONE_ACTIVE), not(containsTargetBean()));
-		assertThat(beanFactoryFor(DEV_ELIGIBLE_XML, PROD_ACTIVE), not(containsTargetBean()));
 		assertThat(beanFactoryFor(DEV_ELIGIBLE_XML, DEV_ACTIVE), containsTargetBean());
+		assertThat(beanFactoryFor(DEV_ELIGIBLE_XML, PROD_ACTIVE), not(containsTargetBean()));
 		assertThat(beanFactoryFor(DEV_ELIGIBLE_XML, MULTI_ACTIVE), containsTargetBean());
 
+		assertThat(beanFactoryFor(NOT_DEV_ELIGIBLE_XML, NONE_ACTIVE), containsTargetBean());
+		assertThat(beanFactoryFor(NOT_DEV_ELIGIBLE_XML, DEV_ACTIVE), not(containsTargetBean()));
+		assertThat(beanFactoryFor(NOT_DEV_ELIGIBLE_XML, PROD_ACTIVE), containsTargetBean());
+		assertThat(beanFactoryFor(NOT_DEV_ELIGIBLE_XML, MULTI_ACTIVE), not(containsTargetBean()));
+
 		assertThat(beanFactoryFor(ALL_ELIGIBLE_XML, NONE_ACTIVE), containsTargetBean());
 		assertThat(beanFactoryFor(ALL_ELIGIBLE_XML, DEV_ACTIVE), containsTargetBean());
 		assertThat(beanFactoryFor(ALL_ELIGIBLE_XML, PROD_ACTIVE), containsTargetBean());
@@ -86,13 +93,19 @@ public void testProfilePermutations() {
 		assertThat(beanFactoryFor(MULTI_ELIGIBLE_XML, PROD_ACTIVE), containsTargetBean());
 		assertThat(beanFactoryFor(MULTI_ELIGIBLE_XML, MULTI_ACTIVE), containsTargetBean());
 
+		assertThat(beanFactoryFor(MULTI_NOT_DEV_ELIGIBLE_XML, NONE_ACTIVE), containsTargetBean());
+		assertThat(beanFactoryFor(MULTI_NOT_DEV_ELIGIBLE_XML, UNKNOWN_ACTIVE), containsTargetBean());
+		assertThat(beanFactoryFor(MULTI_NOT_DEV_ELIGIBLE_XML, DEV_ACTIVE), not(containsTargetBean()));
+		assertThat(beanFactoryFor(MULTI_NOT_DEV_ELIGIBLE_XML, PROD_ACTIVE), containsTargetBean());
+		assertThat(beanFactoryFor(MULTI_NOT_DEV_ELIGIBLE_XML, MULTI_ACTIVE), containsTargetBean());
+
 		assertThat(beanFactoryFor(MULTI_ELIGIBLE_SPACE_DELIMITED_XML, NONE_ACTIVE), not(containsTargetBean()));
 		assertThat(beanFactoryFor(MULTI_ELIGIBLE_SPACE_DELIMITED_XML, UNKNOWN_ACTIVE), not(containsTargetBean()));
 		assertThat(beanFactoryFor(MULTI_ELIGIBLE_SPACE_DELIMITED_XML, DEV_ACTIVE), containsTargetBean());
 		assertThat(beanFactoryFor(MULTI_ELIGIBLE_SPACE_DELIMITED_XML, PROD_ACTIVE), containsTargetBean());
 		assertThat(beanFactoryFor(MULTI_ELIGIBLE_SPACE_DELIMITED_XML, MULTI_ACTIVE), containsTargetBean());
 
-		assertThat(beanFactoryFor(UNKOWN_ELIGIBLE_XML, MULTI_ACTIVE), not(containsTargetBean()));
+		assertThat(beanFactoryFor(UNKNOWN_ELIGIBLE_XML, MULTI_ACTIVE), not(containsTargetBean()));
 	}
 
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
index 3bb04d4c59..14efce4d5c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,15 @@
 package org.springframework.beans.factory.xml;
 
 import java.lang.reflect.Proxy;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.Arrays;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.springframework.beans.factory.config.FieldRetrievingFactoryBean;
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
@@ -35,19 +36,23 @@
 import org.springframework.tests.beans.CollectingReaderEventListener;
 import org.springframework.tests.sample.beans.CustomEnum;
 import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.util.LinkedCaseInsensitiveMap;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @author Mark Fisher
  */
-public class UtilNamespaceHandlerTests extends TestCase {
+public class UtilNamespaceHandlerTests {
 
 	private DefaultListableBeanFactory beanFactory;
 
 	private CollectingReaderEventListener listener = new CollectingReaderEventListener();
 
-	@Override
+
+	@Before
 	public void setUp() {
 		this.beanFactory = new DefaultListableBeanFactory();
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory);
@@ -55,17 +60,21 @@ public void setUp() {
 		reader.loadBeanDefinitions(new ClassPathResource("testUtilNamespace.xml", getClass()));
 	}
 
-	public void testConstant() throws Exception {
+
+	@Test
+	public void testConstant() {
 		Integer min = (Integer) this.beanFactory.getBean("min");
 		assertEquals(Integer.MIN_VALUE, min.intValue());
 	}
 
-	public void testConstantWithDefaultName() throws Exception {
+	@Test
+	public void testConstantWithDefaultName() {
 		Integer max = (Integer) this.beanFactory.getBean("java.lang.Integer.MAX_VALUE");
 		assertEquals(Integer.MAX_VALUE, max.intValue());
 	}
 
-	public void testEvents() throws Exception {
+	@Test
+	public void testEvents() {
 		ComponentDefinition propertiesComponent = this.listener.getComponentDefinition("myProperties");
 		assertNotNull("Event for 'myProperties' not sent", propertiesComponent);
 		AbstractBeanDefinition propertiesBean = (AbstractBeanDefinition) propertiesComponent.getBeanDefinitions()[0];
@@ -77,30 +86,35 @@ public void testEvents() throws Exception {
 		assertEquals("Incorrect BeanDefinition", FieldRetrievingFactoryBean.class, constantBean.getBeanClass());
 	}
 
-	public void testNestedProperties() throws Exception {
+	@Test
+	public void testNestedProperties() {
 		TestBean bean = (TestBean) this.beanFactory.getBean("testBean");
 		Properties props = bean.getSomeProperties();
 		assertEquals("Incorrect property value", "bar", props.get("foo"));
 	}
 
-	public void testPropertyPath() throws Exception {
+	@Test
+	public void testPropertyPath() {
 		String name = (String) this.beanFactory.getBean("name");
 		assertEquals("Rob Harrop", name);
 	}
 
-	public void testNestedPropertyPath() throws Exception {
+	@Test
+	public void testNestedPropertyPath() {
 		TestBean bean = (TestBean) this.beanFactory.getBean("testBean");
 		assertEquals("Rob Harrop", bean.getName());
 	}
 
-	public void testSimpleMap() throws Exception {
+	@Test
+	public void testSimpleMap() {
 		Map map = (Map) this.beanFactory.getBean("simpleMap");
 		assertEquals("bar", map.get("foo"));
 		Map map2 = (Map) this.beanFactory.getBean("simpleMap");
 		assertTrue(map == map2);
 	}
 
-	public void testScopedMap() throws Exception {
+	@Test
+	public void testScopedMap() {
 		Map map = (Map) this.beanFactory.getBean("scopedMap");
 		assertEquals("bar", map.get("foo"));
 		Map map2 = (Map) this.beanFactory.getBean("scopedMap");
@@ -108,14 +122,16 @@ public void testScopedMap() throws Exception {
 		assertTrue(map != map2);
 	}
 
-	public void testSimpleList() throws Exception {
+	@Test
+	public void testSimpleList() {
 		List list = (List) this.beanFactory.getBean("simpleList");
 		assertEquals("Rob Harrop", list.get(0));
 		List list2 = (List) this.beanFactory.getBean("simpleList");
 		assertTrue(list == list2);
 	}
 
-	public void testScopedList() throws Exception {
+	@Test
+	public void testScopedList() {
 		List list = (List) this.beanFactory.getBean("scopedList");
 		assertEquals("Rob Harrop", list.get(0));
 		List list2 = (List) this.beanFactory.getBean("scopedList");
@@ -123,14 +139,16 @@ public void testScopedList() throws Exception {
 		assertTrue(list != list2);
 	}
 
-	public void testSimpleSet() throws Exception {
+	@Test
+	public void testSimpleSet() {
 		Set set = (Set) this.beanFactory.getBean("simpleSet");
 		assertTrue(set.contains("Rob Harrop"));
 		Set set2 = (Set) this.beanFactory.getBean("simpleSet");
 		assertTrue(set == set2);
 	}
 
-	public void testScopedSet() throws Exception {
+	@Test
+	public void testScopedSet() {
 		Set set = (Set) this.beanFactory.getBean("scopedSet");
 		assertTrue(set.contains("Rob Harrop"));
 		Set set2 = (Set) this.beanFactory.getBean("scopedSet");
@@ -138,13 +156,22 @@ public void testScopedSet() throws Exception {
 		assertTrue(set != set2);
 	}
 
-	public void testMapWithRef() throws Exception {
+	@Test
+	public void testMapWithRef() {
 		Map map = (Map) this.beanFactory.getBean("mapWithRef");
 		assertTrue(map instanceof TreeMap);
 		assertEquals(this.beanFactory.getBean("testBean"), map.get("bean"));
 	}
 
-	public void testNestedCollections() throws Exception {
+	@Test
+	public void testMapWithTypes() {
+		Map map = (Map) this.beanFactory.getBean("mapWithTypes");
+		assertTrue(map instanceof LinkedCaseInsensitiveMap);
+		assertEquals(this.beanFactory.getBean("testBean"), map.get("bean"));
+	}
+
+	@Test
+	public void testNestedCollections() {
 		TestBean bean = (TestBean) this.beanFactory.getBean("nestedCollectionsBean");
 
 		List list = bean.getSomeList();
@@ -171,7 +198,8 @@ public void testNestedCollections() throws Exception {
 		assertFalse(map == bean2.getSomeMap());
 	}
 
-	public void testNestedShortcutCollections() throws Exception {
+	@Test
+	public void testNestedShortcutCollections() {
 		TestBean bean = (TestBean) this.beanFactory.getBean("nestedShortcutCollections");
 
 		assertEquals(1, bean.getStringArray().length);
@@ -194,7 +222,8 @@ public void testNestedShortcutCollections() throws Exception {
 		assertFalse(set == bean2.getSomeSet());
 	}
 
-	public void testNestedInCollections() throws Exception {
+	@Test
+	public void testNestedInCollections() {
 		TestBean bean = (TestBean) this.beanFactory.getBean("nestedCustomTagBean");
 
 		List list = bean.getSomeList();
@@ -219,7 +248,8 @@ public void testNestedInCollections() throws Exception {
 		assertFalse(map == bean2.getSomeMap());
 	}
 
-	public void testCircularCollections() throws Exception {
+	@Test
+	public void testCircularCollections() {
 		TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionsBean");
 
 		List list = bean.getSomeList();
@@ -235,7 +265,8 @@ public void testCircularCollections() throws Exception {
 		assertEquals(bean, map.get("foo"));
 	}
 
-	public void testCircularCollectionBeansStartingWithList() throws Exception {
+	@Test
+	public void testCircularCollectionBeansStartingWithList() {
 		this.beanFactory.getBean("circularList");
 		TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionBeansBean");
 
@@ -255,7 +286,8 @@ public void testCircularCollectionBeansStartingWithList() throws Exception {
 		assertEquals(bean, map.get("foo"));
 	}
 
-	public void testCircularCollectionBeansStartingWithSet() throws Exception {
+	@Test
+	public void testCircularCollectionBeansStartingWithSet() {
 		this.beanFactory.getBean("circularSet");
 		TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionBeansBean");
 
@@ -275,7 +307,8 @@ public void testCircularCollectionBeansStartingWithSet() throws Exception {
 		assertEquals(bean, map.get("foo"));
 	}
 
-	public void testCircularCollectionBeansStartingWithMap() throws Exception {
+	@Test
+	public void testCircularCollectionBeansStartingWithMap() {
 		this.beanFactory.getBean("circularMap");
 		TestBean bean = (TestBean) this.beanFactory.getBean("circularCollectionBeansBean");
 
@@ -295,12 +328,14 @@ public void testCircularCollectionBeansStartingWithMap() throws Exception {
 		assertEquals(bean, map.get("foo"));
 	}
 
-	public void testNestedInConstructor() throws Exception {
+	@Test
+	public void testNestedInConstructor() {
 		TestBean bean = (TestBean) this.beanFactory.getBean("constructedTestBean");
 		assertEquals("Rob Harrop", bean.getName());
 	}
 
-	public void testLoadProperties() throws Exception {
+	@Test
+	public void testLoadProperties() {
 		Properties props = (Properties) this.beanFactory.getBean("myProperties");
 		assertEquals("Incorrect property value", "bar", props.get("foo"));
 		assertEquals("Incorrect property value", null, props.get("foo2"));
@@ -308,7 +343,8 @@ public void testLoadProperties() throws Exception {
 		assertTrue(props == props2);
 	}
 
-	public void testScopedProperties() throws Exception {
+	@Test
+	public void testScopedProperties() {
 		Properties props = (Properties) this.beanFactory.getBean("myScopedProperties");
 		assertEquals("Incorrect property value", "bar", props.get("foo"));
 		assertEquals("Incorrect property value", null, props.get("foo2"));
@@ -318,30 +354,35 @@ public void testScopedProperties() throws Exception {
 		assertTrue(props != props2);
 	}
 
-	public void testLocalProperties() throws Exception {
+	@Test
+	public void testLocalProperties() {
 		Properties props = (Properties) this.beanFactory.getBean("myLocalProperties");
 		assertEquals("Incorrect property value", null, props.get("foo"));
 		assertEquals("Incorrect property value", "bar2", props.get("foo2"));
 	}
 
-	public void testMergedProperties() throws Exception {
+	@Test
+	public void testMergedProperties() {
 		Properties props = (Properties) this.beanFactory.getBean("myMergedProperties");
 		assertEquals("Incorrect property value", "bar", props.get("foo"));
 		assertEquals("Incorrect property value", "bar2", props.get("foo2"));
 	}
 
+	@Test
 	public void testLocalOverrideDefault() {
 		Properties props = (Properties) this.beanFactory.getBean("defaultLocalOverrideProperties");
 		assertEquals("Incorrect property value", "bar", props.get("foo"));
 		assertEquals("Incorrect property value", "local2", props.get("foo2"));
 	}
 
+	@Test
 	public void testLocalOverrideFalse() {
 		Properties props = (Properties) this.beanFactory.getBean("falseLocalOverrideProperties");
 		assertEquals("Incorrect property value", "bar", props.get("foo"));
 		assertEquals("Incorrect property value", "local2", props.get("foo2"));
 	}
 
+	@Test
 	public void testLocalOverrideTrue() {
 		Properties props = (Properties) this.beanFactory.getBean("trueLocalOverrideProperties");
 		assertEquals("Incorrect property value", "local", props.get("foo"));
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
index c5da99f0e4..04f39e6909 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
@@ -29,7 +29,7 @@
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
 import org.springframework.tests.sample.beans.TestBean;
-
+import org.springframework.util.ObjectUtils;
 
 /**
  * @author Rick Evans
@@ -38,13 +38,13 @@
 public class XmlBeanDefinitionReaderTests extends TestCase {
 
 	public void testSetParserClassSunnyDay() {
-		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
+		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 		new XmlBeanDefinitionReader(registry).setDocumentReaderClass(DefaultBeanDefinitionDocumentReader.class);
 	}
 
 	public void testSetParserClassToNull() {
 		try {
-			SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
+			SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 			new XmlBeanDefinitionReader(registry).setDocumentReaderClass(null);
 			fail("Should have thrown IllegalArgumentException (null parserClass)");
 		}
@@ -54,7 +54,7 @@ public void testSetParserClassToNull() {
 
 	public void testSetParserClassToUnsupportedParserType() throws Exception {
 		try {
-			SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
+			SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 			new XmlBeanDefinitionReader(registry).setDocumentReaderClass(String.class);
 			fail("Should have thrown IllegalArgumentException (unsupported parserClass)");
 		}
@@ -64,7 +64,7 @@ public void testSetParserClassToUnsupportedParserType() throws Exception {
 
 	public void testWithOpenInputStream() {
 		try {
-			SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
+			SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 			Resource resource = new InputStreamResource(getClass().getResourceAsStream("test.xml"));
 			new XmlBeanDefinitionReader(registry).loadBeanDefinitions(resource);
 			fail("Should have thrown BeanDefinitionStoreException (can't determine validation mode)");
@@ -74,7 +74,7 @@ public void testWithOpenInputStream() {
 	}
 
 	public void testWithOpenInputStreamAndExplicitValidationMode() {
-		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
+		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 		Resource resource = new InputStreamResource(getClass().getResourceAsStream("test.xml"));
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(registry);
 		reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_DTD);
@@ -83,14 +83,14 @@ public void testWithOpenInputStreamAndExplicitValidationMode() {
 	}
 
 	public void testWithImport() {
-		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
+		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 		Resource resource = new ClassPathResource("import.xml", getClass());
 		new XmlBeanDefinitionReader(registry).loadBeanDefinitions(resource);
 		testBeanDefinitions(registry);
 	}
 
 	public void testWithWildcardImport() {
-		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
+		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 		Resource resource = new ClassPathResource("importPattern.xml", getClass());
 		new XmlBeanDefinitionReader(registry).loadBeanDefinitions(resource);
 		testBeanDefinitions(registry);
@@ -98,7 +98,7 @@ public void testWithWildcardImport() {
 
 	public void testWithInputSource() {
 		try {
-			SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
+			SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 			InputSource resource = new InputSource(getClass().getResourceAsStream("test.xml"));
 			new XmlBeanDefinitionReader(registry).loadBeanDefinitions(resource);
 			fail("Should have thrown BeanDefinitionStoreException (can't determine validation mode)");
@@ -108,7 +108,7 @@ public void testWithInputSource() {
 	}
 
 	public void testWithInputSourceAndExplicitValidationMode() {
-		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
+		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 		InputSource resource = new InputSource(getClass().getResourceAsStream("test.xml"));
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(registry);
 		reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_DTD);
@@ -117,7 +117,7 @@ public void testWithInputSourceAndExplicitValidationMode() {
 	}
 
 	public void testWithFreshInputStream() {
-		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
+		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
 		Resource resource = new ClassPathResource("test.xml", getClass());
 		new XmlBeanDefinitionReader(registry).loadBeanDefinitions(resource);
 		testBeanDefinitions(registry);
@@ -133,9 +133,10 @@ private void testBeanDefinitions(BeanDefinitionRegistry registry) {
 		assertEquals(TestBean.class.getName(), registry.getBeanDefinition("rod").getBeanClassName());
 		assertEquals(TestBean.class.getName(), registry.getBeanDefinition("aliased").getBeanClassName());
 		assertTrue(registry.isAlias("youralias"));
-		assertEquals(2, registry.getAliases("aliased").length);
-		assertEquals("myalias", registry.getAliases("aliased")[0]);
-		assertEquals("youralias", registry.getAliases("aliased")[1]);
+		String[] aliases = registry.getAliases("aliased");
+		assertEquals(2, aliases.length);
+		assertTrue(ObjectUtils.containsElement(aliases, "myalias"));
+		assertTrue(ObjectUtils.containsElement(aliases, "youralias"));
 	}
 
 	public void testDtdValidationAutodetect() throws Exception {
@@ -147,7 +148,7 @@ public void testXsdValidationAutodetect() throws Exception {
 	}
 
 	private void doTestValidation(String resourceName) throws Exception {
-		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();;
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
 		Resource resource = new ClassPathResource(resourceName, getClass());
 		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(resource);
 		TestBean bean = (TestBean) factory.getBean("testBean");
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
index af590e3936..c14e52fd56 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,6 @@
  * @author Rob Harrop
  * @author Arjen Poutsma
  * @author Chris Beams
- *
  * @since 10.06.2003
  */
 public class CustomEditorTests {
@@ -302,8 +301,8 @@ public void testCustomBooleanEditorWithAllowEmpty() {
 
 	@Test
 	public void testCustomBooleanEditorWithSpecialTrueAndFalseStrings() throws Exception {
-		final String trueString = "pechorin";
-		final String falseString = "nash";
+		String trueString = "pechorin";
+		String falseString = "nash";
 
 		CustomBooleanEditor editor = new CustomBooleanEditor(trueString, falseString, false);
 
@@ -320,6 +319,14 @@ public void testCustomBooleanEditorWithSpecialTrueAndFalseStrings() throws Excep
 		editor.setAsText(falseString.toUpperCase());
 		assertFalse(((Boolean) editor.getValue()).booleanValue());
 		assertEquals(falseString, editor.getAsText());
+
+		try {
+			editor.setAsText(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException ex) {
+			// expected
+		}
 	}
 
 	@Test
@@ -423,7 +430,7 @@ public void testCustomNumberEditorWithoutAllowEmpty() {
 		assertTrue("Correct bigDecimal value", new BigDecimal("4.5").equals(tb.getBigDecimal()));
 	}
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void testCustomNumberEditorCtorWithNullNumberType() throws Exception {
 		new CustomNumberEditor(null, true);
 	}
@@ -543,7 +550,7 @@ public void testCharacterEditorWithAllowEmpty() {
 		assertNull(cb.getMyCharacter());
 	}
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void testCharacterEditorSetAsTextWithStringLongerThanOneCharacter() throws Exception {
 		PropertyEditor charEditor = new CharacterEditor(false);
 		charEditor.setAsText("ColdWaterCanyon");
@@ -562,7 +569,7 @@ public void testCharacterEditorGetAsTextReturnsEmptyStringIfValueIsNull() throws
 		assertEquals(" ", charEditor.getAsText());
 	}
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void testCharacterEditorSetAsTextWithNullNotAllowingEmptyAsNull() throws Exception {
 		PropertyEditor charEditor = new CharacterEditor(false);
 		charEditor.setAsText(null);
@@ -583,7 +590,7 @@ public void testClassEditor() {
 		assertEquals("", classEditor.getAsText());
 	}
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void testClassEditorWithNonExistentClass() throws Exception {
 		PropertyEditor classEditor = new ClassEditor();
 		classEditor.setAsText("hairdresser.on.Fire");
@@ -685,26 +692,40 @@ public void testPatternEditor() {
 	@Test
 	public void testCustomBooleanEditor() {
 		CustomBooleanEditor editor = new CustomBooleanEditor(false);
+
 		editor.setAsText("true");
 		assertEquals(Boolean.TRUE, editor.getValue());
 		assertEquals("true", editor.getAsText());
+
 		editor.setAsText("false");
 		assertEquals(Boolean.FALSE, editor.getValue());
 		assertEquals("false", editor.getAsText());
+
 		editor.setValue(null);
 		assertEquals(null, editor.getValue());
 		assertEquals("", editor.getAsText());
+
+		try {
+			editor.setAsText(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException ex) {
+			// expected
+		}
 	}
 
 	@Test
 	public void testCustomBooleanEditorWithEmptyAsNull() {
 		CustomBooleanEditor editor = new CustomBooleanEditor(true);
+
 		editor.setAsText("true");
 		assertEquals(Boolean.TRUE, editor.getValue());
 		assertEquals("true", editor.getAsText());
+
 		editor.setAsText("false");
 		assertEquals(Boolean.FALSE, editor.getValue());
 		assertEquals("false", editor.getAsText());
+
 		editor.setValue(null);
 		assertEquals(null, editor.getValue());
 		assertEquals("", editor.getAsText());
@@ -750,7 +771,7 @@ public void testCustomDateEditorWithExactDateLength() {
 		}
 		catch (IllegalArgumentException ex) {
 			// expected
-			assertTrue(ex.getMessage().indexOf("10") != -1);
+			assertTrue(ex.getMessage().contains("10"));
 		}
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java b/spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java
index b581a05f03..b749d868ed 100644
--- a/spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java
+++ b/spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,13 +36,15 @@
  */
 public class CollectingReaderEventListener implements ReaderEventListener {
 
-	private final List defaults = new LinkedList();
+	private final List<DefaultsDefinition> defaults = new LinkedList<DefaultsDefinition>();
 
-	private final Map componentDefinitions = new LinkedHashMap<>(8);
+	private final Map<String, ComponentDefinition> componentDefinitions =
+			new LinkedHashMap<String, ComponentDefinition>(8);
 
-	private final Map aliasMap = new LinkedHashMap<>(8);
+	private final Map<String, List<AliasDefinition>> aliasMap =
+			new LinkedHashMap<String, List<AliasDefinition>>(8);
 
-	private final List imports = new LinkedList();
+	private final List<ImportDefinition> imports = new LinkedList<ImportDefinition>();
 
 
 	@Override
@@ -50,7 +52,7 @@ public void defaultsRegistered(DefaultsDefinition defaultsDefinition) {
 		this.defaults.add(defaultsDefinition);
 	}
 
-	public List getDefaults() {
+	public List<DefaultsDefinition> getDefaults() {
 		return Collections.unmodifiableList(this.defaults);
 	}
 
@@ -60,27 +62,27 @@ public void componentRegistered(ComponentDefinition componentDefinition) {
 	}
 
 	public ComponentDefinition getComponentDefinition(String name) {
-		return (ComponentDefinition) this.componentDefinitions.get(name);
+		return this.componentDefinitions.get(name);
 	}
 
 	public ComponentDefinition[] getComponentDefinitions() {
-		Collection collection = this.componentDefinitions.values();
-		return (ComponentDefinition[]) collection.toArray(new ComponentDefinition[collection.size()]);
+		Collection<ComponentDefinition> collection = this.componentDefinitions.values();
+		return collection.toArray(new ComponentDefinition[collection.size()]);
 	}
 
 	@Override
 	public void aliasRegistered(AliasDefinition aliasDefinition) {
-		List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName());
-		if(aliases == null) {
-			aliases = new ArrayList();
+		List<AliasDefinition> aliases = this.aliasMap.get(aliasDefinition.getBeanName());
+		if (aliases == null) {
+			aliases = new ArrayList<AliasDefinition>();
 			this.aliasMap.put(aliasDefinition.getBeanName(), aliases);
 		}
 		aliases.add(aliasDefinition);
 	}
 
-	public List getAliases(String beanName) {
-		List aliases = (List) this.aliasMap.get(beanName);
-		return aliases == null ? null : Collections.unmodifiableList(aliases);
+	public List<AliasDefinition> getAliases(String beanName) {
+		List<AliasDefinition> aliases = this.aliasMap.get(beanName);
+		return (aliases != null ? Collections.unmodifiableList(aliases) : null);
 	}
 
 	@Override
@@ -88,7 +90,7 @@ public void importProcessed(ImportDefinition importDefinition) {
 		this.imports.add(importDefinition);
 	}
 
-	public List getImports() {
+	public List<ImportDefinition> getImports() {
 		return Collections.unmodifiableList(this.imports);
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/DerivedTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DerivedTestBean.java
index 91416208a2..d12db5b7ad 100644
--- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/DerivedTestBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DerivedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,6 +71,11 @@ public void setSpouseRef(String name) {
 		setSpouse(new TestBean(name));
 	}
 
+	@Override
+	public TestBean getSpouse() {
+		return (TestBean) super.getSpouse();
+	}
+
 
 	public void initialize() {
 		this.initialized = true;
diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/TestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/TestBean.java
index cb276da9cb..5d1bcad7ac 100644
--- a/spring-beans/src/test/java/org/springframework/tests/sample/beans/TestBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,13 +76,13 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 
 	private Float myFloat = new Float(0.0);
 
-	private Collection<? super Object> friends = new LinkedList<>();
+	private Collection<? super Object> friends = new LinkedList<Object>();
 
-	private Set<?> someSet = new HashSet<>();
+	private Set<?> someSet = new HashSet<Object>();
 
-	private Map<?, ?> someMap = new HashMap<>();
+	private Map<?, ?> someMap = new HashMap<Object, Object>();
 
-	private List<?> someList = new ArrayList<>();
+	private List<?> someList = new ArrayList<Object>();
 
 	private Properties someProperties = new Properties();
 
@@ -255,10 +255,12 @@ public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
 
+	@Override
 	public Integer[] getSomeIntegerArray() {
 		return someIntegerArray;
 	}
 
+	@Override
 	public void setSomeIntegerArray(Integer[] someIntegerArray) {
 		this.someIntegerArray = someIntegerArray;
 	}
@@ -461,6 +463,7 @@ public boolean wasDestroyed() {
 	}
 
 
+	@Override
 	public boolean equals(Object other) {
 		if (this == other) {
 			return true;
@@ -472,6 +475,7 @@ public boolean equals(Object other) {
 		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
 	}
 
+	@Override
 	public int hashCode() {
 		return this.age;
 	}
@@ -486,6 +490,7 @@ public int compareTo(Object other) {
 		}
 	}
 
+	@Override
 	public String toString() {
 		return this.name;
 	}
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml
new file mode 100644
index 0000000000..b0a246c4a2
--- /dev/null
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+		http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
+	profile="!dev,prod">
+
+	<bean id="foo" class="java.lang.String"/>
+</beans>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-notDevProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-notDevProfile.xml
new file mode 100644
index 0000000000..06ac54a37a
--- /dev/null
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-notDevProfile.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+		http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
+	profile="!dev">
+
+	<bean id="foo" class="java.lang.String"/>
+</beans>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
index 974ae6c3d9..73294dfbae 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
@@ -35,11 +35,10 @@
 		</property>
 	</bean>
 
-	<bean id="pJenny" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
+	<bean id="pJenny" class="org.springframework.tests.sample.beans.DerivedTestBean" scope="prototype">
 		<property name="name"><value>Jenny</value></property>
 		<property name="age"><value>30</value></property>
 		<property name="spouse">
-		<!-- Could use id and href -->
 			<ref local="david"/>
 		</property>
 	</bean>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
index 4ff20b3d59..ffcd3f7da9 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
@@ -84,6 +84,11 @@
 		<property name="stringValue"><value>testBeanOnlyPrototypeDISetterString</value></property>
 	</bean>
 
+	<bean id="invalidPrototype" class="org.springframework.beans.factory.xml.FactoryMethods"
+		  factory-method="nonExisting" scope="prototype">
+		<constructor-arg><ref local="juergen"/></constructor-arg>
+	</bean>
+
 	<bean id="fullPrototype" class="org.springframework.beans.factory.xml.FactoryMethods"
 			factory-method="newInstance" scope="prototype">
 		<constructor-arg type="int"><value>27</value></constructor-arg>
@@ -120,9 +125,7 @@
 		<constructor-arg><value type="java.lang.Integer">33</value></constructor-arg>
 	</bean>
 	
-	<bean id="instanceFactoryMethodWithoutArgs"
-			factory-bean="instanceFactory"
-			factory-method="defaultInstance"/>
+	<bean id="instanceFactoryMethodWithoutArgs" factory-bean="instanceFactory" factory-method="defaultInstance"/>
 
 	<!-- Unnamed bean with factory-bean declaration -->
 	<bean factory-bean="instanceFactory" factory-method="defaultInstance"/>
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
index 25f20439fa..2b71bca48f 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
@@ -15,7 +15,7 @@
 	<util:property-path id="name" path="
 			configuredBean.
 			name
-  "/>
+	"/>
 
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
 		<property name="name">
@@ -49,6 +49,11 @@
 		<entry key="bean" value-ref="testBean"/>
 	</util:map>
 
+	<util:map id="mapWithTypes" map-class="org.springframework.util.LinkedCaseInsensitiveMap"
+			  key-type="java.lang.String" value-type="org.springframework.tests.sample.beans.TestBean">
+		<entry key="bean" value-ref="testBean"/>
+	</util:map>
+
 	<util:list id="simpleList">
 		<value>Rob Harrop</value>
 	</util:list>
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java
index 80ca887b9c..316ff15d09 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ public EhCacheCacheManager() {
 	}
 
 	/**
-	 * Create a new EhCacheCacheManager for the given backing EhCache.
+	 * Create a new EhCacheCacheManager for the given backing EhCache CacheManager.
 	 * @param cacheManager the backing EhCache {@link net.sf.ehcache.CacheManager}
 	 */
 	public EhCacheCacheManager(net.sf.ehcache.CacheManager cacheManager) {
@@ -92,8 +92,8 @@ public Cache getCache(String name) {
 			// (in case the cache was added at runtime)
 			Ehcache ehcache = this.cacheManager.getEhcache(name);
 			if (ehcache != null) {
-				cache = new EhCacheCache(ehcache);
-				addCache(cache);
+				addCache(new EhCacheCache(ehcache));
+				cache = super.getCache(name);  // potentially decorated
 			}
 		}
 		return cache;
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java
index dcec4047ee..4806cddb15 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheFactoryBean.java
@@ -38,6 +38,7 @@
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 
 /**
  * {@link FactoryBean} that creates a named EhCache {@link net.sf.ehcache.Cache} instance
@@ -64,6 +65,11 @@
  */
 public class EhCacheFactoryBean implements FactoryBean<Ehcache>, BeanNameAware, InitializingBean {
 
+	// EhCache's setStatisticsEnabled(boolean) available? Not anymore as of EhCache 2.7...
+	private static final boolean setStatisticsAvailable =
+			ClassUtils.hasMethod(Ehcache.class, "setStatisticsEnabled", boolean.class);
+
+
 	protected final Log logger = LogFactory.getLog(getClass());
 
 	private CacheManager cacheManager;
@@ -275,7 +281,9 @@ public void setCacheEventListeners(Set<CacheEventListener> cacheEventListeners)
 
 	/**
 	 * Set whether to enable EhCache statistics on this cache.
-	 * @see net.sf.ehcache.Cache#setStatisticsEnabled
+	 * <p>Note: As of EhCache 2.7, statistics are enabled by default, and cannot be turned off.
+	 * This setter therefore has no effect in such a scenario.
+	 * @see net.sf.ehcache.Ehcache#setStatisticsEnabled
 	 */
 	public void setStatisticsEnabled(boolean statisticsEnabled) {
 		this.statisticsEnabled = statisticsEnabled;
@@ -283,7 +291,9 @@ public void setStatisticsEnabled(boolean statisticsEnabled) {
 
 	/**
 	 * Set whether to enable EhCache's sampled statistics on this cache.
-	 * @see net.sf.ehcache.Cache#setSampledStatisticsEnabled
+	 * <p>Note: As of EhCache 2.7, statistics are enabled by default, and cannot be turned off.
+	 * This setter therefore has no effect in such a scenario.
+	 * @see net.sf.ehcache.Ehcache#setSampledStatisticsEnabled
 	 */
 	public void setSampledStatisticsEnabled(boolean sampledStatisticsEnabled) {
 		this.sampledStatisticsEnabled = sampledStatisticsEnabled;
@@ -316,44 +326,55 @@ public void afterPropertiesSet() throws CacheException, IOException {
 			this.cacheName = this.beanName;
 		}
 
-		// Fetch cache region: If none with the given name exists,
-		// create one on the fly.
-		Ehcache rawCache;
-		if (this.cacheManager.cacheExists(this.cacheName)) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Using existing EhCache cache region '" + this.cacheName + "'");
+		synchronized (this.cacheManager) {
+			// Fetch cache region: If none with the given name exists,
+			// create one on the fly.
+			Ehcache rawCache;
+			boolean cacheExists = this.cacheManager.cacheExists(this.cacheName);
+
+			if (cacheExists) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("Using existing EhCache cache region '" + this.cacheName + "'");
+				}
+				rawCache = this.cacheManager.getEhcache(this.cacheName);
 			}
-			rawCache = this.cacheManager.getEhcache(this.cacheName);
-		}
-		else {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Creating new EhCache cache region '" + this.cacheName + "'");
+			else {
+				if (logger.isDebugEnabled()) {
+					logger.debug("Creating new EhCache cache region '" + this.cacheName + "'");
+				}
+				rawCache = createCache();
 			}
-			rawCache = createCache();
-			this.cacheManager.addCache(rawCache);
-		}
 
-		if (this.cacheEventListeners != null) {
-			for (CacheEventListener listener : this.cacheEventListeners) {
-				rawCache.getCacheEventNotificationService().registerListener(listener);
+			if (this.cacheEventListeners != null) {
+				for (CacheEventListener listener : this.cacheEventListeners) {
+					rawCache.getCacheEventNotificationService().registerListener(listener);
+				}
+			}
+
+			// Needs to happen after listener registration but before setStatisticsEnabled
+			if (!cacheExists) {
+				this.cacheManager.addCache(rawCache);
 			}
-		}
-		if (this.statisticsEnabled) {
-			rawCache.setStatisticsEnabled(true);
-		}
-		if (this.sampledStatisticsEnabled) {
-			rawCache.setSampledStatisticsEnabled(true);
-		}
-		if (this.disabled) {
-			rawCache.setDisabled(true);
-		}
 
-		// Decorate cache if necessary.
-		Ehcache decoratedCache = decorateCache(rawCache);
-		if (decoratedCache != rawCache) {
-			this.cacheManager.replaceCacheWithDecoratedCache(rawCache, decoratedCache);
+			// Only necessary on EhCache <2.7: As of 2.7, statistics are on by default.
+			if (setStatisticsAvailable) {
+				if (this.statisticsEnabled) {
+					rawCache.setStatisticsEnabled(true);
+				}
+				if (this.sampledStatisticsEnabled) {
+					rawCache.setSampledStatisticsEnabled(true);
+				}
+			}
+			if (this.disabled) {
+				rawCache.setDisabled(true);
+			}
+
+			Ehcache decoratedCache = decorateCache(rawCache);
+			if (decoratedCache != rawCache) {
+				this.cacheManager.replaceCacheWithDecoratedCache(rawCache, decoratedCache);
+			}
+			this.cache = decoratedCache;
 		}
-		this.cache = decoratedCache;
 	}
 
 	/**
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java
index a94c1fe2cb..b2e1aa6cdc 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@
  * also necessary for loading EhCache configuration from a non-default config location.
  *
  * <p>Note: As of Spring 3.0, Spring's EhCache support requires EhCache 1.3 or higher.
- * As of Spring 3.2, we recommend using EhCache 2.1 or higher.
+ * As of Spring 3.2, we recommend using EhCache 2.5 or higher.
  *
  * @author Dmitriy Kopylenko
  * @author Juergen Hoeller
@@ -106,7 +106,7 @@ public void setCacheManagerName(String cacheManagerName) {
 	}
 
 
-	public void afterPropertiesSet() throws IOException, CacheException {
+	public void afterPropertiesSet() throws CacheException, IOException {
 		logger.info("Initializing EhCache CacheManager");
 		InputStream is = (this.configLocation != null ? this.configLocation.getInputStream() : null);
 		try {
diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java
index d47e3dcb92..7c5ede5ca8 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -126,6 +126,10 @@ protected Object toStoreValue(Object userValue) {
 
 	@SuppressWarnings("serial")
 	private static class NullHolder implements Serializable {
+
+		private Object readResolve() {
+			return NULL_HOLDER;
+		}
 	}
 
 }
diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java
index e06d8492d2..181b9bf7c8 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,8 +110,8 @@ public Cache getCache(String name) {
 			// (in case the cache was added at runtime)
 			javax.cache.Cache<?,?> jcache = this.cacheManager.getCache(name);
 			if (jcache != null) {
-				cache = new JCacheCache(jcache, this.allowNullValues);
-				addCache(cache);
+				addCache(new JCacheCache(jcache, this.allowNullValues));
+				cache = super.getCache(name);  // potentially decorated
 			}
 		}
 		return cache;
diff --git a/spring-context-support/src/main/java/org/springframework/cache/transaction/TransactionAwareCacheManagerProxy.java b/spring-context-support/src/main/java/org/springframework/cache/transaction/TransactionAwareCacheManagerProxy.java
index efcfd8f54c..ea981c6a03 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/transaction/TransactionAwareCacheManagerProxy.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/transaction/TransactionAwareCacheManagerProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ public void setTargetCacheManager(CacheManager targetCacheManager) {
 
 	public void afterPropertiesSet() {
 		if (this.targetCacheManager == null) {
-			throw new IllegalStateException("'targetCacheManager' is required");
+			throw new IllegalArgumentException("Property 'targetCacheManager' is required");
 		}
 	}
 
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
index ac683c5243..7ec61d262c 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
  * <p>The mapping file should be in the following format, as specified by the
  * Java Activation Framework:
  *
- * <pre>
+ * <pre class="code">
  * # map text/html to .htm and .html files
  * text/html  html htm HTML HTM</pre>
  *
@@ -93,7 +93,7 @@ public void setMappingLocation(Resource mappingLocation) {
 	 * Java Activation Framework, for example:<br>
 	 * {@code text/html  html htm HTML HTM}
 	 */
-	public void setMappings(String[] mappings) {
+	public void setMappings(String... mappings) {
 		this.mappings = mappings;
 	}
 
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java
index 76714ce5f2..81c26787b8 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -126,7 +126,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
 		}
 
 		public long getDelay(TimeUnit unit) {
-			return unit.convert(System.currentTimeMillis() - this.timer.getScheduledExecutionTime(), TimeUnit.MILLISECONDS);
+			return unit.convert(this.timer.getScheduledExecutionTime() - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
 		}
 
 		public int compareTo(Delayed other) {
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
index 4d1518dfa9..4995752109 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,9 @@
 package org.springframework.scheduling.commonj;
 
 import java.util.Collection;
+import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
-import java.util.concurrent.Callable;
-
 import javax.naming.NamingException;
 
 import commonj.work.Work;
@@ -54,10 +53,8 @@
  * server's JNDI environment, as defined in the server's management console.
  *
  * <p><b>Note: At the time of this writing, the CommonJ WorkManager facility
- * is only supported on IBM WebSphere 6.0+ and BEA WebLogic 9.0+,
+ * is only supported on IBM WebSphere 6.1+ and BEA WebLogic 9.0+,
  * despite being such a crucial API for an application server.</b>
- * (There is a similar facility available on WebSphere 5.1 Enterprise,
- * though, which we will discuss below.)
  *
  * <p><b>On JBoss and GlassFish, a similar facility is available through
  * the JCA WorkManager.</b> See the
@@ -80,8 +77,7 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 
 	/**
 	 * Specify the CommonJ WorkManager to delegate to.
-	 * <p>Alternatively, you can also specify the JNDI name
-	 * of the target WorkManager.
+	 * <p>Alternatively, you can also specify the JNDI name of the target WorkManager.
 	 * @see #setWorkManagerName
 	 */
 	public void setWorkManager(WorkManager workManager) {
@@ -90,9 +86,8 @@ public void setWorkManager(WorkManager workManager) {
 
 	/**
 	 * Set the JNDI name of the CommonJ WorkManager.
-	 * <p>This can either be a fully qualified JNDI name,
-	 * or the JNDI name relative to the current environment
-	 * naming context if "resourceRef" is set to "true".
+	 * <p>This can either be a fully qualified JNDI name, or the JNDI name relative
+	 * to the current environment naming context if "resourceRef" is set to "true".
 	 * @see #setWorkManager
 	 * @see #setResourceRef
 	 */
@@ -170,27 +165,19 @@ public boolean prefersShortLivedTasks() {
 	// Implementation of the CommonJ WorkManager interface
 	//-------------------------------------------------------------------------
 
-	public WorkItem schedule(Work work)
-			throws WorkException, IllegalArgumentException {
-
+	public WorkItem schedule(Work work) throws WorkException, IllegalArgumentException {
 		return this.workManager.schedule(work);
 	}
 
-	public WorkItem schedule(Work work, WorkListener workListener)
-			throws WorkException, IllegalArgumentException {
-
+	public WorkItem schedule(Work work, WorkListener workListener) throws WorkException {
 		return this.workManager.schedule(work, workListener);
 	}
 
-	public boolean waitForAll(Collection workItems, long timeout)
-			throws InterruptedException, IllegalArgumentException {
-
+	public boolean waitForAll(Collection workItems, long timeout) throws InterruptedException {
 		return this.workManager.waitForAll(workItems, timeout);
 	}
 
-	public Collection waitForAny(Collection workItems, long timeout)
-			throws InterruptedException, IllegalArgumentException {
-
+	public Collection waitForAny(Collection workItems, long timeout) throws InterruptedException {
 		return this.workManager.waitForAny(workItems, timeout);
 	}
 
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java
index aa40358ca9..5d4bf87d8b 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
  * JobFactory implementation that supports {@link java.lang.Runnable}
  * objects as well as standard Quartz {@link org.quartz.Job} instances.
  *
- * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0/2.1, as of Spring 3.1.
+ * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0-2.2, as of Spring 3.2.
  *
  * @author Juergen Hoeller
  * @since 2.0
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java
index c5e1c070b8..8ca82b4918 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
  * Use Quartz 2.0's native {@code JobDetailImpl} class or the new Quartz 2.0
  * builder API instead. Alternatively, switch to Spring's {@link CronTriggerFactoryBean}
  * which largely is a drop-in replacement for this class and its properties and
- * consistently works against Quartz 1.x as well as Quartz 2.0/2.1.
+ * consistently works against Quartz 1.x as well as Quartz 2.x.
  *
  * @author Juergen Hoeller
  * @since 18.02.2004
@@ -73,7 +73,7 @@ public class CronTriggerBean extends CronTrigger
 
 	private String beanName;
 
-	private long startDelay;
+	private long startDelay = 0;
 
 
 	/**
@@ -108,9 +108,9 @@ public void setMisfireInstructionName(String constantName) {
 	 * @see SchedulerFactoryBean#setTriggerListeners
 	 * @see org.quartz.TriggerListener#getName
 	 */
-	public void setTriggerListenerNames(String[] names) {
-		for (int i = 0; i < names.length; i++) {
-			addTriggerListener(names[i]);
+	public void setTriggerListenerNames(String... names) {
+		for (String name : names) {
+			addTriggerListener(name);
 		}
 	}
 
@@ -148,19 +148,19 @@ public void setBeanName(String beanName) {
 	}
 
 
+	/**
+	 * Note that this method's declaration of an Exception is deprecated
+	 * and will be removed in the Spring 4.0 line.
+	 */
 	public void afterPropertiesSet() throws Exception {
-		if (this.startDelay > 0) {
-			setStartTime(new Date(System.currentTimeMillis() + this.startDelay));
-		}
-
 		if (getName() == null) {
 			setName(this.beanName);
 		}
 		if (getGroup() == null) {
 			setGroup(Scheduler.DEFAULT_GROUP);
 		}
-		if (getStartTime() == null) {
-			setStartTime(new Date());
+		if (this.startDelay > 0 || getStartTime() == null) {
+			setStartTime(new Date(System.currentTimeMillis() + this.startDelay));
 		}
 		if (getTimeZone() == null) {
 			setTimeZone(TimeZone.getDefault());
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java
index 101c3fdf04..03fc938b3b 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.Constants;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -49,7 +50,7 @@
  * to automatically register a trigger for the corresponding JobDetail,
  * instead of registering the JobDetail separately.
  *
- * <p><b>NOTE:</b> This FactoryBean works against both Quartz 1.x and Quartz 2.0/2.1,
+ * <p><b>NOTE:</b> This FactoryBean works against both Quartz 1.x and Quartz 2.x,
  * in contrast to the older {@link CronTriggerBean} class.
  *
  * @author Juergen Hoeller
@@ -78,16 +79,20 @@ public class CronTriggerFactoryBean implements FactoryBean<CronTrigger>, BeanNam
 
 	private Date startTime;
 
-	private long startDelay;
+	private long startDelay = 0;
 
 	private String cronExpression;
 
 	private TimeZone timeZone;
 
+	private String calendarName;
+
 	private int priority;
 
 	private int misfireInstruction;
 
+	private String description;
+
 	private String beanName;
 
 	private CronTrigger cronTrigger;
@@ -141,6 +146,15 @@ public void setJobDataAsMap(Map<String, ?> jobDataAsMap) {
 		this.jobDataMap.putAll(jobDataAsMap);
 	}
 
+	/**
+	 * Set a specific start time for the trigger.
+	 * <p>Note that a dynamically computed {@link #setStartDelay} specification
+	 * overrides a static timestamp set here.
+	 */
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
 	/**
 	 * Set the start delay in milliseconds.
 	 * <p>The start delay is added to the current system time (when the bean starts)
@@ -165,6 +179,13 @@ public void setTimeZone(TimeZone timeZone) {
 		this.timeZone = timeZone;
 	}
 
+	/**
+	 * Associate a specific calendar with this cron trigger.
+	 */
+	public void setCalendarName(String calendarName) {
+		this.calendarName = calendarName;
+	}
+
 	/**
 	 * Specify the priority of this trigger.
 	 */
@@ -191,6 +212,13 @@ public void setMisfireInstructionName(String constantName) {
 		this.misfireInstruction = constants.asNumber(constantName).intValue();
 	}
 
+	/**
+	 * Associate a textual description with this trigger.
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -206,12 +234,9 @@ public void afterPropertiesSet() {
 		if (this.jobDetail != null) {
 			this.jobDataMap.put(JobDetailAwareTrigger.JOB_DETAIL_KEY, this.jobDetail);
 		}
-		if (this.startDelay > 0) {
+		if (this.startDelay > 0 || this.startTime == null) {
 			this.startTime = new Date(System.currentTimeMillis() + this.startDelay);
 		}
-		else if (this.startTime == null) {
-			this.startTime = new Date();
-		}
 		if (this.timeZone == null) {
 			this.timeZone = TimeZone.getDefault();
 		}
@@ -220,20 +245,24 @@ else if (this.startTime == null) {
 		CronTriggerImpl cti = new CronTriggerImpl();
 		cti.setName(this.name);
 		cti.setGroup(this.group);
-		cti.setJobKey(this.jobDetail.getKey());
+		if (this.jobDetail != null) {
+			cti.setJobKey(this.jobDetail.getKey());
+		}
 		cti.setJobDataMap(this.jobDataMap);
 		cti.setStartTime(this.startTime);
 		cti.setCronExpression(this.cronExpression);
 		cti.setTimeZone(this.timeZone);
+		cti.setCalendarName(this.calendarName);
 		cti.setPriority(this.priority);
 		cti.setMisfireInstruction(this.misfireInstruction);
+		cti.setDescription(this.description);
 		this.cronTrigger = cti;
 		*/
 
-		Class cronTriggerClass;
+		Class<?> cronTriggerClass;
 		Method jobKeyMethod;
 		try {
-			cronTriggerClass = getClass().getClassLoader().loadClass("org.quartz.impl.triggers.CronTriggerImpl");
+			cronTriggerClass = ClassUtils.forName("org.quartz.impl.triggers.CronTriggerImpl", getClass().getClassLoader());
 			jobKeyMethod = JobDetail.class.getMethod("getKey");
 		}
 		catch (ClassNotFoundException ex) {
@@ -247,19 +276,23 @@ else if (this.startTime == null) {
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", this.name);
 		pvs.add("group", this.group);
-		if (jobKeyMethod != null) {
-			pvs.add("jobKey", ReflectionUtils.invokeMethod(jobKeyMethod, this.jobDetail));
-		}
-		else {
-			pvs.add("jobName", this.jobDetail.getName());
-			pvs.add("jobGroup", this.jobDetail.getGroup());
+		if (this.jobDetail != null) {
+			if (jobKeyMethod != null) {
+				pvs.add("jobKey", ReflectionUtils.invokeMethod(jobKeyMethod, this.jobDetail));
+			}
+			else {
+				pvs.add("jobName", this.jobDetail.getName());
+				pvs.add("jobGroup", this.jobDetail.getGroup());
+			}
 		}
 		pvs.add("jobDataMap", this.jobDataMap);
 		pvs.add("startTime", this.startTime);
 		pvs.add("cronExpression", this.cronExpression);
 		pvs.add("timeZone", this.timeZone);
+		pvs.add("calendarName", this.calendarName);
 		pvs.add("priority", this.priority);
 		pvs.add("misfireInstruction", this.misfireInstruction);
+		pvs.add("description", this.description);
 		bw.setPropertyValues(pvs);
 		this.cronTrigger = (CronTrigger) bw.getWrappedInstance();
 	}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java
index 0a53406577..2105f4ae34 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
  * Use Quartz 2.0's native {@code JobDetailImpl} class or the new Quartz 2.0
  * builder API instead. Alternatively, switch to Spring's {@link JobDetailFactoryBean}
  * which largely is a drop-in replacement for this class and its properties and
- * consistently works against Quartz 1.x as well as Quartz 2.0/2.1.
+ * consistently works against Quartz 1.x as well as Quartz 2.x.
  *
  * @author Juergen Hoeller
  * @since 18.02.2004
@@ -48,11 +48,11 @@
  * @see org.springframework.beans.factory.BeanNameAware
  * @see org.quartz.Scheduler#DEFAULT_GROUP
  */
-@SuppressWarnings("serial")
+@SuppressWarnings({"serial", "rawtypes"})
 public class JobDetailBean extends JobDetail
 		implements BeanNameAware, ApplicationContextAware, InitializingBean {
 
-	private Class actualJobClass;
+	private Class<?> actualJobClass;
 
 	private String beanName;
 
@@ -97,7 +97,7 @@ public Class getJobClass() {
 	 * (for example Spring-managed beans)
 	 * @see SchedulerFactoryBean#setSchedulerContextAsMap
 	 */
-	public void setJobDataAsMap(Map jobDataAsMap) {
+	public void setJobDataAsMap(Map<String, ?> jobDataAsMap) {
 		getJobDataMap().putAll(jobDataAsMap);
 	}
 
@@ -109,9 +109,9 @@ public void setJobDataAsMap(Map jobDataAsMap) {
 	 * @see SchedulerFactoryBean#setJobListeners
 	 * @see org.quartz.JobListener#getName
 	 */
-	public void setJobListenerNames(String[] names) {
-		for (int i = 0; i < names.length; i++) {
-			addJobListener(names[i]);
+	public void setJobListenerNames(String... names) {
+		for (String name : names) {
+			addJobListener(name);
 		}
 	}
 
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java
index 81d370646a..80c49a136c 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.util.ClassUtils;
 
 /**
  * A Spring {@link FactoryBean} for creating a Quartz {@link org.quartz.JobDetail}
@@ -39,7 +40,7 @@
  * sensible defaults. This class uses the Spring bean name as job name,
  * and the Quartz default group ("DEFAULT") as job group if not specified.
  *
- * <p><b>NOTE:</b> This FactoryBean works against both Quartz 1.x and Quartz 2.0/2.1,
+ * <p><b>NOTE:</b> This FactoryBean works against both Quartz 1.x and Quartz 2.x,
  * in contrast to the older {@link JobDetailBean} class.
  *
  * @author Juergen Hoeller
@@ -56,12 +57,14 @@ public class JobDetailFactoryBean
 
 	private String group;
 
-	private Class jobClass;
+	private Class<?> jobClass;
 
 	private JobDataMap jobDataMap = new JobDataMap();
 
 	private boolean durability = false;
 
+	private boolean requestsRecovery = false;
+
 	private String description;
 
 	private String beanName;
@@ -90,7 +93,7 @@ public void setGroup(String group) {
 	/**
 	 * Specify the job's implementation class.
 	 */
-	public void setJobClass(Class jobClass) {
+	public void setJobClass(Class<?> jobClass) {
 		this.jobClass = jobClass;
 	}
 
@@ -132,6 +135,14 @@ public void setDurability(boolean durability) {
 		this.durability = durability;
 	}
 
+	/**
+	 * Set the recovery flag for this job, i.e. whether or not the job should
+	 * get re-executed if a 'recovery' or 'fail-over' situation is encountered.
+	 */
+	public void setRequestsRecovery(boolean requestsRecovery) {
+		this.requestsRecovery = requestsRecovery;
+	}
+
 	/**
 	 * Set a textual description for this job.
 	 */
@@ -197,7 +208,7 @@ public void afterPropertiesSet() {
 
 		Class<?> jobDetailClass;
 		try {
-			jobDetailClass = getClass().getClassLoader().loadClass("org.quartz.impl.JobDetailImpl");
+			jobDetailClass = ClassUtils.forName("org.quartz.impl.JobDetailImpl", getClass().getClassLoader());
 		}
 		catch (ClassNotFoundException ex) {
 			jobDetailClass = JobDetail.class;
@@ -209,6 +220,7 @@ public void afterPropertiesSet() {
 		pvs.add("jobClass", this.jobClass);
 		pvs.add("jobDataMap", this.jobDataMap);
 		pvs.add("durability", this.durability);
+		pvs.add("requestsRecovery", this.requestsRecovery);
 		pvs.add("description", this.description);
 		bw.setPropertyValues(pvs);
 		this.jobDetail = (JobDetail) bw.getWrappedInstance();
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java
index c9664b28f8..86cb3ed6d2 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-
 import javax.sql.DataSource;
 
 import org.quartz.SchedulerConfigException;
@@ -108,14 +107,17 @@ public Connection getConnection() throws SQLException {
 					public void shutdown() {
 						// Do nothing - a Spring-managed DataSource has its own lifecycle.
 					}
+					/* Quartz 2.2 initialize method */
+					public void initialize() {
+						// Do nothing - a Spring-managed DataSource has its own lifecycle.
+					}
 				}
 		);
 
 		// Non-transactional DataSource is optional: fall back to default
 		// DataSource if not explicitly specified.
 		DataSource nonTxDataSource = SchedulerFactoryBean.getConfigTimeNonTransactionalDataSource();
-		final DataSource nonTxDataSourceToUse =
-				(nonTxDataSource != null ? nonTxDataSource : this.dataSource);
+		final DataSource nonTxDataSourceToUse = (nonTxDataSource != null ? nonTxDataSource : this.dataSource);
 
 		// Configure non-transactional connection settings for Quartz.
 		setNonManagedTXDataSource(NON_TX_DATA_SOURCE_PREFIX + getInstanceName());
@@ -131,21 +133,24 @@ public Connection getConnection() throws SQLException {
 					public void shutdown() {
 						// Do nothing - a Spring-managed DataSource has its own lifecycle.
 					}
+					/* Quartz 2.2 initialize method */
+					public void initialize() {
+						// Do nothing - a Spring-managed DataSource has its own lifecycle.
+					}
 				}
 		);
 
-		// No, if HSQL is the platform, we really don't want to use locks
+		// No, if HSQL is the platform, we really don't want to use locks...
 		try {
-			String productName = JdbcUtils.extractDatabaseMetaData(dataSource,
-					"getDatabaseProductName").toString();
+			String productName = JdbcUtils.extractDatabaseMetaData(this.dataSource, "getDatabaseProductName").toString();
 			productName = JdbcUtils.commonDatabaseName(productName);
-			if (productName != null
-					&& productName.toLowerCase().contains("hsql")) {
+			if (productName != null && productName.toLowerCase().contains("hsql")) {
 				setUseDBLocks(false);
 				setLockHandler(new SimpleSemaphore());
 			}
-		} catch (MetaDataAccessException e) {
-			logWarnIfNonZero(1, "Could not detect database type.  Assuming locks can be taken.");
+		}
+		catch (MetaDataAccessException ex) {
+			logWarnIfNonZero(1, "Could not detect database type. Assuming locks can be taken.");
 		}
 
 		super.initialize(loadHelper, signaler);
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java
index 6e5189e3b0..5106ffb6b7 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,7 +80,7 @@ public boolean runInThread(Runnable runnable) {
 	}
 
 	public int blockForAvailableThreads() {
-		// The present implementation always returns 1, making Quartz (1.6)
+		// The present implementation always returns 1, making Quartz
 		// always schedule any tasks that it feels like scheduling.
 		// This could be made smarter for specific TaskExecutors,
 		// for example calling {@code getMaximumPoolSize() - getActiveCount()}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
index 80ce225457..6d910bbead 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@
  * You need to implement your own Quartz Job as a thin wrapper for each case
  * where you want a persistent job to delegate to a specific service method.
  *
- * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0/2.1, as of Spring 3.1.
+ * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0-2.2, as of Spring 3.2.
  *
  * @author Juergen Hoeller
  * @author Alef Arendsen
@@ -86,14 +86,15 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod
 
 	static {
 		try {
-			jobDetailImplClass = Class.forName("org.quartz.impl.JobDetailImpl");
+			jobDetailImplClass = ClassUtils.forName("org.quartz.impl.JobDetailImpl",
+					MethodInvokingJobDetailFactoryBean.class.getClassLoader());
 		}
 		catch (ClassNotFoundException ex) {
 			jobDetailImplClass = null;
 		}
 		try {
-			Class jobExecutionContextClass =
-					QuartzJobBean.class.getClassLoader().loadClass("org.quartz.JobExecutionContext");
+			Class<?> jobExecutionContextClass = ClassUtils.forName("org.quartz.JobExecutionContext",
+					MethodInvokingJobDetailFactoryBean.class.getClassLoader());
 			setResultMethod = jobExecutionContextClass.getMethod("setResult", Object.class);
 		}
 		catch (Exception ex) {
@@ -172,7 +173,7 @@ public void setTargetBeanName(String targetBeanName) {
 	 * @see SchedulerFactoryBean#setJobListeners
 	 * @see org.quartz.JobListener#getName
 	 */
-	public void setJobListenerNames(String[] names) {
+	public void setJobListenerNames(String... names) {
 		this.jobListenerNames = names;
 	}
 
@@ -189,7 +190,7 @@ public void setBeanFactory(BeanFactory beanFactory) {
 	}
 
 	@Override
-	protected Class resolveClassName(String className) throws ClassNotFoundException {
+	protected Class<?> resolveClassName(String className) throws ClassNotFoundException {
 		return ClassUtils.forName(className, this.beanClassLoader);
 	}
 
@@ -201,7 +202,7 @@ public void afterPropertiesSet() throws ClassNotFoundException, NoSuchMethodExce
 		String name = (this.name != null ? this.name : this.beanName);
 
 		// Consider the concurrent flag to choose between stateful and stateless job.
-		Class jobClass = (this.concurrent ? MethodInvokingJob.class : StatefulMethodInvokingJob.class);
+		Class<?> jobClass = (this.concurrent ? MethodInvokingJob.class : StatefulMethodInvokingJob.class);
 
 		// Build JobDetail instance.
 		if (jobDetailImplClass != null) {
@@ -249,8 +250,8 @@ protected void postProcessJobDetail(JobDetail jobDetail) {
 	 * Overridden to support the {@link #setTargetBeanName "targetBeanName"} feature.
 	 */
 	@Override
-	public Class getTargetClass() {
-		Class targetClass = super.getTargetClass();
+	public Class<?> getTargetClass() {
+		Class<?> targetClass = super.getTargetClass();
 		if (targetClass == null && this.targetBeanName != null) {
 			Assert.state(this.beanFactory != null, "BeanFactory must be set when using 'targetBeanName'");
 			targetClass = this.beanFactory.getType(this.targetBeanName);
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java
index b2d61536da..1f30286adc 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyAccessorFactory;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -79,8 +80,8 @@ public abstract class QuartzJobBean implements Job {
 
 	static {
 		try {
-			Class jobExecutionContextClass =
-					QuartzJobBean.class.getClassLoader().loadClass("org.quartz.JobExecutionContext");
+			Class<?> jobExecutionContextClass =
+					ClassUtils.forName("org.quartz.JobExecutionContext", QuartzJobBean.class.getClassLoader());
 			getSchedulerMethod = jobExecutionContextClass.getMethod("getScheduler");
 			getMergedJobDataMapMethod = jobExecutionContextClass.getMethod("getMergedJobDataMap");
 		}
@@ -99,7 +100,7 @@ public final void execute(JobExecutionContext context) throws JobExecutionExcept
 		try {
 			// Reflectively adapting to differences between Quartz 1.x and Quartz 2.0...
 			Scheduler scheduler = (Scheduler) ReflectionUtils.invokeMethod(getSchedulerMethod, context);
-			Map mergedJobDataMap = (Map) ReflectionUtils.invokeMethod(getMergedJobDataMapMethod, context);
+			Map<?, ?> mergedJobDataMap = (Map<?, ?>) ReflectionUtils.invokeMethod(getMergedJobDataMapMethod, context);
 
 			BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(this);
 			MutablePropertyValues pvs = new MutablePropertyValues();
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java
index 5eba86a105..9631c51ff1 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.scheduling.quartz;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -82,32 +81,41 @@ public <T> Class<? extends T> loadClass(String name, Class<T> clazz) throws Clas
 
 	public URL getResource(String name) {
 		Resource resource = this.resourceLoader.getResource(name);
-		try {
-			return resource.getURL();
-		}
-		catch (FileNotFoundException ex) {
-			return null;
+		if (resource.exists()) {
+			try {
+				return resource.getURL();
+			}
+			catch (IOException ex) {
+				if (logger.isWarnEnabled()) {
+					logger.warn("Could not load " + resource);
+				}
+				return null;
+			}
 		}
-		catch (IOException ex) {
-			logger.warn("Could not load " + resource);
-			return null;
+		else {
+			return getClassLoader().getResource(name);
 		}
 	}
 
 	public InputStream getResourceAsStream(String name) {
 		Resource resource = this.resourceLoader.getResource(name);
-		try {
-			return resource.getInputStream();
-		}
-		catch (FileNotFoundException ex) {
-			return null;
+		if (resource.exists()) {
+			try {
+				return resource.getInputStream();
+			}
+			catch (IOException ex) {
+				if (logger.isWarnEnabled()) {
+					logger.warn("Could not load " + resource);
+				}
+				return null;
+			}
 		}
-		catch (IOException ex) {
-			logger.warn("Could not load " + resource);
-			return null;
+		else {
+			return getClassLoader().getResourceAsStream(name);
 		}
 	}
 
+	@Override
 	public ClassLoader getClassLoader() {
 		return this.resourceLoader.getClassLoader();
 	}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java
index 9c65590231..d650e6c383 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@
 import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -51,9 +52,10 @@
  * <p>For concrete usage, check out the {@link SchedulerFactoryBean} and
  * {@link SchedulerAccessorBean} classes.
  *
- * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0/2.1, as of Spring 3.1.
+ * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0-2.2, as of Spring 3.2.
  *
  * @author Juergen Hoeller
+ * @author Stephane Nicoll
  * @since 2.5.6
  */
 public abstract class SchedulerAccessor implements ResourceLoaderAware {
@@ -63,9 +65,10 @@ public abstract class SchedulerAccessor implements ResourceLoaderAware {
 	private static Class<?> triggerKeyClass;
 
 	static {
+		// Quartz 2.0 job/trigger key available?
 		try {
-			jobKeyClass = Class.forName("org.quartz.JobKey");
-			triggerKeyClass = Class.forName("org.quartz.TriggerKey");
+			jobKeyClass = ClassUtils.forName("org.quartz.JobKey", SchedulerAccessor.class.getClassLoader());
+			triggerKeyClass = ClassUtils.forName("org.quartz.TriggerKey", SchedulerAccessor.class.getClassLoader());
 		}
 		catch (ClassNotFoundException ex) {
 			jobKeyClass = null;
@@ -128,7 +131,7 @@ public void setJobSchedulingDataLocation(String jobSchedulingDataLocation) {
 	 * to jobs defined directly on this SchedulerFactoryBean.
 	 * @see org.quartz.xml.XmlSchedulingDataProcessor
 	 */
-	public void setJobSchedulingDataLocations(String[] jobSchedulingDataLocations) {
+	public void setJobSchedulingDataLocations(String... jobSchedulingDataLocations) {
 		this.jobSchedulingDataLocations = jobSchedulingDataLocations;
 	}
 
@@ -140,13 +143,10 @@ public void setJobSchedulingDataLocations(String[] jobSchedulingDataLocations) {
 	 * in combination with the Trigger.
 	 * @see #setTriggers
 	 * @see org.quartz.JobDetail
-	 * @see JobDetailBean
-	 * @see JobDetailAwareTrigger
-	 * @see org.quartz.Trigger#setJobName
 	 */
-	public void setJobDetails(JobDetail[] jobDetails) {
+	public void setJobDetails(JobDetail... jobDetails) {
 		// Use modifiable ArrayList here, to allow for further adding of
-		// JobDetail objects during autodetection of JobDetailAwareTriggers.
+		// JobDetail objects during autodetection of JobDetail-aware Triggers.
 		this.jobDetails = new ArrayList<JobDetail>(Arrays.asList(jobDetails));
 	}
 
@@ -156,7 +156,6 @@ public void setJobDetails(JobDetail[] jobDetails) {
 	 * @param calendars Map with calendar names as keys as Calendar
 	 * objects as values
 	 * @see org.quartz.Calendar
-	 * @see org.quartz.Trigger#setCalendarName
 	 */
 	public void setCalendars(Map<String, Calendar> calendars) {
 		this.calendars = calendars;
@@ -171,19 +170,15 @@ public void setCalendars(Map<String, Calendar> calendars) {
 	 * "jobDetails" property of this FactoryBean.
 	 * @see #setJobDetails
 	 * @see org.quartz.JobDetail
-	 * @see JobDetailAwareTrigger
-	 * @see CronTriggerBean
-	 * @see SimpleTriggerBean
 	 */
-	public void setTriggers(Trigger[] triggers) {
+	public void setTriggers(Trigger... triggers) {
 		this.triggers = Arrays.asList(triggers);
 	}
 
-
 	/**
 	 * Specify Quartz SchedulerListeners to be registered with the Scheduler.
 	 */
-	public void setSchedulerListeners(SchedulerListener[] schedulerListeners) {
+	public void setSchedulerListeners(SchedulerListener... schedulerListeners) {
 		this.schedulerListeners = schedulerListeners;
 	}
 
@@ -191,7 +186,7 @@ public void setSchedulerListeners(SchedulerListener[] schedulerListeners) {
 	 * Specify global Quartz JobListeners to be registered with the Scheduler.
 	 * Such JobListeners will apply to all Jobs in the Scheduler.
 	 */
-	public void setGlobalJobListeners(JobListener[] globalJobListeners) {
+	public void setGlobalJobListeners(JobListener... globalJobListeners) {
 		this.globalJobListeners = globalJobListeners;
 	}
 
@@ -199,11 +194,12 @@ public void setGlobalJobListeners(JobListener[] globalJobListeners) {
 	 * Specify named Quartz JobListeners to be registered with the Scheduler.
 	 * Such JobListeners will only apply to Jobs that explicitly activate
 	 * them via their name.
+	 * <p>Note that non-global JobListeners are not supported on Quartz 2.x -
+	 * manually register a Matcher against the Quartz ListenerManager instead.
 	 * @see org.quartz.JobListener#getName
-	 * @see org.quartz.JobDetail#addJobListener
 	 * @see JobDetailBean#setJobListenerNames
 	 */
-	public void setJobListeners(JobListener[] jobListeners) {
+	public void setJobListeners(JobListener... jobListeners) {
 		this.jobListeners = jobListeners;
 	}
 
@@ -211,7 +207,7 @@ public void setJobListeners(JobListener[] jobListeners) {
 	 * Specify global Quartz TriggerListeners to be registered with the Scheduler.
 	 * Such TriggerListeners will apply to all Triggers in the Scheduler.
 	 */
-	public void setGlobalTriggerListeners(TriggerListener[] globalTriggerListeners) {
+	public void setGlobalTriggerListeners(TriggerListener... globalTriggerListeners) {
 		this.globalTriggerListeners = globalTriggerListeners;
 	}
 
@@ -219,12 +215,13 @@ public void setGlobalTriggerListeners(TriggerListener[] globalTriggerListeners)
 	 * Specify named Quartz TriggerListeners to be registered with the Scheduler.
 	 * Such TriggerListeners will only apply to Triggers that explicitly activate
 	 * them via their name.
+	 * <p>Note that non-global TriggerListeners are not supported on Quartz 2.x -
+	 * manually register a Matcher against the Quartz ListenerManager instead.
 	 * @see org.quartz.TriggerListener#getName
-	 * @see org.quartz.Trigger#addTriggerListener
 	 * @see CronTriggerBean#setTriggerListenerNames
 	 * @see SimpleTriggerBean#setTriggerListenerNames
 	 */
-	public void setTriggerListeners(TriggerListener[] triggerListeners) {
+	public void setTriggerListeners(TriggerListener... triggerListeners) {
 		this.triggerListeners = triggerListeners;
 	}
 
@@ -251,14 +248,14 @@ protected void registerJobsAndTriggers() throws SchedulerException {
 		if (this.transactionManager != null) {
 			transactionStatus = this.transactionManager.getTransaction(new DefaultTransactionDefinition());
 		}
-		try {
 
+		try {
 			if (this.jobSchedulingDataLocations != null) {
 				ClassLoadHelper clh = new ResourceLoaderClassLoadHelper(this.resourceLoader);
 				clh.initialize();
 				try {
 					// Quartz 1.8 or higher?
-					Class dataProcessorClass = getClass().getClassLoader().loadClass("org.quartz.xml.XMLSchedulingDataProcessor");
+					Class<?> dataProcessorClass = ClassUtils.forName("org.quartz.xml.XMLSchedulingDataProcessor", getClass().getClassLoader());
 					logger.debug("Using Quartz 1.8 XMLSchedulingDataProcessor");
 					Object dataProcessor = dataProcessorClass.getConstructor(ClassLoadHelper.class).newInstance(clh);
 					Method processFileAndScheduleJobs = dataProcessorClass.getMethod("processFileAndScheduleJobs", String.class, Scheduler.class);
@@ -268,7 +265,7 @@ protected void registerJobsAndTriggers() throws SchedulerException {
 				}
 				catch (ClassNotFoundException ex) {
 					// Quartz 1.6
-					Class dataProcessorClass = getClass().getClassLoader().loadClass("org.quartz.xml.JobSchedulingDataProcessor");
+					Class<?> dataProcessorClass = ClassUtils.forName("org.quartz.xml.JobSchedulingDataProcessor", getClass().getClassLoader());
 					logger.debug("Using Quartz 1.6 JobSchedulingDataProcessor");
 					Object dataProcessor = dataProcessorClass.getConstructor(ClassLoadHelper.class, boolean.class, boolean.class).newInstance(clh, true, true);
 					Method processFileAndScheduleJobs = dataProcessorClass.getMethod("processFileAndScheduleJobs", String.class, Scheduler.class, boolean.class);
@@ -396,8 +393,9 @@ private JobDetail findJobDetail(Trigger trigger) {
 		}
 		else {
 			try {
-				Map jobDataMap = (Map) ReflectionUtils.invokeMethod(Trigger.class.getMethod("getJobDataMap"), trigger);
-				return (JobDetail) jobDataMap.get(JobDetailAwareTrigger.JOB_DETAIL_KEY);
+				Map<?, ?> jobDataMap =
+						(Map<?, ?>) ReflectionUtils.invokeMethod(Trigger.class.getMethod("getJobDataMap"), trigger);
+				return (JobDetail) jobDataMap.remove(JobDetailAwareTrigger.JOB_DETAIL_KEY);
 			}
 			catch (NoSuchMethodException ex) {
 				throw new IllegalStateException("Inconsistent Quartz API: " + ex);
@@ -473,19 +471,33 @@ protected void registerListeners() throws SchedulerException {
 			target = getScheduler();
 			quartz2 = false;
 		}
+		Class<?> targetClass = target.getClass();
 
 		try {
 			if (this.schedulerListeners != null) {
-				Method addSchedulerListener = target.getClass().getMethod("addSchedulerListener", SchedulerListener.class);
+				Method addSchedulerListener = targetClass.getMethod("addSchedulerListener", SchedulerListener.class);
 				for (SchedulerListener listener : this.schedulerListeners) {
 					ReflectionUtils.invokeMethod(addSchedulerListener, target, listener);
 				}
 			}
 			if (this.globalJobListeners != null) {
-				Method addJobListener = target.getClass().getMethod(
-						(quartz2 ? "addJobListener" : "addGlobalJobListener"), JobListener.class);
+				Method addJobListener;
+				if (quartz2) {
+					// addJobListener(JobListener) only introduced as late as Quartz 2.2, so we need
+					// to fall back to the Quartz 2.0/2.1 compatible variant with an empty matchers List
+					addJobListener = targetClass.getMethod("addJobListener", JobListener.class, List.class);
+				}
+				else {
+					addJobListener = targetClass.getMethod("addGlobalJobListener", JobListener.class);
+				}
 				for (JobListener listener : this.globalJobListeners) {
-					ReflectionUtils.invokeMethod(addJobListener, target, listener);
+					if (quartz2) {
+						List<?> emptyMatchers = new LinkedList<Object>();
+						ReflectionUtils.invokeMethod(addJobListener, target, listener, emptyMatchers);
+					}
+					else {
+						ReflectionUtils.invokeMethod(addJobListener, target, listener);
+					}
 				}
 			}
 			if (this.jobListeners != null) {
@@ -498,10 +510,23 @@ protected void registerListeners() throws SchedulerException {
 				}
 			}
 			if (this.globalTriggerListeners != null) {
-				Method addTriggerListener = target.getClass().getMethod(
-						(quartz2 ? "addTriggerListener" : "addGlobalTriggerListener"), TriggerListener.class);
+				Method addTriggerListener;
+				if (quartz2) {
+					// addTriggerListener(TriggerListener) only introduced as late as Quartz 2.2, so we need
+					// to fall back to the Quartz 2.0/2.1 compatible variant with an empty matchers List
+					addTriggerListener = targetClass.getMethod("addTriggerListener", TriggerListener.class, List.class);
+				}
+				else {
+					addTriggerListener = targetClass.getMethod("addGlobalTriggerListener", TriggerListener.class);
+				}
 				for (TriggerListener listener : this.globalTriggerListeners) {
-					ReflectionUtils.invokeMethod(addTriggerListener, target, listener);
+					if (quartz2) {
+						List<?> emptyMatchers = new LinkedList<Object>();
+						ReflectionUtils.invokeMethod(addTriggerListener, target, listener, emptyMatchers);
+					}
+					else {
+						ReflectionUtils.invokeMethod(addTriggerListener, target, listener);
+					}
 				}
 			}
 			if (this.triggerListeners != null) {
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java
index 9c69a47c00..e18dd88761 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessorBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
  * Spring bean-style class for accessing a Quartz Scheduler, i.e. for registering jobs,
  * triggers and listeners on a given {@link org.quartz.Scheduler} instance.
  *
- * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0/2.1, as of Spring 3.1.
+ * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0-2.2, as of Spring 3.2.
  *
  * @author Juergen Hoeller
  * @since 2.5.6
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
index ed8baa41df..9396759c0c 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
 import org.springframework.scheduling.SchedulingException;
+import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
 /**
@@ -74,7 +75,7 @@
  * automatically apply to Scheduler operations performed within those scopes.
  * Alternatively, you may add transactional advice for the Scheduler itself.
  *
- * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0/2.1, as of Spring 3.1.
+ * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0-2.2, as of Spring 3.2.
  *
  * @author Juergen Hoeller
  * @since 18.02.2004
@@ -84,8 +85,8 @@
  * @see org.quartz.impl.StdSchedulerFactory
  * @see org.springframework.transaction.interceptor.TransactionProxyFactoryBean
  */
-public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBean<Scheduler>, BeanNameAware,
-		ApplicationContextAware, InitializingBean, DisposableBean, SmartLifecycle {
+public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBean<Scheduler>,
+		BeanNameAware, ApplicationContextAware, InitializingBean, DisposableBean, SmartLifecycle {
 
 	public static final String PROP_THREAD_COUNT = "org.quartz.threadPool.threadCount";
 
@@ -157,7 +158,7 @@ public static DataSource getConfigTimeNonTransactionalDataSource() {
 	}
 
 
-	private Class<?> schedulerFactoryClass = StdSchedulerFactory.class;
+	private Class<? extends SchedulerFactory> schedulerFactoryClass = StdSchedulerFactory.class;
 
 	private String schedulerName;
 
@@ -173,7 +174,7 @@ public static DataSource getConfigTimeNonTransactionalDataSource() {
 	private DataSource nonTransactionalDataSource;
 
 
-    private Map schedulerContextMap;
+    private Map<String, ?> schedulerContextMap;
 
 	private ApplicationContext applicationContext;
 
@@ -200,7 +201,7 @@ public static DataSource getConfigTimeNonTransactionalDataSource() {
 
 	/**
 	 * Set the Quartz SchedulerFactory implementation to use.
-	 * <p>Default is StdSchedulerFactory, reading in the standard
+	 * <p>Default is {@link StdSchedulerFactory}, reading in the standard
 	 * {@code quartz.properties} from {@code quartz.jar}.
 	 * To use custom Quartz properties, specify the "configLocation"
 	 * or "quartzProperties" bean property on this FactoryBean.
@@ -208,10 +209,8 @@ public static DataSource getConfigTimeNonTransactionalDataSource() {
 	 * @see #setConfigLocation
 	 * @see #setQuartzProperties
 	 */
-	public void setSchedulerFactoryClass(Class schedulerFactoryClass) {
-		if (schedulerFactoryClass == null || !SchedulerFactory.class.isAssignableFrom(schedulerFactoryClass)) {
-			throw new IllegalArgumentException("schedulerFactoryClass must implement [org.quartz.SchedulerFactory]");
-		}
+	public void setSchedulerFactoryClass(Class<? extends SchedulerFactory> schedulerFactoryClass) {
+		Assert.isAssignable(SchedulerFactory.class, schedulerFactoryClass);
 		this.schedulerFactoryClass = schedulerFactoryClass;
 	}
 
@@ -311,9 +310,9 @@ public void setNonTransactionalDataSource(DataSource nonTransactionalDataSource)
 	 * reference into the JobDataMap but rather into the SchedulerContext.
 	 * @param schedulerContextAsMap Map with String keys and any objects as
 	 * values (for example Spring-managed beans)
-	 * @see JobDetailBean#setJobDataAsMap
+	 * @see JobDetailFactoryBean#setJobDataAsMap
 	 */
-	public void setSchedulerContextAsMap(Map schedulerContextAsMap) {
+	public void setSchedulerContextAsMap(Map<String, ?> schedulerContextAsMap) {
 		this.schedulerContextMap = schedulerContextAsMap;
 	}
 
@@ -329,8 +328,8 @@ public void setSchedulerContextAsMap(Map schedulerContextAsMap) {
 	 * correspond to a "setApplicationContext" method in that scenario.
 	 * <p>Note that BeanFactory callback interfaces like ApplicationContextAware
 	 * are not automatically applied to Quartz Job instances, because Quartz
-	 * itself is reponsible for the lifecycle of its Jobs.
-	 * @see JobDetailBean#setApplicationContextJobDataKey
+	 * itself is responsible for the lifecycle of its Jobs.
+	 * @see JobDetailFactoryBean#setApplicationContextJobDataKey
 	 * @see org.springframework.context.ApplicationContext
 	 */
 	public void setApplicationContextSchedulerContextKey(String applicationContextSchedulerContextKey) {
@@ -450,10 +449,8 @@ public void afterPropertiesSet() throws Exception {
 			this.resourceLoader = this.applicationContext;
 		}
 
-		// Create SchedulerFactory instance.
-		SchedulerFactory schedulerFactory = (SchedulerFactory)
-				BeanUtils.instantiateClass(this.schedulerFactoryClass);
-
+		// Create SchedulerFactory instance...
+		SchedulerFactory schedulerFactory = BeanUtils.instantiateClass(this.schedulerFactoryClass);
 		initSchedulerFactory(schedulerFactory);
 
 		if (this.resourceLoader != null) {
@@ -473,7 +470,6 @@ public void afterPropertiesSet() throws Exception {
 			configTimeNonTransactionalDataSourceHolder.set(this.nonTransactionalDataSource);
 		}
 
-
 		// Get Scheduler instance from SchedulerFactory.
 		try {
 			this.scheduler = createScheduler(schedulerFactory, this.schedulerName);
@@ -516,9 +512,7 @@ public void afterPropertiesSet() throws Exception {
 	 * Load and/or apply Quartz properties to the given SchedulerFactory.
 	 * @param schedulerFactory the SchedulerFactory to initialize
 	 */
-	private void initSchedulerFactory(SchedulerFactory schedulerFactory)
-			throws SchedulerException, IOException {
-
+	private void initSchedulerFactory(SchedulerFactory schedulerFactory) throws SchedulerException, IOException {
 		if (!(schedulerFactory instanceof StdSchedulerFactory)) {
 			if (this.configLocation != null || this.quartzProperties != null ||
 					this.taskExecutor != null || this.dataSource != null) {
@@ -703,7 +697,7 @@ public boolean isSingleton() {
 
 
 	//---------------------------------------------------------------------
-	// Implementation of Lifecycle interface
+	// Implementation of SmartLifecycle interface
 	//---------------------------------------------------------------------
 
 	public void start() throws SchedulingException {
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java
index b35bb59ad9..2ab836b5c8 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@
  * Use Quartz 2.0's native {@code JobDetailImpl} class or the new Quartz 2.0
  * builder API instead. Alternatively, switch to Spring's {@link SimpleTriggerFactoryBean}
  * which largely is a drop-in replacement for this class and its properties and
- * consistently works against Quartz 1.x as well as Quartz 2.0/2.1.
+ * consistently works against Quartz 1.x as well as Quartz 2.x.
  *
  * @author Juergen Hoeller
  * @since 18.02.2004
@@ -114,9 +114,9 @@ public void setMisfireInstructionName(String constantName) {
 	 * @see SchedulerFactoryBean#setTriggerListeners
 	 * @see org.quartz.TriggerListener#getName
 	 */
-	public void setTriggerListenerNames(String[] names) {
-		for (int i = 0; i < names.length; i++) {
-			addTriggerListener(names[i]);
+	public void setTriggerListenerNames(String... names) {
+		for (String name : names) {
+			addTriggerListener(name);
 		}
 	}
 
@@ -153,6 +153,10 @@ public void setBeanName(String beanName) {
 	}
 
 
+	/**
+	 * Note that this method's declaration of a ParseException is deprecated
+	 * and will be removed in the Spring 4.0 line.
+	 */
 	public void afterPropertiesSet() throws ParseException {
 		if (getName() == null) {
 			setName(this.beanName);
@@ -160,7 +164,7 @@ public void afterPropertiesSet() throws ParseException {
 		if (getGroup() == null) {
 			setGroup(Scheduler.DEFAULT_GROUP);
 		}
-		if (getStartTime() == null) {
+		if (this.startDelay > 0 || getStartTime() == null) {
 			setStartTime(new Date(System.currentTimeMillis() + this.startDelay));
 		}
 		if (this.jobDetail != null) {
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java
index 15d1e901ab..15daf8ac5f 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.scheduling.quartz;
 
 import java.lang.reflect.Method;
-import java.text.ParseException;
 import java.util.Date;
 import java.util.Map;
 
@@ -34,6 +33,7 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.Constants;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -49,7 +49,7 @@
  * to automatically register a trigger for the corresponding JobDetail,
  * instead of registering the JobDetail separately.
  *
- * <p><b>NOTE:</b> This FactoryBean works against both Quartz 1.x and Quartz 2.0/2.1,
+ * <p><b>NOTE:</b> This FactoryBean works against both Quartz 1.x and Quartz 2.x,
  * in contrast to the older {@link SimpleTriggerBean} class.
  *
  * @author Juergen Hoeller
@@ -88,6 +88,8 @@ public class SimpleTriggerFactoryBean implements FactoryBean<SimpleTrigger>, Bea
 
 	private int misfireInstruction;
 
+	private String description;
+
 	private String beanName;
 
 	private SimpleTrigger simpleTrigger;
@@ -141,10 +143,20 @@ public void setJobDataAsMap(Map<String, ?> jobDataAsMap) {
 		this.jobDataMap.putAll(jobDataAsMap);
 	}
 
+	/**
+	 * Set a specific start time for the trigger.
+	 * <p>Note that a dynamically computed {@link #setStartDelay} specification
+	 * overrides a static timestamp set here.
+	 */
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
 	/**
 	 * Set the start delay in milliseconds.
 	 * <p>The start delay is added to the current system time (when the bean starts)
 	 * to control the start time of the trigger.
+	 * @see #setStartTime
 	 */
 	public void setStartDelay(long startDelay) {
 		Assert.isTrue(startDelay >= 0, "Start delay cannot be negative");
@@ -195,12 +207,19 @@ public void setMisfireInstructionName(String constantName) {
 		this.misfireInstruction = constants.asNumber(constantName).intValue();
 	}
 
+	/**
+	 * Associate a textual description with this trigger.
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
 
 
-	public void afterPropertiesSet() throws ParseException {
+	public void afterPropertiesSet() {
 		if (this.name == null) {
 			this.name = this.beanName;
 		}
@@ -210,31 +229,31 @@ public void afterPropertiesSet() throws ParseException {
 		if (this.jobDetail != null) {
 			this.jobDataMap.put(JobDetailAwareTrigger.JOB_DETAIL_KEY, this.jobDetail);
 		}
-		if (this.startDelay > 0) {
+		if (this.startDelay > 0 || this.startTime == null) {
 			this.startTime = new Date(System.currentTimeMillis() + this.startDelay);
 		}
-		else if (this.startTime == null) {
-			this.startTime = new Date();
-		}
 
 		/*
 		SimpleTriggerImpl sti = new SimpleTriggerImpl();
 		sti.setName(this.name);
 		sti.setGroup(this.group);
-		sti.setJobKey(this.jobDetail.getKey());
+		if (this.jobDetail != null) {
+			sti.setJobKey(this.jobDetail.getKey());
+		}
 		sti.setJobDataMap(this.jobDataMap);
 		sti.setStartTime(this.startTime);
 		sti.setRepeatInterval(this.repeatInterval);
 		sti.setRepeatCount(this.repeatCount);
 		sti.setPriority(this.priority);
 		sti.setMisfireInstruction(this.misfireInstruction);
+		sti.setDescription(this.description);
 		this.simpleTrigger = sti;
 		*/
 
-		Class simpleTriggerClass;
+		Class<?> simpleTriggerClass;
 		Method jobKeyMethod;
 		try {
-			simpleTriggerClass = getClass().getClassLoader().loadClass("org.quartz.impl.triggers.SimpleTriggerImpl");
+			simpleTriggerClass = ClassUtils.forName("org.quartz.impl.triggers.SimpleTriggerImpl", getClass().getClassLoader());
 			jobKeyMethod = JobDetail.class.getMethod("getKey");
 		}
 		catch (ClassNotFoundException ex) {
@@ -248,12 +267,14 @@ else if (this.startTime == null) {
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", this.name);
 		pvs.add("group", this.group);
-		if (jobKeyMethod != null) {
-			pvs.add("jobKey", ReflectionUtils.invokeMethod(jobKeyMethod, this.jobDetail));
-		}
-		else {
-			pvs.add("jobName", this.jobDetail.getName());
-			pvs.add("jobGroup", this.jobDetail.getGroup());
+		if (this.jobDetail != null) {
+			if (jobKeyMethod != null) {
+				pvs.add("jobKey", ReflectionUtils.invokeMethod(jobKeyMethod, this.jobDetail));
+			}
+			else {
+				pvs.add("jobName", this.jobDetail.getName());
+				pvs.add("jobGroup", this.jobDetail.getGroup());
+			}
 		}
 		pvs.add("jobDataMap", this.jobDataMap);
 		pvs.add("startTime", this.startTime);
@@ -261,6 +282,7 @@ else if (this.startTime == null) {
 		pvs.add("repeatCount", this.repeatCount);
 		pvs.add("priority", this.priority);
 		pvs.add("misfireInstruction", this.misfireInstruction);
+		pvs.add("description", this.description);
 		bw.setPropertyValues(pvs);
 		this.simpleTrigger = (SimpleTrigger) bw.getWrappedInstance();
 	}
@@ -277,4 +299,5 @@ public Class<?> getObjectType() {
 	public boolean isSingleton() {
 		return true;
 	}
+
 }
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java
index a9d837e7da..ddbf7953db 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
  * as bean property values. If no matching bean property is found, the entry
  * is by default simply ignored. This is analogous to QuartzJobBean's behavior.
  *
- * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0/2.1, as of Spring 3.1.
+ * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0-2.2, as of Spring 3.2.
  *
  * @author Juergen Hoeller
  * @since 2.0
@@ -59,7 +59,7 @@ public class SpringBeanJobFactory extends AdaptableJobFactory implements Schedul
 	 * ignored if there is no corresponding property found on the particular
 	 * job class (all other unknown properties will still trigger an exception).
 	 */
-	public void setIgnoredUnknownProperties(String[] ignoredUnknownProperties) {
+	public void setIgnoredUnknownProperties(String... ignoredUnknownProperties) {
 		this.ignoredUnknownProperties = ignoredUnknownProperties;
 	}
 
diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerTemplateUtils.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerTemplateUtils.java
index b2e7a85214..751ee13dc2 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerTemplateUtils.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerTemplateUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@ public abstract class FreeMarkerTemplateUtils {
 	 */
 	public static String processTemplateIntoString(Template template, Object model)
 			throws IOException, TemplateException {
+
 		StringWriter result = new StringWriter();
 		template.process(model, result);
 		return result.toString();
diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/SpringTemplateLoader.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/SpringTemplateLoader.java
index 7ed965ddb5..d2509aa87f 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/SpringTemplateLoader.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/SpringTemplateLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,9 +28,9 @@
 import org.springframework.core.io.ResourceLoader;
 
 /**
- * FreeMarker TemplateLoader adapter that loads via a Spring ResourceLoader.
- * Used by FreeMarkerConfigurationFactory for any resource loader path that
- * cannot be resolved to a java.io.File.
+ * FreeMarker {@link TemplateLoader} adapter that loads via a Spring {@link ResourceLoader}.
+ * Used by {@link FreeMarkerConfigurationFactory} for any resource loader path that cannot
+ * be resolved to a {@link java.io.File}.
  *
  * @author Juergen Hoeller
  * @since 14.03.2004
@@ -63,6 +63,7 @@ public SpringTemplateLoader(ResourceLoader resourceLoader, String templateLoader
 		}
 	}
 
+
 	public Object findTemplateSource(String name) throws IOException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Looking for FreeMarker template with name [" + name + "]");
@@ -84,7 +85,6 @@ public Reader getReader(Object templateSource, String encoding) throws IOExcepti
 		}
 	}
 
-
 	public long getLastModified(Object templateSource) {
 		Resource resource = (Resource) templateSource;
 		try {
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerFactoryBeanTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerFactoryBeanTests.java
new file mode 100644
index 0000000000..5aa0142fc7
--- /dev/null
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerFactoryBeanTests.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.scheduling.quartz;
+
+import java.text.ParseException;
+
+import org.junit.Test;
+import org.quartz.CronTrigger;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Stephane Nicoll
+ */
+public class CronTriggerFactoryBeanTests {
+
+	@Test
+	public void createWithoutJobDetail() throws ParseException {
+		CronTriggerFactoryBean factory = new CronTriggerFactoryBean();
+		factory.setName("myTrigger");
+		factory.setCronExpression("0 15 10 ? * *");
+		factory.afterPropertiesSet();
+		CronTrigger trigger = factory.getObject();
+		assertEquals("0 15 10 ? * *", trigger.getCronExpression());
+	}
+
+}
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBeanTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBeanTests.java
new file mode 100644
index 0000000000..7021682b23
--- /dev/null
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/SimpleTriggerFactoryBeanTests.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.scheduling.quartz;
+
+import java.text.ParseException;
+
+import org.junit.Test;
+import org.quartz.SimpleTrigger;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Stephane Nicoll
+ */
+public class SimpleTriggerFactoryBeanTests {
+
+	@Test
+	public void createWithoutJobDetail() throws ParseException {
+		SimpleTriggerFactoryBean factory = new SimpleTriggerFactoryBean();
+		factory.setName("myTrigger");
+		factory.setRepeatCount(5);
+		factory.setRepeatInterval(1000L);
+		factory.afterPropertiesSet();
+		SimpleTrigger trigger = factory.getObject();
+		assertEquals(5, trigger.getRepeatCount());
+		assertEquals(1000L, trigger.getRepeatInterval());
+	}
+
+}
diff --git a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java b/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java
deleted file mode 100644
index 7b9ebb44aa..0000000000
--- a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ui.jasperreports;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import junit.framework.TestCase;
-import net.sf.jasperreports.engine.JRDataSource;
-import net.sf.jasperreports.engine.JRExporterParameter;
-import net.sf.jasperreports.engine.JRParameter;
-import net.sf.jasperreports.engine.JasperFillManager;
-import net.sf.jasperreports.engine.JasperPrint;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
-import net.sf.jasperreports.engine.export.JRCsvExporterParameter;
-import net.sf.jasperreports.engine.export.JRExportProgressMonitor;
-import net.sf.jasperreports.engine.export.JRHtmlExporter;
-import net.sf.jasperreports.engine.export.JRHtmlExporterParameter;
-import net.sf.jasperreports.engine.export.JRPdfExporter;
-import net.sf.jasperreports.engine.export.JRPdfExporterParameter;
-import net.sf.jasperreports.engine.export.JRXlsExporterParameter;
-import net.sf.jasperreports.engine.util.JRLoader;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import org.springframework.core.io.ClassPathResource;
-
-/**
- * @author Rob Harrop
- * @author Juergen Hoeller
- * @since 18.11.2004
- */
-public class JasperReportsUtilsTests extends TestCase {
-
-	public void testRenderAsCsvWithDataSource() throws Exception {
-		StringWriter writer = new StringWriter();
-		JasperReportsUtils.renderAsCsv(getReport(), getParameters(), getDataSource(), writer);
-		String output = writer.getBuffer().toString();
-		assertCsvOutputCorrect(output);
-	}
-
-	public void testRenderAsCsvWithCollection() throws Exception {
-		StringWriter writer = new StringWriter();
-		JasperReportsUtils.renderAsCsv(getReport(), getParameters(), getData(), writer);
-		String output = writer.getBuffer().toString();
-		assertCsvOutputCorrect(output);
-	}
-
-	public void testRenderAsCsvWithExporterParameters() throws Exception {
-		StringWriter writer = new StringWriter();
-		Map<JRExporterParameter, Object> exporterParameters = new HashMap<JRExporterParameter, Object>();
-		exporterParameters.put(JRCsvExporterParameter.FIELD_DELIMITER, "~");
-		JasperReportsUtils.renderAsCsv(getReport(), getParameters(), getData(), writer, exporterParameters);
-		String output = writer.getBuffer().toString();
-		assertCsvOutputCorrect(output);
-		assertTrue("Delimiter is incorrect", output.contains("~"));
-	}
-
-	public void testRenderAsHtmlWithDataSource() throws Exception {
-		StringWriter writer = new StringWriter();
-		JasperReportsUtils.renderAsHtml(getReport(), getParameters(), getDataSource(), writer);
-		String output = writer.getBuffer().toString();
-		assertHtmlOutputCorrect(output);
-	}
-
-	public void testRenderAsHtmlWithCollection() throws Exception {
-		StringWriter writer = new StringWriter();
-		JasperReportsUtils.renderAsHtml(getReport(), getParameters(), getData(), writer);
-		String output = writer.getBuffer().toString();
-		assertHtmlOutputCorrect(output);
-	}
-
-	public void testRenderAsHtmlWithExporterParameters() throws Exception {
-		StringWriter writer = new StringWriter();
-		Map<JRExporterParameter, Object> exporterParameters = new HashMap<JRExporterParameter, Object>();
-		String uri = "/my/uri";
-		exporterParameters.put(JRHtmlExporterParameter.IMAGES_URI, uri);
-		JasperReportsUtils.renderAsHtml(getReport(), getParameters(), getData(), writer, exporterParameters);
-		String output = writer.getBuffer().toString();
-		assertHtmlOutputCorrect(output);
-		assertTrue("URI not included", output.contains(uri));
-	}
-
-	public void testRenderAsPdfWithDataSource() throws Exception {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		JasperReportsUtils.renderAsPdf(getReport(), getParameters(), getDataSource(), os);
-		byte[] output = os.toByteArray();
-		assertPdfOutputCorrect(output);
-	}
-
-	public void testRenderAsPdfWithCollection() throws Exception {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		JasperReportsUtils.renderAsPdf(getReport(), getParameters(), getData(), os);
-		byte[] output = os.toByteArray();
-		assertPdfOutputCorrect(output);
-	}
-
-	public void testRenderAsPdfWithExporterParameters() throws Exception {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		Map<JRExporterParameter, Object> exporterParameters = new HashMap<JRExporterParameter, Object>();
-		exporterParameters.put(JRPdfExporterParameter.PDF_VERSION, JRPdfExporterParameter.PDF_VERSION_1_6.toString());
-		JasperReportsUtils.renderAsPdf(getReport(), getParameters(), getData(), os, exporterParameters);
-		byte[] output = os.toByteArray();
-		assertPdfOutputCorrect(output);
-		assertTrue(new String(output).contains("PDF-1.6"));
-	}
-
-	public void testRenderAsXlsWithDataSource() throws Exception {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		JasperReportsUtils.renderAsXls(getReport(), getParameters(), getDataSource(), os);
-		byte[] output = os.toByteArray();
-		assertXlsOutputCorrect(output);
-	}
-
-	public void testRenderAsXlsWithCollection() throws Exception {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		JasperReportsUtils.renderAsXls(getReport(), getParameters(), getData(), os);
-		byte[] output = os.toByteArray();
-		assertXlsOutputCorrect(output);
-	}
-
-	public void testRenderAsXlsWithExporterParameters() throws Exception {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		Map<JRExporterParameter, Object> exporterParameters = new HashMap<JRExporterParameter, Object>();
-
-		SimpleProgressMonitor monitor = new SimpleProgressMonitor();
-		exporterParameters.put(JRXlsExporterParameter.PROGRESS_MONITOR, monitor);
-
-		JasperReportsUtils.renderAsXls(getReport(), getParameters(), getData(), os, exporterParameters);
-		byte[] output = os.toByteArray();
-		assertXlsOutputCorrect(output);
-		assertTrue(monitor.isInvoked());
-	}
-
-	public void testRenderWithWriter() throws Exception {
-		StringWriter writer = new StringWriter();
-		JasperPrint print = JasperFillManager.fillReport(getReport(), getParameters(), getDataSource());
-		JasperReportsUtils.render(new JRHtmlExporter(), print, writer);
-		String output = writer.getBuffer().toString();
-		assertHtmlOutputCorrect(output);
-	}
-
-	public void testRenderWithOutputStream() throws Exception {
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		JasperPrint print = JasperFillManager.fillReport(getReport(), getParameters(), getDataSource());
-		JasperReportsUtils.render(new JRPdfExporter(), print, os);
-		byte[] output = os.toByteArray();
-		assertPdfOutputCorrect(output);
-	}
-
-	private void assertCsvOutputCorrect(String output) {
-		assertTrue("Output length should be greater than 0", (output.length() > 0));
-		assertTrue("Output should start with Dear Lord!", output.startsWith("Dear Lord!"));
-		assertTrue("Output should contain 'MeineSeite'", output.contains("MeineSeite"));
-	}
-
-	private void assertHtmlOutputCorrect(String output) {
-		assertTrue("Output length should be greater than 0", (output.length() > 0));
-		assertTrue("Output should contain <html>", output.contains("<html>"));
-		assertTrue("Output should contain 'MeineSeite'", output.contains("MeineSeite"));
-	}
-
-	private void assertPdfOutputCorrect(byte[] output) throws Exception {
-		assertTrue("Output length should be greater than 0", (output.length > 0));
-
-		String translated = new String(output, "US-ASCII");
-		assertTrue("Output should start with %PDF", translated.startsWith("%PDF"));
-	}
-
-	private void assertXlsOutputCorrect(byte[] output) throws Exception {
-		HSSFWorkbook workbook = new HSSFWorkbook(new ByteArrayInputStream(output));
-		HSSFSheet sheet = workbook.getSheetAt(0);
-		assertNotNull("Sheet should not be null", sheet);
-		HSSFRow row = sheet.getRow(3);
-		HSSFCell cell = row.getCell((short) 1);
-		assertNotNull("Cell should not be null", cell);
-		assertEquals("Cell content should be Dear Lord!", "Dear Lord!", cell.getRichStringCellValue().getString());
-	}
-
-	private JasperReport getReport() throws Exception {
-		ClassPathResource resource = new ClassPathResource("DataSourceReport.jasper", getClass());
-		return (JasperReport) JRLoader.loadObject(resource.getInputStream());
-	}
-
-	private Map<String, Object> getParameters() {
-		Map<String, Object> model = new HashMap<String, Object>();
-		model.put("ReportTitle", "Dear Lord!");
-		model.put(JRParameter.REPORT_LOCALE, Locale.GERMAN);
-		model.put(JRParameter.REPORT_RESOURCE_BUNDLE,
-				ResourceBundle.getBundle("org/springframework/ui/jasperreports/messages", Locale.GERMAN));
-		return model;
-	}
-
-	private JRDataSource getDataSource() {
-		return new JRBeanCollectionDataSource(getData());
-	}
-
-	private List<PersonBean> getData() {
-		List<PersonBean> list = new ArrayList<PersonBean>();
-		for (int x = 0; x < 10; x++) {
-			PersonBean bean = new PersonBean();
-			bean.setId(x);
-			bean.setName("Rob Harrop");
-			bean.setStreet("foo");
-			list.add(bean);
-		}
-		return list;
-	}
-
-
-	private static class SimpleProgressMonitor implements JRExportProgressMonitor {
-
-		private boolean invoked = false;
-
-		@Override
-		public void afterPageExport() {
-			this.invoked = true;
-		}
-
-		public boolean isInvoked() {
-			return invoked;
-		}
-	}
-
-}
diff --git a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/ProductBean.java b/spring-context-support/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
deleted file mode 100644
index 4d83be1e92..0000000000
--- a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2002-2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ui.jasperreports;
-
-/**
- * @author Rob Harrop
- */
-public class ProductBean {
-
-	private int id;
-
-	private String name;
-
-	private float quantity;
-
-	private float price;
-
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public float getQuantity() {
-		return quantity;
-	}
-
-	public void setQuantity(float quantity) {
-		this.quantity = quantity;
-	}
-
-	public float getPrice() {
-		return price;
-	}
-
-	public void setPrice(float price) {
-		this.price = price;
-	}
-
-}
diff --git a/spring-context/src/main/java/org/springframework/cache/Cache.java b/spring-context/src/main/java/org/springframework/cache/Cache.java
index dbfa1cba84..f0710e74c4 100644
--- a/spring-context/src/main/java/org/springframework/cache/Cache.java
+++ b/spring-context/src/main/java/org/springframework/cache/Cache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.cache;
 
 /**
- * Interface that defines the common cache operations.
+ * Interface that defines common cache operations.
  *
  * <b>Note:</b> Due to the generic use of caching, it is recommended that
  * implementations allow storage of <tt>null</tt> values (for example to
@@ -39,11 +39,15 @@ public interface Cache {
 	Object getNativeCache();
 
 	/**
-	 * Return the value to which this cache maps the specified key. Returns
-	 * {@code null} if the cache contains no mapping for this key.
-	 * @param key key whose associated value is to be returned.
+	 * Return the value to which this cache maps the specified key.
+	 * <p>Returns {@code null} if the cache contains no mapping for this key;
+	 * otherwise, the cached value (which may be {@code null} itself) will
+	 * be returned in a {@link ValueWrapper}.
+	 * @param key the key whose associated value is to be returned
 	 * @return the value to which this cache maps the specified key,
-	 * or {@code null} if the cache contains no mapping for this key
+	 * contained within a {@link ValueWrapper} which may also hold
+	 * a cached {@code null} value. A straight {@code null} being
+	 * returned means that the cache contains no mapping for this key.
 	 */
 	ValueWrapper get(Object key);
 
diff --git a/spring-context/src/main/java/org/springframework/cache/CacheManager.java b/spring-context/src/main/java/org/springframework/cache/CacheManager.java
index 86228014ea..205bc9a327 100644
--- a/spring-context/src/main/java/org/springframework/cache/CacheManager.java
+++ b/spring-context/src/main/java/org/springframework/cache/CacheManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,8 @@
 import java.util.Collection;
 
 /**
- * A manager for a set of {@link Cache}s.
+ * Spring's central cache manager SPI.
+ * Allows for retrieving named {@link Cache} regions.
  *
  * @author Costin Leau
  * @since 3.1
@@ -28,14 +29,14 @@ public interface CacheManager {
 
 	/**
 	 * Return the cache associated with the given name.
-	 * @param name cache identifier (must not be {@code null})
-	 * @return associated cache, or {@code null} if none is found
+	 * @param name the cache identifier (must not be {@code null})
+	 * @return the associated cache, or {@code null} if none found
 	 */
 	Cache getCache(String name);
 
 	/**
-	 * Return a collection of the caches known by this cache manager.
-	 * @return names of caches known by the cache manager.
+	 * Return a collection of the cache names known by this manager.
+	 * @return the names of all caches known by the cache manager
 	 */
 	Collection<String> getCacheNames();
 
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
index 4937eeb5e3..71f5543337 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.cache.annotation;
 
 import java.util.Collection;
-
 import javax.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,12 +26,11 @@
 import org.springframework.context.annotation.ImportAware;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
 /**
- * Abstract base {@code @Configuration} class providing common structure for enabling
- * Spring's annotation-driven cache management capability.
+ * Abstract base {@code @Configuration} class providing common structure
+ * for enabling Spring's annotation-driven cache management capability.
  *
  * @author Chris Beams
  * @since 3.1
@@ -42,22 +40,28 @@
 public abstract class AbstractCachingConfiguration implements ImportAware {
 
 	protected AnnotationAttributes enableCaching;
+
 	protected CacheManager cacheManager;
+
 	protected KeyGenerator keyGenerator;
 
-	@Autowired(required=false)
+	@Autowired(required = false)
 	private Collection<CacheManager> cacheManagerBeans;
-	@Autowired(required=false)
+
+	@Autowired(required = false)
 	private Collection<CachingConfigurer> cachingConfigurers;
 
+
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		this.enableCaching = AnnotationAttributes.fromMap(
 				importMetadata.getAnnotationAttributes(EnableCaching.class.getName(), false));
-		Assert.notNull(this.enableCaching,
-				"@EnableCaching is not present on importing class " +
-				importMetadata.getClassName());
+		if (this.enableCaching == null) {
+			throw new IllegalArgumentException(
+					"@EnableCaching is not present on importing class " + importMetadata.getClassName());
+		}
 	}
 
+
 	/**
 	 * Determine which {@code CacheManager} bean to use. Prefer the result of
 	 * {@link CachingConfigurer#cacheManager()} over any by-type matching. If none, fall
@@ -68,20 +72,20 @@ public void setImportMetadata(AnnotationMetadata importMetadata) {
 	 */
 	@PostConstruct
 	protected void reconcileCacheManager() {
-		if (!CollectionUtils.isEmpty(cachingConfigurers)) {
-			int nConfigurers = cachingConfigurers.size();
+		if (!CollectionUtils.isEmpty(this.cachingConfigurers)) {
+			int nConfigurers = this.cachingConfigurers.size();
 			if (nConfigurers > 1) {
 				throw new IllegalStateException(nConfigurers + " implementations of " +
 						"CachingConfigurer were found when only 1 was expected. " +
 						"Refactor the configuration such that CachingConfigurer is " +
 						"implemented only once or not at all.");
 			}
-			CachingConfigurer cachingConfigurer = cachingConfigurers.iterator().next();
+			CachingConfigurer cachingConfigurer = this.cachingConfigurers.iterator().next();
 			this.cacheManager = cachingConfigurer.cacheManager();
 			this.keyGenerator = cachingConfigurer.keyGenerator();
 		}
-		else if (!CollectionUtils.isEmpty(cacheManagerBeans)) {
-			int nManagers = cacheManagerBeans.size();
+		else if (!CollectionUtils.isEmpty(this.cacheManagerBeans)) {
+			int nManagers = this.cacheManagerBeans.size();
 			if (nManagers > 1) {
 				throw new IllegalStateException(nManagers + " beans of type CacheManager " +
 						"were found when only 1 was expected. Remove all but one of the " +
@@ -89,8 +93,7 @@ else if (!CollectionUtils.isEmpty(cacheManagerBeans)) {
 						"to make explicit which CacheManager should be used for " +
 						"annotation-driven cache management.");
 			}
-			CacheManager cacheManager = cacheManagerBeans.iterator().next();
-			this.cacheManager = cacheManager;
+			this.cacheManager = cacheManager = this.cacheManagerBeans.iterator().next();
 			// keyGenerator remains null; will fall back to default within CacheInterceptor
 		}
 		else {
@@ -99,4 +102,5 @@ else if (!CollectionUtils.isEmpty(cacheManagerBeans)) {
 					"from your configuration.");
 		}
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java b/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
index 771487a56f..ae3cbdf7fc 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -151,13 +151,12 @@
 	 * Indicate whether subclass-based (CGLIB) proxies are to be created as opposed
 	 * to standard Java interface-based proxies. The default is {@code false}. <strong>
 	 * Applicable only if {@link #mode()} is set to {@link AdviceMode#PROXY}</strong>.
-	 *
 	 * <p>Note that setting this attribute to {@code true} will affect <em>all</em>
-	 * Spring-managed beans requiring proxying, not just those marked with
-	 * {@code @Cacheable}. For example, other beans marked with Spring's
-	 * {@code @Transactional} annotation will be upgraded to subclass proxying at the same
-	 * time. This approach has no negative impact in practice unless one is explicitly
-	 * expecting one type of proxy vs another, e.g. in tests.
+	 * Spring-managed beans requiring proxying, not just those marked with {@code @Cacheable}.
+	 * For example, other beans marked with Spring's {@code @Transactional} annotation will
+	 * be upgraded to subclass proxying at the same time. This approach has no negative
+	 * impact in practice unless one is explicitly expecting one type of proxy vs another,
+	 * e.g. in tests.
 	 */
 	boolean proxyTargetClass() default false;
 
@@ -174,4 +173,5 @@
 	 * The default is {@link Ordered#LOWEST_PRECEDENCE}.
 	 */
 	int order() default Ordered.LOWEST_PRECEDENCE;
+
 }
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java b/spring-context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
index 91e5366f5d..21604ddb73 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,11 +37,11 @@
 @Configuration
 public class ProxyCachingConfiguration extends AbstractCachingConfiguration {
 
-	@Bean(name=AnnotationConfigUtils.CACHE_ADVISOR_BEAN_NAME)
+	@Bean(name = AnnotationConfigUtils.CACHE_ADVISOR_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public BeanFactoryCacheOperationSourceAdvisor cacheAdvisor() {
 		BeanFactoryCacheOperationSourceAdvisor advisor =
-			new BeanFactoryCacheOperationSourceAdvisor();
+				new BeanFactoryCacheOperationSourceAdvisor();
 		advisor.setCacheOperationSource(cacheOperationSource());
 		advisor.setAdvice(cacheInterceptor());
 		advisor.setOrder(this.enableCaching.<Integer>getNumber("order"));
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java b/spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java
index d8c7575ce7..34144d9060 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@
 @SuppressWarnings("serial")
 public class SpringCacheAnnotationParser implements CacheAnnotationParser, Serializable {
 
+	@Override
 	public Collection<CacheOperation> parseCacheAnnotations(AnnotatedElement ae) {
 		Collection<CacheOperation> ops = null;
 
@@ -54,24 +55,28 @@ public Collection<CacheOperation> parseCacheAnnotations(AnnotatedElement ae) {
 		Collection<CacheEvict> evicts = getAnnotations(ae, CacheEvict.class);
 		if (evicts != null) {
 			ops = lazyInit(ops);
-			for (CacheEvict e : evicts) {
-				ops.add(parseEvictAnnotation(ae, e));
+			for (CacheEvict evict : evicts) {
+				ops.add(parseEvictAnnotation(ae, evict));
 			}
 		}
-		Collection<CachePut> updates = getAnnotations(ae, CachePut.class);
-		if (updates != null) {
+		Collection<CachePut> puts = getAnnotations(ae, CachePut.class);
+		if (puts != null) {
 			ops = lazyInit(ops);
-			for (CachePut p : updates) {
-				ops.add(parseUpdateAnnotation(ae, p));
+			for (CachePut put : puts) {
+				ops.add(parsePutAnnotation(ae, put));
 			}
 		}
-		Collection<Caching> caching = getAnnotations(ae, Caching.class);
-		if (caching != null) {
+		Collection<Caching> cachings = getAnnotations(ae, Caching.class);
+		if (cachings != null) {
 			ops = lazyInit(ops);
-			for (Caching c : caching) {
-				ops.addAll(parseCachingAnnotation(ae, c));
+			for (Caching caching : cachings) {
+				Collection<CacheOperation> cachingOps = parseCachingAnnotation(ae, caching);
+				if (cachingOps != null) {
+					ops.addAll(cachingOps);
+				}
 			}
 		}
+
 		return ops;
 	}
 
@@ -80,34 +85,34 @@ private <T extends Annotation> Collection<CacheOperation> lazyInit(Collection<Ca
 	}
 
 	CacheableOperation parseCacheableAnnotation(AnnotatedElement ae, Cacheable caching) {
-		CacheableOperation cuo = new CacheableOperation();
-		cuo.setCacheNames(caching.value());
-		cuo.setCondition(caching.condition());
-		cuo.setUnless(caching.unless());
-		cuo.setKey(caching.key());
-		cuo.setName(ae.toString());
-		return cuo;
+		CacheableOperation op = new CacheableOperation();
+		op.setCacheNames(caching.value());
+		op.setCondition(caching.condition());
+		op.setUnless(caching.unless());
+		op.setKey(caching.key());
+		op.setName(ae.toString());
+		return op;
 	}
 
 	CacheEvictOperation parseEvictAnnotation(AnnotatedElement ae, CacheEvict caching) {
-		CacheEvictOperation ceo = new CacheEvictOperation();
-		ceo.setCacheNames(caching.value());
-		ceo.setCondition(caching.condition());
-		ceo.setKey(caching.key());
-		ceo.setCacheWide(caching.allEntries());
-		ceo.setBeforeInvocation(caching.beforeInvocation());
-		ceo.setName(ae.toString());
-		return ceo;
+		CacheEvictOperation op = new CacheEvictOperation();
+		op.setCacheNames(caching.value());
+		op.setCondition(caching.condition());
+		op.setKey(caching.key());
+		op.setCacheWide(caching.allEntries());
+		op.setBeforeInvocation(caching.beforeInvocation());
+		op.setName(ae.toString());
+		return op;
 	}
 
-	CacheOperation parseUpdateAnnotation(AnnotatedElement ae, CachePut caching) {
-		CachePutOperation cuo = new CachePutOperation();
-		cuo.setCacheNames(caching.value());
-		cuo.setCondition(caching.condition());
-		cuo.setUnless(caching.unless());
-		cuo.setKey(caching.key());
-		cuo.setName(ae.toString());
-		return cuo;
+	CacheOperation parsePutAnnotation(AnnotatedElement ae, CachePut caching) {
+		CachePutOperation op = new CachePutOperation();
+		op.setCacheNames(caching.value());
+		op.setCondition(caching.condition());
+		op.setUnless(caching.unless());
+		op.setKey(caching.key());
+		op.setName(ae.toString());
+		return op;
 	}
 
 	Collection<CacheOperation> parseCachingAnnotation(AnnotatedElement ae, Caching caching) {
@@ -131,7 +136,7 @@ Collection<CacheOperation> parseCachingAnnotation(AnnotatedElement ae, Caching c
 		if (!ObjectUtils.isEmpty(updates)) {
 			ops = lazyInit(ops);
 			for (CachePut update : updates) {
-				ops.add(parseUpdateAnnotation(ae, update));
+				ops.add(parsePutAnnotation(ae, update));
 			}
 		}
 
diff --git a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java
index 54b9b6ef14..5ba4e2c2aa 100644
--- a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java
+++ b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,17 @@
 
 package org.springframework.cache.concurrent;
 
-import org.springframework.cache.Cache;
-import org.springframework.cache.support.SimpleValueWrapper;
-
 import java.io.Serializable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import org.springframework.cache.Cache;
+import org.springframework.cache.support.SimpleValueWrapper;
+import org.springframework.util.Assert;
+
 /**
- * Simple {@link Cache} implementation based on the core JDK
- * {@code java.util.concurrent} package.
+ * Simple {@link org.springframework.cache.Cache} implementation based on the
+ * core JDK {@code java.util.concurrent} package.
  *
  * <p>Useful for testing or simple caching scenarios, typically in combination
  * with {@link org.springframework.cache.support.SimpleCacheManager} or
@@ -62,7 +63,8 @@ public ConcurrentMapCache(String name) {
 	/**
 	 * Create a new ConcurrentMapCache with the specified name.
 	 * @param name the name of the cache
-	 * @param allowNullValues whether to accept and convert null values for this cache
+	 * @param allowNullValues whether to accept and convert {@code null}
+	 * values for this cache
 	 */
 	public ConcurrentMapCache(String name, boolean allowNullValues) {
 		this(name, new ConcurrentHashMap<Object, Object>(256), allowNullValues);
@@ -70,13 +72,15 @@ public ConcurrentMapCache(String name, boolean allowNullValues) {
 
 	/**
 	 * Create a new ConcurrentMapCache with the specified name and the
-	 * given internal ConcurrentMap to use.
+	 * given internal {@link ConcurrentMap} to use.
 	 * @param name the name of the cache
 	 * @param store the ConcurrentMap to use as an internal store
 	 * @param allowNullValues whether to allow {@code null} values
 	 * (adapting them to an internal null holder value)
 	 */
 	public ConcurrentMapCache(String name, ConcurrentMap<Object, Object> store, boolean allowNullValues) {
+		Assert.notNull(name, "Name must not be null");
+		Assert.notNull(store, "Store must not be null");
 		this.name = name;
 		this.store = store;
 		this.allowNullValues = allowNullValues;
@@ -142,6 +146,10 @@ protected Object toStoreValue(Object userValue) {
 
 	@SuppressWarnings("serial")
 	private static class NullHolder implements Serializable {
+
+		private Object readResolve() {
+			return NULL_HOLDER;
+		}
 	}
 
 }
diff --git a/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
index 5cae8fdff4..75f3887f43 100644
--- a/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.cache.config;
 
-import static org.springframework.context.annotation.AnnotationConfigUtils.*;
+import org.w3c.dom.Element;
 
 import org.springframework.aop.config.AopNamespaceUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -26,10 +26,9 @@
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.cache.annotation.AnnotationCacheOperationSource;
 import org.springframework.cache.interceptor.BeanFactoryCacheOperationSourceAdvisor;
 import org.springframework.cache.interceptor.CacheInterceptor;
-import org.w3c.dom.Element;
+import org.springframework.context.annotation.AnnotationConfigUtils;
 
 /**
  * {@link org.springframework.beans.factory.xml.BeanDefinitionParser}
@@ -74,24 +73,21 @@ private static void parseCacheManagerProperty(Element element, BeanDefinition de
 
 	/**
 	 * Registers a
-	 * <pre>
+	 * <pre class="code">
 	 * <bean id="cacheAspect" class="org.springframework.cache.aspectj.AnnotationCacheAspect" factory-method="aspectOf">
 	 *   <property name="cacheManager" ref="cacheManager"/>
 	 *   <property name="keyGenerator" ref="keyGenerator"/>
 	 * </bean>
-	 *
 	 * </pre>
-	 * @param element
-	 * @param parserContext
 	 */
 	private void registerCacheAspect(Element element, ParserContext parserContext) {
-		if (!parserContext.getRegistry().containsBeanDefinition(CACHE_ASPECT_BEAN_NAME)) {
+		if (!parserContext.getRegistry().containsBeanDefinition(AnnotationConfigUtils.CACHE_ASPECT_BEAN_NAME)) {
 			RootBeanDefinition def = new RootBeanDefinition();
-			def.setBeanClassName(CACHE_ASPECT_CLASS_NAME);
+			def.setBeanClassName(AnnotationConfigUtils.CACHE_ASPECT_CLASS_NAME);
 			def.setFactoryMethodName("aspectOf");
 			parseCacheManagerProperty(element, def);
 			CacheNamespaceHandler.parseKeyGenerator(element, def);
-			parserContext.registerBeanComponent(new BeanComponentDefinition(def, CACHE_ASPECT_BEAN_NAME));
+			parserContext.registerBeanComponent(new BeanComponentDefinition(def, AnnotationConfigUtils.CACHE_ASPECT_BEAN_NAME));
 		}
 	}
 
@@ -104,11 +100,11 @@ private static class AopAutoProxyConfigurer {
 		public static void configureAutoProxyCreator(Element element, ParserContext parserContext) {
 			AopNamespaceUtils.registerAutoProxyCreatorIfNecessary(parserContext, element);
 
-			if (!parserContext.getRegistry().containsBeanDefinition(CACHE_ADVISOR_BEAN_NAME)) {
+			if (!parserContext.getRegistry().containsBeanDefinition(AnnotationConfigUtils.CACHE_ADVISOR_BEAN_NAME)) {
 				Object eleSource = parserContext.extractSource(element);
 
 				// Create the CacheOperationSource definition.
-				RootBeanDefinition sourceDef = new RootBeanDefinition(AnnotationCacheOperationSource.class);
+				RootBeanDefinition sourceDef = new RootBeanDefinition("org.springframework.cache.annotation.AnnotationCacheOperationSource");
 				sourceDef.setSource(eleSource);
 				sourceDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 				String sourceName = parserContext.getReaderContext().registerWithGeneratedName(sourceDef);
@@ -131,15 +127,16 @@ public static void configureAutoProxyCreator(Element element, ParserContext pars
 				if (element.hasAttribute("order")) {
 					advisorDef.getPropertyValues().add("order", element.getAttribute("order"));
 				}
-				parserContext.getRegistry().registerBeanDefinition(CACHE_ADVISOR_BEAN_NAME, advisorDef);
+				parserContext.getRegistry().registerBeanDefinition(AnnotationConfigUtils.CACHE_ADVISOR_BEAN_NAME, advisorDef);
 
 				CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(),
 						eleSource);
 				compositeDef.addNestedComponent(new BeanComponentDefinition(sourceDef, sourceName));
 				compositeDef.addNestedComponent(new BeanComponentDefinition(interceptorDef, interceptorName));
-				compositeDef.addNestedComponent(new BeanComponentDefinition(advisorDef, CACHE_ADVISOR_BEAN_NAME));
+				compositeDef.addNestedComponent(new BeanComponentDefinition(advisorDef, AnnotationConfigUtils.CACHE_ADVISOR_BEAN_NAME));
 				parserContext.registerComponent(compositeDef);
 			}
 		}
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
index 978dbd8c36..d71a16efde 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -212,13 +212,14 @@ public boolean equals(Object other) {
 				return false;
 			}
 			DefaultCacheKey otherKey = (DefaultCacheKey) other;
-			return (this.method.equals(otherKey.method) && ObjectUtils.nullSafeEquals(this.targetClass,
-					otherKey.targetClass));
+			return (this.method.equals(otherKey.method) &&
+					ObjectUtils.nullSafeEquals(this.targetClass, otherKey.targetClass));
 		}
 
 		@Override
 		public int hashCode() {
-			return this.method.hashCode() * 29 + (this.targetClass != null ? this.targetClass.hashCode() : 0);
+			return this.method.hashCode() + (this.targetClass != null ? this.targetClass.hashCode() * 29 : 0);
 		}
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
index 8e0b36889d..bf6b8439e7 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.cache.Cache;
@@ -61,23 +62,25 @@
  */
 public abstract class CacheAspectSupport implements InitializingBean {
 
-	public interface Invoker {
-		Object invoke();
-	}
+	private static final String CACHEABLE = "cacheable";
+
+	private static final String UPDATE = "cacheupdate";
+
+	private static final String EVICT = "cacheevict";
+
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
+	private final ExpressionEvaluator evaluator = new ExpressionEvaluator();
+
 	private CacheManager cacheManager;
 
 	private CacheOperationSource cacheOperationSource;
 
-	private final ExpressionEvaluator evaluator = new ExpressionEvaluator();
-
 	private KeyGenerator keyGenerator = new DefaultKeyGenerator();
 
 	private boolean initialized = false;
 
-	private static final String CACHEABLE = "cacheable", UPDATE = "cacheupdate", EVICT = "cacheevict";
 
 	/**
 	 * Set the CacheManager that this cache aspect should delegate to.
@@ -100,11 +103,9 @@ public CacheManager getCacheManager() {
 	 * @param cacheOperationSources must not be {@code null}
 	 */
 	public void setCacheOperationSources(CacheOperationSource... cacheOperationSources) {
-		Assert.notEmpty(cacheOperationSources);
-		this.cacheOperationSource =
-				(cacheOperationSources.length > 1 ?
-						new CompositeCacheOperationSource(cacheOperationSources) :
-						cacheOperationSources[0]);
+		Assert.notEmpty(cacheOperationSources, "At least 1 CacheOperationSource needs to be specified");
+		this.cacheOperationSource = (cacheOperationSources.length > 1 ?
+				new CompositeCacheOperationSource(cacheOperationSources) : cacheOperationSources[0]);
 	}
 
 	/**
@@ -131,16 +132,17 @@ public KeyGenerator getKeyGenerator() {
 
 	public void afterPropertiesSet() {
 		if (this.cacheManager == null) {
-			throw new IllegalStateException("'cacheManager' is required");
+			throw new IllegalStateException("Property 'cacheManager' is required");
 		}
 		if (this.cacheOperationSource == null) {
-			throw new IllegalStateException("The 'cacheOperationSources' property is required: "
-					+ "If there are no cacheable methods, then don't use a cache aspect.");
+			throw new IllegalStateException("Property 'cacheOperationSources' is required: " +
+					"If there are no cacheable methods, then don't use a cache aspect.");
 		}
 
 		this.initialized = true;
 	}
 
+
 	/**
 	 * Convenience method to return a String representation of this Method
 	 * for use in logging. Can be overridden in subclasses to provide a
@@ -161,7 +163,7 @@ protected Collection<Cache> getCaches(CacheOperation operation) {
 		for (String cacheName : cacheNames) {
 			Cache cache = this.cacheManager.getCache(cacheName);
 			if (cache == null) {
-				throw new IllegalArgumentException("Cannot find cache named [" + cacheName + "] for " + operation);
+				throw new IllegalArgumentException("Cannot find cache named '" + cacheName + "' for " + operation);
 			}
 			caches.add(cache);
 		}
@@ -186,39 +188,31 @@ protected Object execute(Invoker invoker, Object target, Method method, Object[]
 		if (targetClass == null && target != null) {
 			targetClass = target.getClass();
 		}
-		final Collection<CacheOperation> cacheOp = getCacheOperationSource().getCacheOperations(method, targetClass);
+		Collection<CacheOperation> cacheOp = getCacheOperationSource().getCacheOperations(method, targetClass);
 
 		// analyze caching information
 		if (!CollectionUtils.isEmpty(cacheOp)) {
 			Map<String, Collection<CacheOperationContext>> ops = createOperationContext(cacheOp, method, args, target, targetClass);
-
 			// start with evictions
 			inspectBeforeCacheEvicts(ops.get(EVICT));
-
 			// follow up with cacheable
 			CacheStatus status = inspectCacheables(ops.get(CACHEABLE));
-
-			Object retVal = null;
+			Object retVal;
 			Map<CacheOperationContext, Object> updates = inspectCacheUpdates(ops.get(UPDATE));
-
 			if (status != null) {
 				if (status.updateRequired) {
-					updates.putAll(status.cUpdates);
+					updates.putAll(status.cacheUpdates);
 				}
 				// return cached object
 				else {
 					return status.retVal;
 				}
 			}
-
 			retVal = invoker.invoke();
-
 			inspectAfterCacheEvicts(ops.get(EVICT), retVal);
-
 			if (!updates.isEmpty()) {
 				update(updates, retVal);
 			}
-
 			return retVal;
 		}
 
@@ -229,27 +223,20 @@ private void inspectBeforeCacheEvicts(Collection<CacheOperationContext> eviction
 		inspectCacheEvicts(evictions, true, ExpressionEvaluator.NO_RESULT);
 	}
 
-	private void inspectAfterCacheEvicts(Collection<CacheOperationContext> evictions,
-			Object result) {
+	private void inspectAfterCacheEvicts(Collection<CacheOperationContext> evictions, Object result) {
 		inspectCacheEvicts(evictions, false, result);
 	}
 
-	private void inspectCacheEvicts(Collection<CacheOperationContext> evictions,
-			boolean beforeInvocation, Object result) {
-
+	private void inspectCacheEvicts(Collection<CacheOperationContext> evictions, boolean beforeInvocation, Object result) {
 		if (!evictions.isEmpty()) {
-
 			boolean log = logger.isTraceEnabled();
-
 			for (CacheOperationContext context : evictions) {
 				CacheEvictOperation evictOp = (CacheEvictOperation) context.operation;
-
 				if (beforeInvocation == evictOp.isBeforeInvocation()) {
 					if (context.isConditionPassing(result)) {
 						// for each cache
 						// lazy key initialization
 						Object key = null;
-
 						for (Cache cache : context.getCaches()) {
 							// cache-wide flush
 							if (evictOp.isCacheWide()) {
@@ -257,7 +244,8 @@ private void inspectCacheEvicts(Collection<CacheOperationContext> evictions,
 								if (log) {
 									logger.trace("Invalidating entire cache for operation " + evictOp + " on method " + context.method);
 								}
-							} else {
+							}
+							else {
 								// check key
 								if (key == null) {
 									key = context.generateKey();
@@ -268,7 +256,8 @@ private void inspectCacheEvicts(Collection<CacheOperationContext> evictions,
 								cache.evict(key);
 							}
 						}
-					} else {
+					}
+					else {
 						if (log) {
 							logger.trace("Cache condition failed on method " + context.method + " for operation " + context.operation);
 						}
@@ -279,49 +268,37 @@ private void inspectCacheEvicts(Collection<CacheOperationContext> evictions,
 	}
 
 	private CacheStatus inspectCacheables(Collection<CacheOperationContext> cacheables) {
-		Map<CacheOperationContext, Object> cUpdates = new LinkedHashMap<CacheOperationContext, Object>(cacheables.size());
-
-		boolean updateRequired = false;
+		Map<CacheOperationContext, Object> cacheUpdates = new LinkedHashMap<CacheOperationContext, Object>(cacheables.size());
+		boolean cacheHit = false;
 		Object retVal = null;
 
 		if (!cacheables.isEmpty()) {
 			boolean log = logger.isTraceEnabled();
 			boolean atLeastOnePassed = false;
-
 			for (CacheOperationContext context : cacheables) {
 				if (context.isConditionPassing()) {
 					atLeastOnePassed = true;
 					Object key = context.generateKey();
-
 					if (log) {
 						logger.trace("Computed cache key " + key + " for operation " + context.operation);
 					}
 					if (key == null) {
-						throw new IllegalArgumentException(
-								"Null key returned for cache operation (maybe you are using named params on classes without debug info?) "
-										+ context.operation);
+						throw new IllegalArgumentException("Null key returned for cache operation (maybe you " +
+								"are using named params on classes without debug info?) " + context.operation);
 					}
-
 					// add op/key (in case an update is discovered later on)
-					cUpdates.put(context, key);
-
-					boolean localCacheHit = false;
-
+					cacheUpdates.put(context, key);
 					// check whether the cache needs to be inspected or not (the method will be invoked anyway)
-					if (!updateRequired) {
+					if (!cacheHit) {
 						for (Cache cache : context.getCaches()) {
 							Cache.ValueWrapper wrapper = cache.get(key);
 							if (wrapper != null) {
 								retVal = wrapper.get();
-								localCacheHit = true;
+								cacheHit = true;
 								break;
 							}
 						}
 					}
-
-					if (!localCacheHit) {
-						updateRequired = true;
-					}
 				}
 				else {
 					if (log) {
@@ -330,51 +307,31 @@ private CacheStatus inspectCacheables(Collection<CacheOperationContext> cacheabl
 				}
 			}
 
-			// return a status only if at least on cacheable matched
+			// return a status only if at least one cacheable matched
 			if (atLeastOnePassed) {
-				return new CacheStatus(cUpdates, updateRequired, retVal);
+				return new CacheStatus(cacheUpdates, !cacheHit, retVal);
 			}
 		}
 
 		return null;
 	}
 
-	private static class CacheStatus {
-		// caches/key
-		final Map<CacheOperationContext, Object> cUpdates;
-		final boolean updateRequired;
-		final Object retVal;
-
-		CacheStatus(Map<CacheOperationContext, Object> cUpdates, boolean updateRequired, Object retVal) {
-			this.cUpdates = cUpdates;
-			this.updateRequired = updateRequired;
-			this.retVal = retVal;
-		}
-	}
-
 	private Map<CacheOperationContext, Object> inspectCacheUpdates(Collection<CacheOperationContext> updates) {
-
-		Map<CacheOperationContext, Object> cUpdates = new LinkedHashMap<CacheOperationContext, Object>(updates.size());
-
+		Map<CacheOperationContext, Object> cacheUpdates = new LinkedHashMap<CacheOperationContext, Object>(updates.size());
 		if (!updates.isEmpty()) {
 			boolean log = logger.isTraceEnabled();
-
 			for (CacheOperationContext context : updates) {
 				if (context.isConditionPassing()) {
-
 					Object key = context.generateKey();
-
 					if (log) {
 						logger.trace("Computed cache key " + key + " for operation " + context.operation);
 					}
 					if (key == null) {
-						throw new IllegalArgumentException(
-								"Null key returned for cache operation (maybe you are using named params on classes without debug info?) "
-										+ context.operation);
+						throw new IllegalArgumentException("Null key returned for cache operation (maybe you " +
+								"are using named params on classes without debug info?) " + context.operation);
 					}
-
 					// add op/key (in case an update is discovered later on)
-					cUpdates.put(context, key);
+					cacheUpdates.put(context, key);
 				}
 				else {
 					if (log) {
@@ -383,14 +340,13 @@ private Map<CacheOperationContext, Object> inspectCacheUpdates(Collection<CacheO
 				}
 			}
 		}
-
-		return cUpdates;
+		return cacheUpdates;
 	}
 
 	private void update(Map<CacheOperationContext, Object> updates, Object retVal) {
 		for (Map.Entry<CacheOperationContext, Object> entry : updates.entrySet()) {
 			CacheOperationContext operationContext = entry.getKey();
-			if(operationContext.canPutToCache(retVal)) {
+			if (operationContext.canPutToCache(retVal)) {
 				for (Cache cache : operationContext.getCaches()) {
 					cache.put(entry.getValue(), retVal);
 				}
@@ -398,37 +354,40 @@ private void update(Map<CacheOperationContext, Object> updates, Object retVal) {
 		}
 	}
 
-	private Map<String, Collection<CacheOperationContext>> createOperationContext(Collection<CacheOperation> cacheOp,
-			Method method, Object[] args, Object target, Class<?> targetClass) {
-		Map<String, Collection<CacheOperationContext>> map = new LinkedHashMap<String, Collection<CacheOperationContext>>(3);
+	private Map<String, Collection<CacheOperationContext>> createOperationContext(
+			Collection<CacheOperation> cacheOperations, Method method, Object[] args, Object target, Class<?> targetClass) {
 
+		Map<String, Collection<CacheOperationContext>> result = new LinkedHashMap<String, Collection<CacheOperationContext>>(3);
 		Collection<CacheOperationContext> cacheables = new ArrayList<CacheOperationContext>();
 		Collection<CacheOperationContext> evicts = new ArrayList<CacheOperationContext>();
 		Collection<CacheOperationContext> updates = new ArrayList<CacheOperationContext>();
 
-		for (CacheOperation cacheOperation : cacheOp) {
+		for (CacheOperation cacheOperation : cacheOperations) {
 			CacheOperationContext opContext = getOperationContext(cacheOperation, method, args, target, targetClass);
-
 			if (cacheOperation instanceof CacheableOperation) {
 				cacheables.add(opContext);
 			}
-
 			if (cacheOperation instanceof CacheEvictOperation) {
 				evicts.add(opContext);
 			}
-
 			if (cacheOperation instanceof CachePutOperation) {
 				updates.add(opContext);
 			}
 		}
 
-		map.put(CACHEABLE, cacheables);
-		map.put(EVICT, evicts);
-		map.put(UPDATE, updates);
+		result.put(CACHEABLE, cacheables);
+		result.put(EVICT, evicts);
+		result.put(UPDATE, updates);
+		return result;
+	}
+
 
-		return map;
+	public interface Invoker {
+
+		Object invoke();
 	}
 
+
 	protected class CacheOperationContext {
 
 		private final CacheOperation operation;
@@ -459,8 +418,7 @@ protected boolean isConditionPassing() {
 		protected boolean isConditionPassing(Object result) {
 			if (StringUtils.hasText(this.operation.getCondition())) {
 				EvaluationContext evaluationContext = createEvaluationContext(result);
-				return evaluator.condition(this.operation.getCondition(), this.method,
-						evaluationContext);
+				return evaluator.condition(this.operation.getCondition(), this.method, evaluationContext);
 			}
 			return true;
 		}
@@ -473,7 +431,7 @@ protected boolean canPutToCache(Object value) {
 			else if (this.operation instanceof CachePutOperation) {
 				unless = ((CachePutOperation) this.operation).getUnless();
 			}
-			if(StringUtils.hasText(unless)) {
+			if (StringUtils.hasText(unless)) {
 				EvaluationContext evaluationContext = createEvaluationContext(value);
 				return !evaluator.unless(unless, this.method, evaluationContext);
 			}
@@ -493,12 +451,29 @@ protected Object generateKey() {
 		}
 
 		private EvaluationContext createEvaluationContext(Object result) {
-			return evaluator.createEvaluationContext(this.caches, this.method, this.args,
-					this.target, this.targetClass, result);
+			return evaluator.createEvaluationContext(this.caches, this.method, this.args, this.target, this.targetClass, result);
 		}
 
 		protected Collection<Cache> getCaches() {
 			return this.caches;
 		}
 	}
+
+
+	private static class CacheStatus {
+
+		// caches/key
+		final Map<CacheOperationContext, Object> cacheUpdates;
+
+		final boolean updateRequired;
+
+		final Object retVal;
+
+		CacheStatus(Map<CacheOperationContext, Object> cacheUpdates, boolean updateRequired, Object retVal) {
+			this.cacheUpdates = cacheUpdates;
+			this.updateRequired = updateRequired;
+			this.retVal = retVal;
+		}
+	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java
index 46d84590e8..713258dcef 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,32 +23,29 @@
 import org.springframework.util.Assert;
 
 /**
- * Base class implementing {@link CacheOperation}.
+ * Base class for cache operations.
  *
  * @author Costin Leau
+ * @since 3.1
  */
 public abstract class CacheOperation {
 
-	private Set<String> cacheNames = Collections.emptySet();
-	private String condition = "";
-	private String key = "";
 	private String name = "";
 
+	private Set<String> cacheNames = Collections.emptySet();
 
-	public Set<String> getCacheNames() {
-		return cacheNames;
-	}
+	private String key = "";
 
-	public String getCondition() {
-		return condition;
-	}
+	private String condition = "";
 
-	public String getKey() {
-		return key;
+
+	public void setName(String name) {
+		Assert.hasText(name);
+		this.name = name;
 	}
 
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
 	public void setCacheName(String cacheName) {
@@ -56,17 +53,16 @@ public void setCacheName(String cacheName) {
 		this.cacheNames = Collections.singleton(cacheName);
 	}
 
-	public void setCacheNames(String[] cacheNames) {
-		Assert.notEmpty(cacheNames);
+	public void setCacheNames(String... cacheNames) {
 		this.cacheNames = new LinkedHashSet<String>(cacheNames.length);
-		for (String string : cacheNames) {
-			this.cacheNames.add(string);
+		for (String cacheName : cacheNames) {
+			Assert.hasText(cacheName, "Cache name must be non-null if specified");
+			this.cacheNames.add(cacheName);
 		}
 	}
 
-	public void setCondition(String condition) {
-		Assert.notNull(condition);
-		this.condition = condition;
+	public Set<String> getCacheNames() {
+		return this.cacheNames;
 	}
 
 	public void setKey(String key) {
@@ -74,11 +70,20 @@ public void setKey(String key) {
 		this.key = key;
 	}
 
-	public void setName(String name) {
-		Assert.hasText(name);
-		this.name = name;
+	public String getKey() {
+		return this.key;
+	}
+
+	public void setCondition(String condition) {
+		Assert.notNull(condition);
+		this.condition = condition;
+	}
+
+	public String getCondition() {
+		return this.condition;
 	}
 
+
 	/**
 	 * This implementation compares the {@code toString()} results.
 	 * @see #toString()
@@ -113,17 +118,12 @@ public String toString() {
 	 * <p>Available to subclasses, for inclusion in their {@code toString()} result.
 	 */
 	protected StringBuilder getOperationDescription() {
-		StringBuilder result = new StringBuilder();
-		result.append(getClass().getSimpleName());
-		result.append("[");
-		result.append(this.name);
-		result.append("] caches=");
-		result.append(this.cacheNames);
-		result.append(" | key='");
-		result.append(this.key);
-		result.append("' | condition='");
-		result.append(this.condition);
-		result.append("'");
+		StringBuilder result = new StringBuilder(getClass().getSimpleName());
+		result.append("[").append(this.name);
+		result.append("] caches=").append(this.cacheNames);
+		result.append(" | key='").append(this.key);
+		result.append("' | condition='").append(this.condition).append("'");
 		return result;
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java b/spring-context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java
index cb0dcc95d8..ed6c0e96cb 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/DefaultKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
 package org.springframework.cache.interceptor;
 
 import java.lang.reflect.Method;
-
-import org.springframework.cache.interceptor.KeyGenerator;
+import java.util.Arrays;
 
 /**
  * Default key generator. Returns {@value #NO_PARAM_KEY} if no
@@ -29,25 +28,29 @@
  *
  * @author Costin Leau
  * @author Chris Beams
+ * @author Juergen Hoeller
  * @since 3.1
  */
 public class DefaultKeyGenerator implements KeyGenerator {
 
 	public static final int NO_PARAM_KEY = 0;
+
 	public static final int NULL_PARAM_KEY = 53;
 
 	public Object generate(Object target, Method method, Object... params) {
-		if (params.length == 1) {
-			return (params[0] == null ? NULL_PARAM_KEY : params[0]);
-		}
 		if (params.length == 0) {
 			return NO_PARAM_KEY;
 		}
-		int hashCode = 17;
-		for (Object object : params) {
-			hashCode = 31 * hashCode + (object == null ? NULL_PARAM_KEY : object.hashCode());
+		if (params.length == 1) {
+			Object param = params[0];
+			if (param == null) {
+				return NULL_PARAM_KEY;
+			}
+			if (!param.getClass().isArray()) {
+				return param;
+			}
 		}
-		return Integer.valueOf(hashCode);
+		return Arrays.deepHashCode(params);
 	}
 
 }
diff --git a/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java b/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java
index 29a5a98973..a6b2064dc4 100644
--- a/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java
+++ b/spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,12 +45,11 @@ public abstract class AbstractCacheManager implements CacheManager, Initializing
 	public void afterPropertiesSet() {
 		Collection<? extends Cache> caches = loadCaches();
 
-		// preserve the initial order of the cache names
+		// Preserve the initial order of the cache names
 		this.cacheMap.clear();
 		this.cacheNames.clear();
 		for (Cache cache : caches) {
-			this.cacheMap.put(cache.getName(), decorateCache(cache));
-			this.cacheNames.add(cache.getName());
+			addCache(cache);
 		}
 	}
 
@@ -80,8 +79,9 @@ public Collection<String> getCacheNames() {
 
 
 	/**
-	 * Load the caches for this cache manager. Occurs at startup.
-	 * The returned collection must not be null.
+	 * Load the initial caches for this cache manager.
+	 * <p>Called by {@link #afterPropertiesSet()} on startup.
+	 * The returned collection may be empty but must not be {@code null}.
 	 */
 	protected abstract Collection<? extends Cache> loadCaches();
 
diff --git a/spring-context/src/main/java/org/springframework/cache/support/CompositeCacheManager.java b/spring-context/src/main/java/org/springframework/cache/support/CompositeCacheManager.java
index ab5b96d867..00caf7f0ea 100644
--- a/spring-context/src/main/java/org/springframework/cache/support/CompositeCacheManager.java
+++ b/spring-context/src/main/java/org/springframework/cache/support/CompositeCacheManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,42 +17,73 @@
 package org.springframework.cache.support;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
-import org.springframework.util.Assert;
 
 /**
- * Composite {@link CacheManager} implementation that iterates
- * over a given collection of {@link CacheManager} instances.
+ * Composite {@link CacheManager} implementation that iterates over
+ * a given collection of delegate {@link CacheManager} instances.
  *
- * Allows {@link NoOpCacheManager} to be automatically added to the list for handling
- * the cache declarations without a backing store.
+ * <p>Allows {@link NoOpCacheManager} to be automatically added to the end of
+ * the list for handling cache declarations without a backing store. Otherwise,
+ * any custom {@link CacheManager} may play that role of the last delegate as
+ * well, lazily creating cache regions for any requested name.
+ *
+ * <p>Note: Regular CacheManagers that this composite manager delegates to need
+ * to return {@code null} from {@link #getCache(String)} if they are unaware of
+ * the specified cache name, allowing for iteration to the next delegate in line.
+ * However, most {@link CacheManager} implementations fall back to lazy creation
+ * of named caches once requested; check out the specific configuration details
+ * for a 'static' mode with fixed cache names, if available.
  *
  * @author Costin Leau
  * @author Juergen Hoeller
  * @since 3.1
+ * @see #setFallbackToNoOpCache
+ * @see org.springframework.cache.concurrent.ConcurrentMapCacheManager#setCacheNames
  */
-public class CompositeCacheManager implements InitializingBean, CacheManager {
+public class CompositeCacheManager implements CacheManager, InitializingBean {
 
-	private List<CacheManager> cacheManagers;
+	private final List<CacheManager> cacheManagers = new ArrayList<CacheManager>();
 
 	private boolean fallbackToNoOpCache = false;
 
 
+	/**
+	 * Construct an empty CompositeCacheManager, with delegate CacheManagers to
+	 * be added via the {@link #setCacheManagers "cacheManagers"} property.
+	 */
+	public CompositeCacheManager() {
+	}
+
+	/**
+	 * Construct a CompositeCacheManager from the given delegate CacheManagers.
+	 * @param cacheManagers the CacheManagers to delegate to
+	 */
+	public CompositeCacheManager(CacheManager... cacheManagers) {
+		setCacheManagers(Arrays.asList(cacheManagers));
+	}
+
+
+	/**
+	 * Specify the CacheManagers to delegate to.
+	 */
 	public void setCacheManagers(Collection<CacheManager> cacheManagers) {
-		Assert.notEmpty(cacheManagers, "cacheManagers Collection must not be empty");
-		this.cacheManagers = new ArrayList<CacheManager>();
+		this.cacheManagers.clear();  // just here to preserve compatibility with previous behavior
 		this.cacheManagers.addAll(cacheManagers);
 	}
 
 	/**
-	 * Indicate whether a {@link NoOpCacheManager} should be added at the end of the manager lists.
-	 * In this case, any {@code getCache} requests not handled by the configured cache managers will
+	 * Indicate whether a {@link NoOpCacheManager} should be added at the end of the delegate list.
+	 * In this case, any {@code getCache} requests not handled by the configured CacheManagers will
 	 * be automatically handled by the {@link NoOpCacheManager} (and hence never return {@code null}).
 	 */
 	public void setFallbackToNoOpCache(boolean fallbackToNoOpCache) {
@@ -77,11 +108,11 @@ public Cache getCache(String name) {
 	}
 
 	public Collection<String> getCacheNames() {
-		List<String> names = new ArrayList<String>();
+		Set<String> names = new LinkedHashSet<String>();
 		for (CacheManager manager : this.cacheManagers) {
 			names.addAll(manager.getCacheNames());
 		}
-		return Collections.unmodifiableList(names);
+		return Collections.unmodifiableSet(names);
 	}
 
 }
diff --git a/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java b/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java
index 9d0bdc4b7c..d65e05058a 100644
--- a/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@ public interface ConfigurableApplicationContext extends ApplicationContext, Life
 	 * Name of the ConversionService bean in the factory.
 	 * If none is supplied, default conversion rules apply.
 	 * @see org.springframework.core.convert.ConversionService
+	 * @since 3.0
 	 */
 	String CONVERSION_SERVICE_BEAN_NAME = "conversionService";
 
@@ -60,12 +61,14 @@ public interface ConfigurableApplicationContext extends ApplicationContext, Life
 	 * Name of the LoadTimeWeaver bean in the factory. If such a bean is supplied,
 	 * the context will use a temporary ClassLoader for type matching, in order
 	 * to allow the LoadTimeWeaver to process all actual bean classes.
+	 * @since 2.5
 	 * @see org.springframework.instrument.classloading.LoadTimeWeaver
 	 */
 	String LOAD_TIME_WEAVER_BEAN_NAME = "loadTimeWeaver";
 
 	/**
 	 * Name of the {@link Environment} bean in the factory.
+	 * @since 3.1
 	 */
 	String ENVIRONMENT_BEAN_NAME = "environment";
 
@@ -84,6 +87,7 @@ public interface ConfigurableApplicationContext extends ApplicationContext, Life
 
 	/**
 	 * Set the unique id of this application context.
+	 * @since 3.0
 	 */
 	void setId(String id);
 
@@ -99,12 +103,14 @@ public interface ConfigurableApplicationContext extends ApplicationContext, Life
 
 	/**
 	 * Return the Environment for this application context in configurable form.
+	 * @since 3.1
 	 */
 	ConfigurableEnvironment getEnvironment();
 
 	/**
 	 * Set the {@code Environment} for this application context.
 	 * @param environment the new environment
+	 * @since 3.1
 	 */
 	void setEnvironment(ConfigurableEnvironment environment);
 
@@ -112,9 +118,9 @@ public interface ConfigurableApplicationContext extends ApplicationContext, Life
 	 * Add a new BeanFactoryPostProcessor that will get applied to the internal
 	 * bean factory of this application context on refresh, before any of the
 	 * bean definitions get evaluated. To be invoked during context configuration.
-	 * @param beanFactoryPostProcessor the factory processor to register
+	 * @param postProcessor the factory processor to register
 	 */
-	void addBeanFactoryPostProcessor(BeanFactoryPostProcessor beanFactoryPostProcessor);
+	void addBeanFactoryPostProcessor(BeanFactoryPostProcessor postProcessor);
 
 	/**
 	 * Add a new ApplicationListener that will be notified on context events
diff --git a/spring-context/src/main/java/org/springframework/context/Lifecycle.java b/spring-context/src/main/java/org/springframework/context/Lifecycle.java
index cfc101e39b..4d52031dcd 100644
--- a/spring-context/src/main/java/org/springframework/context/Lifecycle.java
+++ b/spring-context/src/main/java/org/springframework/context/Lifecycle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,15 @@
 package org.springframework.context;
 
 /**
- * Interface defining methods for start/stop lifecycle control.
+ * A common interface defining methods for start/stop lifecycle control.
  * The typical use case for this is to control asynchronous processing.
+ * <b>NOTE: This interface does not imply specific auto-startup semantics.
+ * Consider implementing {@link SmartLifecycle} for that purpose.</b>
  *
- * <p>Can be implemented by both components (typically a Spring bean defined in
- * a Spring {@link org.springframework.beans.factory.BeanFactory}) and containers
- * (typically a Spring {@link ApplicationContext}). Containers will propagate
- * start/stop signals to all components that apply.
+ * <p>Can be implemented by both components (typically a Spring bean defined in a
+ * Spring context) and containers  (typically a Spring {@link ApplicationContext}
+ * itself). Containers will propagate start/stop signals to all components that
+ * apply within each container, e.g. for a stop/restart scenario at runtime.
  *
  * <p>Can be used for direct invocations or for management operations via JMX.
  * In the latter case, the {@link org.springframework.jmx.export.MBeanExporter}
@@ -32,10 +34,10 @@
  * restricting the visibility of activity-controlled components to the Lifecycle
  * interface.
  *
- * <p>Note that the Lifecycle interface is only supported on <b>top-level singleton beans</b>.
- * On any other component, the Lifecycle interface will remain undetected and hence ignored.
- * Also, note that the extended {@link SmartLifecycle} interface provides more sophisticated
- * integration with the container's startup and shutdown phases.
+ * <p>Note that the Lifecycle interface is only supported on <b>top-level singleton
+ * beans</b>. On any other component, the Lifecycle interface will remain undetected
+ * and hence ignored. Also, note that the extended {@link SmartLifecycle} interface
+ * provides integration with the application context's startup and shutdown phases.
  *
  * @author Juergen Hoeller
  * @since 2.0
@@ -51,6 +53,7 @@ public interface Lifecycle {
 	 * Should not throw an exception if the component is already running.
 	 * <p>In the case of a container, this will propagate the start signal
 	 * to all components that apply.
+	 * @see SmartLifecycle#isAutoStartup()
 	 */
 	void start();
 
diff --git a/spring-context/src/main/java/org/springframework/context/SmartLifecycle.java b/spring-context/src/main/java/org/springframework/context/SmartLifecycle.java
index ffd4c92cb9..1ae2c12e9d 100644
--- a/spring-context/src/main/java/org/springframework/context/SmartLifecycle.java
+++ b/spring-context/src/main/java/org/springframework/context/SmartLifecycle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 package org.springframework.context;
 
 /**
- * An extension of the {@link Lifecycle} interface for those objects that require to be
- * started upon ApplicationContext refresh and/or shutdown in a particular order.
+ * An extension of the {@link Lifecycle} interface for those objects that require to
+ * be started upon ApplicationContext refresh and/or shutdown in a particular order.
  * The {@link #isAutoStartup()} return value indicates whether this object should
  * be started at the time of a context refresh. The callback-accepting
  * {@link #stop(Runnable)} method is useful for objects that have an asynchronous
@@ -55,26 +55,37 @@
  *
  * @author Mark Fisher
  * @since 3.0
+ * @see LifecycleProcessor
+ * @see ConfigurableApplicationContext
  */
 public interface SmartLifecycle extends Lifecycle, Phased {
 
 	/**
-	 * Return whether this Lifecycle component should be started automatically
-	 * by the container when the ApplicationContext is refreshed. A value of
-	 * "false" indicates that the component is intended to be started manually.
+	 * Returns {@code true} if this {@code Lifecycle} component should get
+	 * started automatically by the container at the time that the containing
+	 * {@link ApplicationContext} gets refreshed.
+	 * <p>A value of {@code false} indicates that the component is intended to
+	 * be started through an explicit {@link #start()} call instead, analogous
+	 * to a plain {@link Lifecycle} implementation.
+	 * @see #start()
+	 * @see #getPhase()
+	 * @see LifecycleProcessor#onRefresh()
+	 * @see ConfigurableApplicationContext#refresh()
 	 */
 	boolean isAutoStartup();
 
 	/**
 	 * Indicates that a Lifecycle component must stop if it is currently running.
-	 * <p>The provided callback is used by the {@link LifecycleProcessor} to support an
-	 * ordered, and potentially concurrent, shutdown of all components having a
+	 * <p>The provided callback is used by the {@link LifecycleProcessor} to support
+	 * an ordered, and potentially concurrent, shutdown of all components having a
 	 * common shutdown order value. The callback <b>must</b> be executed after
-	 * the SmartLifecycle component does indeed stop.
-	 * <p>The {@code LifecycleProcessor} will call <i>only</i> this variant of the
+	 * the {@code SmartLifecycle} component does indeed stop.
+	 * <p>The {@link LifecycleProcessor} will call <i>only</i> this variant of the
 	 * {@code stop} method; i.e. {@link Lifecycle#stop()} will not be called for
-	 * {@link SmartLifecycle} implementations unless explicitly delegated to within
-	 * this method.
+	 * {@code SmartLifecycle} implementations unless explicitly delegated to within
+	 * the implementation of this method.
+	 * @see #stop()
+	 * @see #getPhase()
 	 */
 	void stop(Runnable callback);
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AdviceModeImportSelector.java b/spring-context/src/main/java/org/springframework/context/annotation/AdviceModeImportSelector.java
index eae51ec251..c736bdad57 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AdviceModeImportSelector.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AdviceModeImportSelector.java
@@ -1,5 +1,5 @@
  /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,6 @@
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.util.Assert;
 
-import static org.springframework.context.annotation.MetadataUtils.*;
-
 /**
  * Convenient base class for {@link ImportSelector} implementations that select imports
  * based on an {@link AdviceMode} value from an annotation (such as the {@code @Enable*}
@@ -40,6 +38,7 @@ public abstract class AdviceModeImportSelector<A extends Annotation> implements
 
 	public static final String DEFAULT_ADVICE_MODE_ATTRIBUTE_NAME = "mode";
 
+
 	/**
 	 * The name of the {@link AdviceMode} attribute for the annotation specified by the
 	 * generic type {@code A}. The default is {@value #DEFAULT_ADVICE_MODE_ATTRIBUTE_NAME},
@@ -50,47 +49,37 @@ protected String getAdviceModeAttributeName() {
 	}
 
 	/**
-	 * {@inheritDoc}
-	 *
-	 * <p>This implementation resolves the type of annotation from generic metadata and
+	 * This implementation resolves the type of annotation from generic metadata and
 	 * validates that (a) the annotation is in fact present on the importing
 	 * {@code @Configuration} class and (b) that the given annotation has an
 	 * {@linkplain #getAdviceModeAttributeName() advice mode attribute} of type
 	 * {@link AdviceMode}.
-	 *
 	 * <p>The {@link #selectImports(AdviceMode)} method is then invoked, allowing the
 	 * concrete implementation to choose imports in a safe and convenient fashion.
-	 *
 	 * @throws IllegalArgumentException if expected annotation {@code A} is not present
 	 * on the importing {@code @Configuration} class or if {@link #selectImports(AdviceMode)}
 	 * returns {@code null}
 	 */
 	public final String[] selectImports(AnnotationMetadata importingClassMetadata) {
-		Class<?> annoType = GenericTypeResolver.resolveTypeArgument(this.getClass(), AdviceModeImportSelector.class);
-
-		AnnotationAttributes attributes = attributesFor(importingClassMetadata, annoType);
+		Class<?> annoType = GenericTypeResolver.resolveTypeArgument(getClass(), AdviceModeImportSelector.class);
+		AnnotationAttributes attributes = MetadataUtils.attributesFor(importingClassMetadata, annoType);
 		Assert.notNull(attributes, String.format(
 				"@%s is not present on importing class '%s' as expected",
 				annoType.getSimpleName(), importingClassMetadata.getClassName()));
 
 		AdviceMode adviceMode = attributes.getEnum(this.getAdviceModeAttributeName());
-
 		String[] imports = selectImports(adviceMode);
 		Assert.notNull(imports, String.format("Unknown AdviceMode: '%s'", adviceMode));
-
 		return imports;
 	}
 
 	/**
 	 * Determine which classes should be imported based on the given {@code AdviceMode}.
-	 *
 	 * <p>Returning {@code null} from this method indicates that the {@code AdviceMode} could
 	 * not be handled or was unknown and that an {@code IllegalArgumentException} should
 	 * be thrown.
-	 *
 	 * @param adviceMode the value of the {@linkplain #getAdviceModeAttributeName()
 	 * advice mode attribute} for the annotation specified via generics.
-	 *
 	 * @return array containing classes to import; empty array if none, {@code null} if
 	 * the given {@code AdviceMode} is unknown.
 	 */
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
index c09600998c..a0f8312aa7 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,13 +88,16 @@ protected String determineBeanNameFromAnnotation(AnnotatedBeanDefinition annotat
 		for (String type : types) {
 			AnnotationAttributes attributes = MetadataUtils.attributesFor(amd, type);
 			if (isStereotypeWithNameValue(type, amd.getMetaAnnotationTypes(type), attributes)) {
-				String value = (String) attributes.get("value");
-				if (StringUtils.hasLength(value)) {
-					if (beanName != null && !value.equals(beanName)) {
-						throw new IllegalStateException("Stereotype annotations suggest inconsistent " +
-								"component names: '" + beanName + "' versus '" + value + "'");
+				Object value = attributes.get("value");
+				if (value instanceof String) {
+					String strVal = (String) value;
+					if (StringUtils.hasLength(strVal)) {
+						if (beanName != null && !strVal.equals(beanName)) {
+							throw new IllegalStateException("Stereotype annotations suggest inconsistent " +
+									"component names: '" + beanName + "' versus '" + strVal + "'");
+						}
+						beanName = strVal;
 					}
-					beanName = value;
 				}
 			}
 		}
@@ -116,6 +119,7 @@ protected boolean isStereotypeWithNameValue(String annotationType,
 				(metaAnnotationTypes != null && metaAnnotationTypes.contains(COMPONENT_ANNOTATION_CLASSNAME)) ||
 				annotationType.equals("javax.annotation.ManagedBean") ||
 				annotationType.equals("javax.inject.Named");
+
 		return (isStereotype && attributes != null && attributes.containsKey("value"));
 	}
 
@@ -135,7 +139,7 @@ protected String buildDefaultBeanName(BeanDefinition definition, BeanDefinitionR
 	 * <p>The default implementation simply builds a decapitalized version
 	 * of the short class name: e.g. "mypackage.MyJdbcDao" -> "myJdbcDao".
 	 * <p>Note that inner classes will thus have names of the form
-	 * "outerClassName.innerClassName", which because of the period in the
+	 * "outerClassName.InnerClassName", which because of the period in the
 	 * name may be an issue if you are autowiring by name.
 	 * @param definition the bean definition to build a bean name for
 	 * @return the default bean name (never {@code null})
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java
index 4576ab3bba..9110189f73 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigApplicationContext.java
@@ -109,7 +109,7 @@ public void setEnvironment(ConfigurableEnvironment environment) {
 	public void setBeanNameGenerator(BeanNameGenerator beanNameGenerator) {
 		this.reader.setBeanNameGenerator(beanNameGenerator);
 		this.scanner.setBeanNameGenerator(beanNameGenerator);
-		this.getBeanFactory().registerSingleton(
+		getBeanFactory().registerSingleton(
 				AnnotationConfigUtils.CONFIGURATION_BEAN_NAME_GENERATOR, beanNameGenerator);
 	}
 
@@ -126,9 +126,9 @@ public void setScopeMetadataResolver(ScopeMetadataResolver scopeMetadataResolver
 
 	/**
 	 * Register one or more annotated classes to be processed.
-	 * Note that {@link #refresh()} must be called in order for the context to fully
-	 * process the new class.
-	 * <p>Calls to {@link #register} are idempotent; adding the same
+	 * Note that {@link #refresh()} must be called in order for the context
+	 * to fully process the new class.
+	 * <p>Calls to {@code register} are idempotent; adding the same
 	 * annotated class more than once has no additional effect.
 	 * @param annotatedClasses one or more annotated classes,
 	 * e.g. {@link Configuration @Configuration} classes
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
index f283bb6d2c..ae5a27fba0 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,8 +30,6 @@
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.util.ClassUtils;
 
-import static org.springframework.context.annotation.MetadataUtils.*;
-
 /**
  * Utility class that allows for convenient registration of common
  * {@link org.springframework.beans.factory.config.BeanPostProcessor} and
@@ -85,70 +83,89 @@ public class AnnotationConfigUtils {
 	public static final String COMMON_ANNOTATION_PROCESSOR_BEAN_NAME =
 			"org.springframework.context.annotation.internalCommonAnnotationProcessor";
 
+	/**
+	 * The bean name of the internally managed JPA annotation processor.
+	 */
+	public static final String PERSISTENCE_ANNOTATION_PROCESSOR_BEAN_NAME =
+			"org.springframework.context.annotation.internalPersistenceAnnotationProcessor";
+
+
+	private static final String PERSISTENCE_ANNOTATION_PROCESSOR_CLASS_NAME =
+			"org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor";
+
+
 	/**
 	 * The bean name of the internally managed Scheduled annotation processor.
+	 * <p>ATTENTION:</p> This constant is meant for internal use only. The value is stable
+	 * but don't rely on the presence of this constant declaration; rather copy the value.
 	 */
 	public static final String SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME =
 			"org.springframework.context.annotation.internalScheduledAnnotationProcessor";
 
 	/**
 	 * The bean name of the internally managed Async annotation processor.
+	 * <p>ATTENTION:</p> This constant is meant for internal use only. The value is stable
+	 * but don't rely on the presence of this constant declaration; rather copy the value.
 	 */
 	public static final String ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME =
 			"org.springframework.context.annotation.internalAsyncAnnotationProcessor";
 
 	/**
 	 * The bean name of the internally managed AspectJ async execution aspect.
+	 * <p>ATTENTION:</p> This constant is meant for internal use only. The value is stable
+	 * but don't rely on the presence of this constant declaration; rather copy the value.
 	 */
 	public static final String ASYNC_EXECUTION_ASPECT_BEAN_NAME =
 			"org.springframework.scheduling.config.internalAsyncExecutionAspect";
 
 	/**
 	 * The class name of the AspectJ async execution aspect.
+	 * <p>ATTENTION:</p> This constant is meant for internal use only. The value is stable
+	 * but don't rely on the presence of this constant declaration; rather copy the value.
 	 */
 	public static final String ASYNC_EXECUTION_ASPECT_CLASS_NAME =
 			"org.springframework.scheduling.aspectj.AnnotationAsyncExecutionAspect";
 
 	/**
 	 * The name of the AspectJ async execution aspect @{@code Configuration} class.
+	 * <p>ATTENTION:</p> This constant is meant for internal use only. The value is stable
+	 * but don't rely on the presence of this constant declaration; rather copy the value.
 	 */
 	public static final String ASYNC_EXECUTION_ASPECT_CONFIGURATION_CLASS_NAME =
 			"org.springframework.scheduling.aspectj.AspectJAsyncConfiguration";
 
 	/**
 	 * The bean name of the internally managed cache advisor.
+	 * <p>ATTENTION:</p> This constant is meant for internal use only. The value is stable
+	 * but don't rely on the presence of this constant declaration; rather copy the value.
 	 */
 	public static final String CACHE_ADVISOR_BEAN_NAME =
 			"org.springframework.cache.config.internalCacheAdvisor";
 
 	/**
 	 * The bean name of the internally managed cache aspect.
+	 * <p>ATTENTION:</p> This constant is meant for internal use only. The value is stable
+	 * but don't rely on the presence of this constant declaration; rather copy the value.
 	 */
 	public static final String CACHE_ASPECT_BEAN_NAME =
 			"org.springframework.cache.config.internalCacheAspect";
 
 	/**
 	 * The class name of the AspectJ caching aspect.
+	 * <p>ATTENTION:</p> This constant is meant for internal use only. The value is stable
+	 * but don't rely on the presence of this constant declaration; rather copy the value.
 	 */
 	public static final String CACHE_ASPECT_CLASS_NAME =
 			"org.springframework.cache.aspectj.AnnotationCacheAspect";
 
 	/**
 	 * The name of the AspectJ caching aspect @{@code Configuration} class.
+	 * <p>ATTENTION:</p> This constant is meant for internal use only. The value is stable
+	 * but don't rely on the presence of this constant declaration; rather copy the value.
 	 */
 	public static final String CACHE_ASPECT_CONFIGURATION_CLASS_NAME =
 			"org.springframework.cache.aspectj.AspectJCachingConfiguration";
 
-	/**
-	 * The bean name of the internally managed JPA annotation processor.
-	 */
-	public static final String PERSISTENCE_ANNOTATION_PROCESSOR_BEAN_NAME =
-			"org.springframework.context.annotation.internalPersistenceAnnotationProcessor";
-
-
-	private static final String PERSISTENCE_ANNOTATION_PROCESSOR_CLASS_NAME =
-			"org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor";
-
 
 	private static final boolean jsr250Present =
 			ClassUtils.isPresent("javax.annotation.Resource", AnnotationConfigUtils.class.getClassLoader());
@@ -208,8 +225,8 @@ public static Set<BeanDefinitionHolder> registerAnnotationConfigProcessors(
 		if (jpaPresent && !registry.containsBeanDefinition(PERSISTENCE_ANNOTATION_PROCESSOR_BEAN_NAME)) {
 			RootBeanDefinition def = new RootBeanDefinition();
 			try {
-				ClassLoader cl = AnnotationConfigUtils.class.getClassLoader();
-				def.setBeanClass(cl.loadClass(PERSISTENCE_ANNOTATION_PROCESSOR_CLASS_NAME));
+				def.setBeanClass(ClassUtils.forName(PERSISTENCE_ANNOTATION_PROCESSOR_CLASS_NAME,
+						AnnotationConfigUtils.class.getClassLoader()));
 			}
 			catch (ClassNotFoundException ex) {
 				throw new IllegalStateException(
@@ -230,20 +247,20 @@ private static BeanDefinitionHolder registerPostProcessor(
 		return new BeanDefinitionHolder(definition, beanName);
 	}
 
-	static void processCommonDefinitionAnnotations(AnnotatedBeanDefinition abd) {
+	public static void processCommonDefinitionAnnotations(AnnotatedBeanDefinition abd) {
 		AnnotationMetadata metadata = abd.getMetadata();
 		if (metadata.isAnnotated(Primary.class.getName())) {
 			abd.setPrimary(true);
 		}
 		if (metadata.isAnnotated(Lazy.class.getName())) {
-			abd.setLazyInit(attributesFor(metadata, Lazy.class).getBoolean("value"));
+			abd.setLazyInit(MetadataUtils.attributesFor(metadata, Lazy.class).getBoolean("value"));
 		}
 		if (metadata.isAnnotated(DependsOn.class.getName())) {
-			abd.setDependsOn(attributesFor(metadata, DependsOn.class).getStringArray("value"));
+			abd.setDependsOn(MetadataUtils.attributesFor(metadata, DependsOn.class).getStringArray("value"));
 		}
 		if (abd instanceof AbstractBeanDefinition) {
 			if (metadata.isAnnotated(Role.class.getName())) {
-				Integer role = attributesFor(metadata, Role.class).getNumber("value");
+				Integer role = MetadataUtils.attributesFor(metadata, Role.class).getNumber("value");
 				((AbstractBeanDefinition)abd).setRole(role);
 			}
 		}
@@ -260,5 +277,4 @@ static BeanDefinitionHolder applyScopedProxyMode(
 		return ScopedProxyCreator.createScopedProxy(definition, registry, proxyTargetClass);
 	}
 
-
 }
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java b/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java
index 5fcd8a572d..11b3e7f5d6 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java
@@ -1,5 +1,5 @@
- /*
- * Copyright 2002-2012 the original author or authors.
+/*
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,11 @@
 
 package org.springframework.context.annotation;
 
-import static org.springframework.context.annotation.MetadataUtils.attributesFor;
-
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.aop.config.AopConfigUtils;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.core.annotation.AnnotationAttributes;
@@ -33,8 +32,8 @@
  * {@code proxyTargetClass} attributes set to the correct values.
  *
  * @author Chris Beams
- * @see EnableAspectJAutoProxy
  * @since 3.1
+ * @see EnableAspectJAutoProxy
  */
 public class AutoProxyRegistrar implements ImportBeanDefinitionRegistrar {
 
@@ -47,7 +46,6 @@ public class AutoProxyRegistrar implements ImportBeanDefinitionRegistrar {
 	 * attributes. If {@code mode} is set to {@code PROXY}, the APC is registered; if
 	 * {@code proxyTargetClass} is set to {@code true}, then the APC is forced to use
 	 * subclass (CGLIB) proxying.
-	 *
 	 * <p>Several {@code @Enable*} annotations expose both {@code mode} and
 	 * {@code proxyTargetClass} attributes. It is important to note that most of these
 	 * capabilities end up sharing a {@linkplain AopConfigUtils#AUTO_PROXY_CREATOR_BEAN_NAME
@@ -60,16 +58,15 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
 		boolean candidateFound = false;
 		Set<String> annoTypes = importingClassMetadata.getAnnotationTypes();
 		for (String annoType : annoTypes) {
-			AnnotationAttributes candidate = attributesFor(importingClassMetadata, annoType);
+			AnnotationAttributes candidate = MetadataUtils.attributesFor(importingClassMetadata, annoType);
 			Object mode = candidate.get("mode");
 			Object proxyTargetClass = candidate.get("proxyTargetClass");
-			if (mode != null && proxyTargetClass != null
-					&& mode.getClass().equals(AdviceMode.class)
-					&& proxyTargetClass.getClass().equals(Boolean.class)) {
+			if (mode != null && proxyTargetClass != null && mode.getClass().equals(AdviceMode.class) &&
+					proxyTargetClass.getClass().equals(Boolean.class)) {
 				candidateFound = true;
 				if (mode == AdviceMode.PROXY) {
 					AopConfigUtils.registerAutoProxyCreatorIfNecessary(registry);
-					if ((Boolean)proxyTargetClass) {
+					if ((Boolean) proxyTargetClass) {
 						AopConfigUtils.forceAutoProxyCreatorToUseClassProxying(registry);
 						return;
 					}
@@ -81,11 +78,12 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
 			logger.warn(String.format("%s was imported but no annotations were found " +
 					"having both 'mode' and 'proxyTargetClass' attributes of type " +
 					"AdviceMode and boolean respectively. This means that auto proxy " +
-					"creator registration and configuration may not have occured as " +
+					"creator registration and configuration may not have occurred as " +
 					"intended, and components may not be proxied as expected. Check to " +
 					"ensure that %s has been @Import'ed on the same class where these " +
 					"annotations are declared; otherwise remove the import of %s " +
 					"altogether.", name, name, name));
 		}
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Bean.java b/spring-context/src/main/java/org/springframework/context/annotation/Bean.java
index 679352decf..8cbaa0da3b 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Bean.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Bean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,8 @@
  *     public MyBean myBean() {
  *         // instantiate and configure MyBean obj
  *         return obj;
- *     }</pre>
+ *     }
+ * </pre>
  *
  * <h3>Bean Names</h3>
  *
@@ -55,7 +56,8 @@
  *     public MyBean myBean() {
  *         // instantiate and configure MyBean obj
  *         return obj;
- *     }</pre>
+ *     }
+ * </pre>
  *
  * <h3>Scope, DependsOn, Primary, and Lazy</h3>
  *
@@ -70,7 +72,8 @@
  *     public MyBean myBean() {
  *         // instantiate and configure MyBean obj
  *         return obj;
- *     }</pre>
+ *     }
+ * </pre>
  *
  * <h3>{@code @Bean} Methods in {@code @Configuration} Classes</h3>
  *
@@ -87,14 +90,17 @@
  * <pre class="code">
  * &#064;Configuration
  * public class AppConfig {
+ *
  *     &#064;Bean
  *     public FooService fooService() {
  *         return new FooService(fooRepository());
  *     }
+ *
  *     &#064;Bean
  *     public FooRepository fooRepository() {
  *         return new JdbcFooRepository(dataSource());
  *     }
+ *
  *     // ...
  * }</pre>
  *
@@ -152,7 +158,8 @@
  *     &#064;Bean
  *     public static PropertyPlaceholderConfigurer ppc() {
  *         // instantiate, configure and return ppc ...
- *     }</pre>
+ *     }
+ * </pre>
  *
  * By marking this method as {@code static}, it can be invoked without causing instantiation of its
  * declaring {@code @Configuration} class, thus avoiding the above-mentioned lifecycle conflicts.
@@ -191,31 +198,39 @@
 
 	/**
 	 * Are dependencies to be injected via convention-based autowiring by name or type?
+	 * <p>Note that this autowire mode is just about externally driven autowiring based
+	 * on bean property setter methods by convention, analogous to XML bean definitions.
+	 * <p>The default mode does allow for annotation-driven autowiring. "no" refers to
+	 * externally driven autowiring only, not affecting any autowiring demands that the
+	 * bean class itself expresses through annotations.
+	 * @see Autowire#BY_NAME
+	 * @see Autowire#BY_TYPE
 	 */
 	Autowire autowire() default Autowire.NO;
 
 	/**
 	 * The optional name of a method to call on the bean instance during initialization.
 	 * Not commonly used, given that the method may be called programmatically directly
-	 * within the body of a Bean-annotated method. Default value is {@code ""}, indicating
-	 * that no init method should be called.
+	 * within the body of a Bean-annotated method.
+	 * <p>The default value is {@code ""}, indicating no init method to be called.
 	 */
 	String initMethod() default "";
 
 	/**
 	 * The optional name of a method to call on the bean instance upon closing the
-	 * application context, for example a {@code close()} method on a JDBC {@code
-	 * DataSource} implementation, or a Hibernate {@code SessionFactory} object.
+	 * application context, for example a {@code close()} method on a JDBC
+	 * {@code DataSource} implementation, or a Hibernate {@code SessionFactory} object.
 	 * The method must have no arguments but may throw any exception.
 	 * <p>As a convenience to the user, the container will attempt to infer a destroy
-	 * method against an object returned from the {@code @Bean} method. For example, given a
-	 * {@code @Bean} method returning an Apache Commons DBCP {@code BasicDataSource}, the
-	 * container will notice the {@code close()} method available on that object and
+	 * method against an object returned from the {@code @Bean} method. For example, given
+	 * an {@code @Bean} method returning an Apache Commons DBCP {@code BasicDataSource},
+	 * the container will notice the {@code close()} method available on that object and
 	 * automatically register it as the {@code destroyMethod}. This 'destroy method
 	 * inference' is currently limited to detecting only public, no-arg methods named
-	 * 'close'. The method may be declared at any level of the inheritance hierarchy and
-	 * will be detected regardless of the return type of the {@code @Bean} method (i.e.,
-	 * detection occurs reflectively against the bean instance itself at creation time).
+	 * 'close' or 'shutdown'. The method may be declared at any level of the inheritance
+	 * hierarchy and will be detected regardless of the return type of the {@code @Bean}
+	 * method (i.e., detection occurs reflectively against the bean instance itself at
+	 * creation time).
 	 * <p>To disable destroy method inference for a particular {@code @Bean}, specify an
 	 * empty string as the value, e.g. {@code @Bean(destroyMethod="")}. Note that the
 	 * {@link org.springframework.beans.factory.DisposableBean} and the
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
index b3f9450f98..e766e24880 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -167,7 +167,7 @@ public void setBeanDefinitionDefaults(BeanDefinitionDefaults beanDefinitionDefau
 	 * Set the name-matching patterns for determining autowire candidates.
 	 * @param autowireCandidatePatterns the patterns to match against
 	 */
-	public void setAutowireCandidatePatterns(String[] autowireCandidatePatterns) {
+	public void setAutowireCandidatePatterns(String... autowireCandidatePatterns) {
 		this.autowireCandidatePatterns = autowireCandidatePatterns;
 	}
 
@@ -224,7 +224,7 @@ public int scan(String... basePackages) {
 			AnnotationConfigUtils.registerAnnotationConfigProcessors(this.registry);
 		}
 
-		return this.registry.getBeanDefinitionCount() - beanCountAtScanStart;
+		return (this.registry.getBeanDefinitionCount() - beanCountAtScanStart);
 	}
 
 	/**
@@ -317,8 +317,8 @@ protected boolean checkCandidate(String beanName, BeanDefinition beanDefinition)
 	/**
 	 * Determine whether the given new bean definition is compatible with
 	 * the given existing bean definition.
-	 * <p>The default implementation simply considers them as compatible
-	 * when the bean class name matches.
+	 * <p>The default implementation considers them as compatible when the existing
+	 * bean definition comes from the same source or from a non-scanning source.
 	 * @param newDefinition the new bean definition, originated from scanning
 	 * @param existingDefinition the existing bean definition, potentially an
 	 * explicitly defined one or a previously generated one from scanning
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
index 6dacb49d60..9714322ba7 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,7 +90,7 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
 
 
 	/**
-	 * Create a ClassPathScanningCandidateComponentProvider.
+	 * Create a ClassPathScanningCandidateComponentProvider with a {@link StandardEnvironment}.
 	 * @param useDefaultFilters whether to register the default filters for the
 	 * {@link Component @Component}, {@link Repository @Repository},
 	 * {@link Service @Service}, and {@link Controller @Controller}
@@ -101,6 +101,15 @@ public ClassPathScanningCandidateComponentProvider(boolean useDefaultFilters) {
 		this(useDefaultFilters, new StandardEnvironment());
 	}
 
+	/**
+	 * Create a ClassPathScanningCandidateComponentProvider with the given {@link Environment}.
+	 * @param useDefaultFilters whether to register the default filters for the
+	 * {@link Component @Component}, {@link Repository @Repository},
+	 * {@link Service @Service}, and {@link Controller @Controller}
+	 * stereotype annotations
+	 * @param environment the Environment to use
+	 * @see #registerDefaultFilters()
+	 */
 	public ClassPathScanningCandidateComponentProvider(boolean useDefaultFilters, Environment environment) {
 		if (useDefaultFilters) {
 			registerDefaultFilters();
@@ -218,16 +227,16 @@ protected void registerDefaultFilters() {
 		ClassLoader cl = ClassPathScanningCandidateComponentProvider.class.getClassLoader();
 		try {
 			this.includeFilters.add(new AnnotationTypeFilter(
-					((Class<? extends Annotation>) cl.loadClass("javax.annotation.ManagedBean")), false));
-			logger.info("JSR-250 'javax.annotation.ManagedBean' found and supported for component scanning");
+					((Class<? extends Annotation>) ClassUtils.forName("javax.annotation.ManagedBean", cl)), false));
+			logger.debug("JSR-250 'javax.annotation.ManagedBean' found and supported for component scanning");
 		}
 		catch (ClassNotFoundException ex) {
 			// JSR-250 1.1 API (as included in Java EE 6) not available - simply skip.
 		}
 		try {
 			this.includeFilters.add(new AnnotationTypeFilter(
-					((Class<? extends Annotation>) cl.loadClass("javax.inject.Named")), false));
-			logger.info("JSR-330 'javax.inject.Named' annotation found and supported for component scanning");
+					((Class<? extends Annotation>) ClassUtils.forName("javax.inject.Named", cl)), false));
+			logger.debug("JSR-330 'javax.inject.Named' annotation found and supported for component scanning");
 		}
 		catch (ClassNotFoundException ex) {
 			// JSR-330 API not available - simply skip.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
index 93a71336a0..3e9a74ee72 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -145,10 +145,10 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 	private static Class<? extends Annotation> ejbRefClass = null;
 
 	static {
-		ClassLoader cl = CommonAnnotationBeanPostProcessor.class.getClassLoader();
 		try {
 			@SuppressWarnings("unchecked")
-			Class<? extends Annotation> clazz = (Class<? extends Annotation>) cl.loadClass("javax.xml.ws.WebServiceRef");
+			Class<? extends Annotation> clazz = (Class<? extends Annotation>)
+					ClassUtils.forName("javax.xml.ws.WebServiceRef", CommonAnnotationBeanPostProcessor.class.getClassLoader());
 			webServiceRefClass = clazz;
 		}
 		catch (ClassNotFoundException ex) {
@@ -156,7 +156,8 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 		}
 		try {
 			@SuppressWarnings("unchecked")
-			Class<? extends Annotation> clazz = (Class<? extends Annotation>) cl.loadClass("javax.ejb.EJB");
+			Class<? extends Annotation> clazz = (Class<? extends Annotation>)
+					ClassUtils.forName("javax.ejb.EJB", CommonAnnotationBeanPostProcessor.class.getClassLoader());
 			ejbRefClass = clazz;
 		}
 		catch (ClassNotFoundException ex) {
@@ -177,8 +178,8 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 
 	private transient BeanFactory beanFactory;
 
-	private transient final Map<Class<?>, InjectionMetadata> injectionMetadataCache =
-			new ConcurrentHashMap<Class<?>, InjectionMetadata>(64);
+	private transient final Map<String, InjectionMetadata> injectionMetadataCache =
+			new ConcurrentHashMap<String, InjectionMetadata>(64);
 
 
 	/**
@@ -282,7 +283,7 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 	public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
 		super.postProcessMergedBeanDefinition(beanDefinition, beanType, beanName);
 		if (beanType != null) {
-			InjectionMetadata metadata = findResourceMetadata(beanType);
+			InjectionMetadata metadata = findResourceMetadata(beanName, beanType, null);
 			metadata.checkConfigMembers(beanDefinition);
 		}
 	}
@@ -298,7 +299,7 @@ public boolean postProcessAfterInstantiation(Object bean, String beanName) throw
 	public PropertyValues postProcessPropertyValues(
 			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeansException {
 
-		InjectionMetadata metadata = findResourceMetadata(bean.getClass());
+		InjectionMetadata metadata = findResourceMetadata(beanName, bean.getClass(), pvs);
 		try {
 			metadata.inject(bean, beanName, pvs);
 		}
@@ -309,13 +310,19 @@ public PropertyValues postProcessPropertyValues(
 	}
 
 
-	private InjectionMetadata findResourceMetadata(final Class<?> clazz) {
+	private InjectionMetadata findResourceMetadata(String beanName, final Class<?> clazz, PropertyValues pvs) {
+		// Fall back to class name as cache key, for backwards compatibility with custom callers.
+		String cacheKey = (StringUtils.hasLength(beanName) ? beanName : clazz.getName());
 		// Quick check on the concurrent map first, with minimal locking.
-		InjectionMetadata metadata = this.injectionMetadataCache.get(clazz);
-		if (metadata == null) {
+		InjectionMetadata metadata = this.injectionMetadataCache.get(cacheKey);
+		if (InjectionMetadata.needsRefresh(metadata, clazz)) {
 			synchronized (this.injectionMetadataCache) {
-				metadata = this.injectionMetadataCache.get(clazz);
-				if (metadata == null) {
+				metadata = this.injectionMetadataCache.get(cacheKey);
+				if (InjectionMetadata.needsRefresh(metadata, clazz)) {
+					if (metadata != null) {
+						metadata.clear(pvs);
+					}
+
 					LinkedList<InjectionMetadata.InjectedElement> elements = new LinkedList<InjectionMetadata.InjectedElement>();
 					Class<?> targetClass = clazz;
 
@@ -354,7 +361,7 @@ else if (field.isAnnotationPresent(Resource.class)) {
 									if (method.getParameterTypes().length != 1) {
 										throw new IllegalStateException("@WebServiceRef annotation requires a single-arg method: " + method);
 									}
-									PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);
+									PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method, clazz);
 									currElements.add(new WebServiceRefElement(method, pd));
 								}
 								else if (ejbRefClass != null && method.isAnnotationPresent(ejbRefClass)) {
@@ -364,7 +371,7 @@ else if (ejbRefClass != null && method.isAnnotationPresent(ejbRefClass)) {
 									if (method.getParameterTypes().length != 1) {
 										throw new IllegalStateException("@EJB annotation requires a single-arg method: " + method);
 									}
-									PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);
+									PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method, clazz);
 									currElements.add(new EjbRefElement(method, pd));
 								}
 								else if (method.isAnnotationPresent(Resource.class)) {
@@ -376,7 +383,7 @@ else if (method.isAnnotationPresent(Resource.class)) {
 										throw new IllegalStateException("@Resource annotation requires a single-arg method: " + method);
 									}
 									if (!ignoredResourceTypes.contains(paramTypes[0].getName())) {
-										PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);
+										PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method, clazz);
 										currElements.add(new ResourceElement(method, pd));
 									}
 								}
@@ -388,7 +395,7 @@ else if (method.isAnnotationPresent(Resource.class)) {
 					while (targetClass != null && targetClass != Object.class);
 
 					metadata = new InjectionMetadata(clazz, elements);
-					this.injectionMetadataCache.put(clazz, metadata);
+					this.injectionMetadataCache.put(cacheKey, metadata);
 				}
 			}
 		}
@@ -472,11 +479,8 @@ protected abstract class LookupElement extends InjectionMetadata.InjectedElement
 
 		public LookupElement(Member member, PropertyDescriptor pd) {
 			super(member, pd);
-			initAnnotation((AnnotatedElement) member);
 		}
 
-		protected abstract void initAnnotation(AnnotatedElement ae);
-
 		/**
 		 * Return the resource name for the lookup.
 		 */
@@ -511,14 +515,11 @@ public final DependencyDescriptor getDependencyDescriptor() {
 	 */
 	private class ResourceElement extends LookupElement {
 
-		protected boolean shareable = true;
+		protected final boolean shareable;
 
 		public ResourceElement(Member member, PropertyDescriptor pd) {
 			super(member, pd);
-		}
-
-		@Override
-		protected void initAnnotation(AnnotatedElement ae) {
+			AnnotatedElement ae = (AnnotatedElement) member;
 			Resource resource = ae.getAnnotation(Resource.class);
 			String resourceName = resource.name();
 			Class<?> resourceType = resource.type();
@@ -558,16 +559,13 @@ protected Object getResourceToInject(Object target, String requestingBeanName) {
 	 */
 	private class WebServiceRefElement extends LookupElement {
 
-		private Class<?> elementType;
+		private final Class<?> elementType;
 
-		private String wsdlLocation;
+		private final String wsdlLocation;
 
 		public WebServiceRefElement(Member member, PropertyDescriptor pd) {
 			super(member, pd);
-		}
-
-		@Override
-		protected void initAnnotation(AnnotatedElement ae) {
+			AnnotatedElement ae = (AnnotatedElement) member;
 			WebServiceRef resource = ae.getAnnotation(WebServiceRef.class);
 			String resourceName = resource.name();
 			Class<?> resourceType = resource.type();
@@ -613,7 +611,7 @@ protected Object getResourceToInject(Object target, String requestingBeanName) {
 				}
 				if (StringUtils.hasLength(this.wsdlLocation)) {
 					try {
-						Constructor<?> ctor = this.lookupType.getConstructor(new Class[] {URL.class, QName.class});
+						Constructor<?> ctor = this.lookupType.getConstructor(new Class<?>[] {URL.class, QName.class});
 						WebServiceClient clientAnn = this.lookupType.getAnnotation(WebServiceClient.class);
 						if (clientAnn == null) {
 							throw new IllegalStateException("JAX-WS Service class [" + this.lookupType.getName() +
@@ -647,14 +645,11 @@ protected Object getResourceToInject(Object target, String requestingBeanName) {
 	 */
 	private class EjbRefElement extends LookupElement {
 
-		private String beanName;
+		private final String beanName;
 
 		public EjbRefElement(Member member, PropertyDescriptor pd) {
 			super(member, pd);
-		}
-
-		@Override
-		protected void initAnnotation(AnnotatedElement ae) {
+			AnnotatedElement ae = (AnnotatedElement) member;
 			EJB resource = ae.getAnnotation(EJB.class);
 			String resourceBeanName = resource.beanName();
 			String resourceName = resource.name();
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java
index eaab654ec7..f90f4d9858 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
  * always registered, meaning that any attempt to disable them at the
  * {@code @ComponentScan} level would be ignored.
  *
- * <p>See @{@link Configuration} Javadoc for usage examples.
+ * <p>See @{@link Configuration}'s javadoc for usage examples.
  *
  * @author Chris Beams
  * @since 3.1
@@ -139,24 +139,18 @@
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target({})
 	@interface Filter {
+
 		/**
-		 * The type of filter to use.
-		 * <p>Note that the filter types available are limited to those that may
-		 * be expressed as a {@code Class} in the {@link #value()} attribute. This is
-		 * in contrast to {@code <context:component-scan/>}, which allows for
-		 * expression-based (i.e., string-based) filters such as AspectJ pointcuts.
-		 * These filter types are intentionally not supported here, and not available
-		 * in the {@link FilterType} enum.
-		 * @see FilterType
+		 * The type of filter to use. Default is {@link FilterType#ANNOTATION}.
 		 */
 		FilterType type() default FilterType.ANNOTATION;
 
 		/**
 		 * The class or classes to use as the filter. In the case of
-		 * {@link FilterType#ANNOTATION}, the class will be the annotation itself. In the
-		 * case of {@link FilterType#ASSIGNABLE_TYPE}, the class will be the type that
-		 * detected components should be assignable to. And in the case of
-		 * {@link FilterType#CUSTOM}, the class will be an implementation of
+		 * {@link FilterType#ANNOTATION}, the class will be the annotation itself.
+		 * In the case of {@link FilterType#ASSIGNABLE_TYPE}, the class will be the
+		 * type that detected components should be assignable to. And in the case
+		 * of {@link FilterType#CUSTOM}, the class will be an implementation of
 		 * {@link TypeFilter}.
 		 * <p>When multiple classes are specified, OR logic is applied, e.g. "include
 		 * types annotated with {@code @Foo} OR {@code @Bar}".
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
index 48af4ed5a0..7519495de0 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.type.filter.AbstractTypeHierarchyTraversingFilter;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.core.type.filter.AssignableTypeFilter;
 import org.springframework.core.type.filter.TypeFilter;
@@ -64,7 +65,7 @@ public ComponentScanAnnotationParser(ResourceLoader resourceLoader, Environment
 	}
 
 
-	public Set<BeanDefinitionHolder> parse(AnnotationAttributes componentScan, String declaringClass) {
+	public Set<BeanDefinitionHolder> parse(AnnotationAttributes componentScan, final String declaringClass) {
 		ClassPathBeanDefinitionScanner scanner =
 				new ClassPathBeanDefinitionScanner(this.registry, componentScan.getBoolean("useDefaultFilters"));
 
@@ -120,6 +121,12 @@ public Set<BeanDefinitionHolder> parse(AnnotationAttributes componentScan, Strin
 			basePackages.add(ClassUtils.getPackageName(declaringClass));
 		}
 
+		scanner.addExcludeFilter(new AbstractTypeHierarchyTraversingFilter(false, false) {
+			@Override
+			protected boolean matchClassName(String className) {
+				return declaringClass.equals(className);
+			}
+		});
 		return scanner.doScan(StringUtils.toStringArray(basePackages));
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java
index f7b5677635..4893c0d74e 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -239,7 +239,7 @@ else if ("regex".equals(filterType)) {
 				return new RegexPatternTypeFilter(Pattern.compile(expression));
 			}
 			else if ("custom".equals(filterType)) {
-				Class filterClass = classLoader.loadClass(expression);
+				Class<?> filterClass = classLoader.loadClass(expression);
 				if (!TypeFilter.class.isAssignableFrom(filterClass)) {
 					throw new IllegalArgumentException(
 							"Class is not assignable to [" + TypeFilter.class.getName() + "]: " + expression);
@@ -256,8 +256,8 @@ else if ("custom".equals(filterType)) {
 	}
 
 	@SuppressWarnings("unchecked")
-	private Object instantiateUserDefinedStrategy(String className, Class strategyType, ClassLoader classLoader) {
-		Object result = null;
+	private Object instantiateUserDefinedStrategy(String className, Class<?> strategyType, ClassLoader classLoader) {
+		Object result;
 		try {
 			result = classLoader.loadClass(className).newInstance();
 		}
@@ -267,7 +267,7 @@ private Object instantiateUserDefinedStrategy(String className, Class strategyTy
 		}
 		catch (Exception ex) {
 			throw new IllegalArgumentException("Unable to instantiate class [" + className + "] for strategy [" +
-					strategyType.getName() + "]. A zero-argument constructor is required", ex);
+					strategyType.getName() + "]: a zero-argument constructor is required", ex);
 		}
 
 		if (!strategyType.isAssignableFrom(result.getClass())) {
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
index a25fdcf4ce..0b16e6bfca 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,8 +36,8 @@
 
 /**
  * Represents a user-defined {@link Configuration @Configuration} class.
- * Includes a set of {@link Bean} methods, including all such methods defined in the
- * ancestry of the class, in a 'flattened-out' manner.
+ * Includes a set of {@link Bean} methods, including all such methods
+ * defined in the ancestry of the class, in a 'flattened-out' manner.
  *
  * @author Chris Beams
  * @author Juergen Hoeller
@@ -51,15 +51,15 @@ final class ConfigurationClass {
 
 	private final Resource resource;
 
-	private final Map<String, Class<? extends BeanDefinitionReader>> importedResources =
-			new LinkedHashMap<String, Class<? extends BeanDefinitionReader>>();
-
-	private final Set<BeanMethod> beanMethods = new LinkedHashSet<BeanMethod>();
-
 	private String beanName;
 
 	private final boolean imported;
 
+	private final Set<BeanMethod> beanMethods = new LinkedHashSet<BeanMethod>();
+
+	private final Map<String, Class<? extends BeanDefinitionReader>> importedResources =
+			new LinkedHashMap<String, Class<? extends BeanDefinitionReader>>();
+
 
 	/**
 	 * Create a new {@link ConfigurationClass} with the given name.
@@ -81,7 +81,7 @@ public ConfigurationClass(MetadataReader metadataReader, String beanName) {
 	 * using the {@link Import} annotation or automatically processed as a nested
 	 * configuration class (if imported is {@code true}).
 	 * @param metadataReader reader used to parse the underlying {@link Class}
-	 * @param beanName name of the {@code @Configuration} class bean
+	 * @param imported whether the given configuration class is being imported
 	 * @since 3.1.1
 	 */
 	public ConfigurationClass(MetadataReader metadataReader, boolean imported) {
@@ -98,7 +98,7 @@ public ConfigurationClass(MetadataReader metadataReader, boolean imported) {
 	 * @see ConfigurationClass#ConfigurationClass(Class, boolean)
 	 */
 	public ConfigurationClass(Class<?> clazz, String beanName) {
-		Assert.hasText(beanName, "bean name must not be null");
+		Assert.hasText(beanName, "Bean name must not be null");
 		this.metadata = new StandardAnnotationMetadata(clazz, true);
 		this.resource = new DescriptiveResource(clazz.toString());
 		this.beanName = beanName;
@@ -110,7 +110,7 @@ public ConfigurationClass(Class<?> clazz, String beanName) {
 	 * using the {@link Import} annotation or automatically processed as a nested
 	 * configuration class (if imported is {@code true}).
 	 * @param clazz the underlying {@link Class} to represent
-	 * @param beanName name of the {@code @Configuration} class bean
+	 * @param imported whether the given configuration class is being imported
 	 * @since 3.1.1
 	 */
 	public ConfigurationClass(Class<?> clazz, boolean imported) {
@@ -119,6 +119,7 @@ public ConfigurationClass(Class<?> clazz, boolean imported) {
 		this.imported = imported;
 	}
 
+
 	public AnnotationMetadata getMetadata() {
 		return this.metadata;
 	}
@@ -131,6 +132,14 @@ public String getSimpleName() {
 		return ClassUtils.getShortName(getMetadata().getClassName());
 	}
 
+	public void setBeanName(String beanName) {
+		this.beanName = beanName;
+	}
+
+	public String getBeanName() {
+		return this.beanName;
+	}
+
 	/**
 	 * Return whether this configuration class was registered via @{@link Import} or
 	 * automatically registered due to being nested within another configuration class.
@@ -140,14 +149,6 @@ public boolean isImported() {
 		return this.imported;
 	}
 
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return this.beanName;
-	}
-
 	public void addBeanMethod(BeanMethod method) {
 		this.beanMethods.add(method);
 	}
@@ -156,8 +157,7 @@ public Set<BeanMethod> getBeanMethods() {
 		return this.beanMethods;
 	}
 
-	public void addImportedResource(
-			String importedResource, Class<? extends BeanDefinitionReader> readerClass) {
+	public void addImportedResource(String importedResource, Class<? extends BeanDefinitionReader> readerClass) {
 		this.importedResources.put(importedResource, readerClass);
 	}
 
@@ -166,40 +166,35 @@ public Map<String, Class<? extends BeanDefinitionReader>> getImportedResources()
 	}
 
 	public void validate(ProblemReporter problemReporter) {
+		// A configuration class may not be final (CGLIB limitation)
+		if (getMetadata().isAnnotated(Configuration.class.getName())) {
+			if (getMetadata().isFinal()) {
+				problemReporter.error(new FinalConfigurationProblem());
+			}
+		}
+
 		// An @Bean method may only be overloaded through inheritance. No single
 		// @Configuration class may declare two @Bean methods with the same name.
-		final char hashDelim = '#';
 		Map<String, Integer> methodNameCounts = new HashMap<String, Integer>();
-		for (BeanMethod beanMethod : beanMethods) {
-			String dClassName = beanMethod.getMetadata().getDeclaringClassName();
-			String methodName = beanMethod.getMetadata().getMethodName();
-			String fqMethodName = dClassName + hashDelim + methodName;
+		for (BeanMethod beanMethod : this.beanMethods) {
+			String fqMethodName = beanMethod.getFullyQualifiedMethodName();
 			Integer currentCount = methodNameCounts.get(fqMethodName);
-			int newCount = currentCount != null ? currentCount + 1 : 1;
+			int newCount = (currentCount != null ? currentCount + 1 : 1);
 			methodNameCounts.put(fqMethodName, newCount);
 		}
-
-		for (String methodName : methodNameCounts.keySet()) {
-			int count = methodNameCounts.get(methodName);
+		for (String fqMethodName : methodNameCounts.keySet()) {
+			int count = methodNameCounts.get(fqMethodName);
 			if (count > 1) {
-				String shortMethodName = methodName.substring(methodName.indexOf(hashDelim)+1);
+				String shortMethodName = ConfigurationMethod.getShortMethodName(fqMethodName);
 				problemReporter.error(new BeanMethodOverloadingProblem(shortMethodName, count));
 			}
 		}
 
-		// A configuration class may not be final (CGLIB limitation)
-		if (getMetadata().isAnnotated(Configuration.class.getName())) {
-			if (getMetadata().isFinal()) {
-				problemReporter.error(new FinalConfigurationProblem());
-			}
-		}
-
 		for (BeanMethod beanMethod : this.beanMethods) {
 			beanMethod.validate(problemReporter);
 		}
 	}
 
-
 	@Override
 	public boolean equals(Object other) {
 		return (this == other || (other instanceof ConfigurationClass &&
@@ -213,7 +208,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		return String.format("[ConfigurationClass:beanName=%s,resource=%s]", this.beanName, this.resource);
+		return "ConfigurationClass:beanName=" + this.beanName + ",resource=" + this.resource;
 	}
 
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
index e1676c6eb2..3824467bae 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
@@ -51,8 +51,6 @@
 import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.util.StringUtils;
 
-import static org.springframework.context.annotation.MetadataUtils.*;
-
 /**
  * Reads a given fully-populated set of ConfigurationClass instances, registering bean
  * definitions with the given {@link BeanDefinitionRegistry} based on its contents.
@@ -134,8 +132,6 @@ private void loadBeanDefinitionsForConfigurationClass(ConfigurationClass configC
 	private void registerBeanDefinitionForImportedConfigurationClass(ConfigurationClass configClass) {
 		AnnotationMetadata metadata = configClass.getMetadata();
 		BeanDefinition configBeanDef = new AnnotatedGenericBeanDefinition(metadata);
-		String className = metadata.getClassName();
-		configBeanDef.setBeanClassName(className);
 		if (ConfigurationClassUtils.checkConfigurationClassCandidate(configBeanDef, this.metadataReaderFactory)) {
 			String configBeanName = this.importBeanNameGenerator.generateBeanName(configBeanDef, this.registry);
 			this.registry.registerBeanDefinition(configBeanName, configBeanDef);
@@ -146,7 +142,7 @@ private void registerBeanDefinitionForImportedConfigurationClass(ConfigurationCl
 		}
 		else {
 			this.problemReporter.error(
-					new InvalidConfigurationImportProblem(className, configClass.getResource(), metadata));
+					new InvalidConfigurationImportProblem(metadata.getClassName(), configClass.getResource(), metadata));
 		}
 	}
 
@@ -158,7 +154,7 @@ private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) {
 		ConfigurationClass configClass = beanMethod.getConfigurationClass();
 		MethodMetadata metadata = beanMethod.getMetadata();
 
-		RootBeanDefinition beanDef = new ConfigurationClassBeanDefinition(configClass);
+		ConfigurationClassBeanDefinition beanDef = new ConfigurationClassBeanDefinition(configClass);
 		beanDef.setResource(configClass.getResource());
 		beanDef.setSource(this.sourceExtractor.extractSource(metadata, configClass.getResource()));
 		if (metadata.isStatic()) {
@@ -175,13 +171,13 @@ private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) {
 		beanDef.setAttribute(RequiredAnnotationBeanPostProcessor.SKIP_REQUIRED_CHECK_ATTRIBUTE, Boolean.TRUE);
 
 		// consider role
-		AnnotationAttributes role = attributesFor(metadata, Role.class);
+		AnnotationAttributes role = MetadataUtils.attributesFor(metadata, Role.class);
 		if (role != null) {
 			beanDef.setRole(role.<Integer>getNumber("value"));
 		}
 
 		// consider name and any aliases
-		AnnotationAttributes bean = attributesFor(metadata, Bean.class);
+		AnnotationAttributes bean = MetadataUtils.attributesFor(metadata, Bean.class);
 		List<String> names = new ArrayList<String>(Arrays.asList(bean.getStringArray("name")));
 		String beanName = (names.size() > 0 ? names.remove(0) : beanMethod.getMetadata().getMethodName());
 		for (String alias : names) {
@@ -190,9 +186,18 @@ private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) {
 
 		// has this already been overridden (e.g. via XML)?
 		if (this.registry.containsBeanDefinition(beanName)) {
-			BeanDefinition existingBeanDef = registry.getBeanDefinition(beanName);
-			// is the existing bean definition one that was created from a configuration class?
-			if (!(existingBeanDef instanceof ConfigurationClassBeanDefinition)) {
+			BeanDefinition existingBeanDef = this.registry.getBeanDefinition(beanName);
+			// Is the existing bean definition one that was created from a configuration class?
+			// -> allow the current bean method to override, since both are at second-pass level.
+			// However, if the bean method is an overloaded case on the same configuration class,
+			// preserve the existing bean definition.
+			if (existingBeanDef instanceof ConfigurationClassBeanDefinition) {
+				ConfigurationClassBeanDefinition ccbd = (ConfigurationClassBeanDefinition) existingBeanDef;
+				if (ccbd.getMetadata().getClassName().equals(beanMethod.getConfigurationClass().getMetadata().getClassName())) {
+					return;
+				}
+			}
+			else {
 				// no -> then it's an external override, probably XML
 				// overriding is legal, return immediately
 				if (logger.isDebugEnabled()) {
@@ -209,16 +214,16 @@ private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) {
 
 		// is this bean to be instantiated lazily?
 		if (metadata.isAnnotated(Lazy.class.getName())) {
-			AnnotationAttributes lazy = attributesFor(metadata, Lazy.class);
+			AnnotationAttributes lazy = MetadataUtils.attributesFor(metadata, Lazy.class);
 			beanDef.setLazyInit(lazy.getBoolean("value"));
 		}
 		else if (configClass.getMetadata().isAnnotated(Lazy.class.getName())){
-			AnnotationAttributes lazy = attributesFor(configClass.getMetadata(), Lazy.class);
+			AnnotationAttributes lazy = MetadataUtils.attributesFor(configClass.getMetadata(), Lazy.class);
 			beanDef.setLazyInit(lazy.getBoolean("value"));
 		}
 
 		if (metadata.isAnnotated(DependsOn.class.getName())) {
-			AnnotationAttributes dependsOn = attributesFor(metadata, DependsOn.class);
+			AnnotationAttributes dependsOn = MetadataUtils.attributesFor(metadata, DependsOn.class);
 			String[] otherBeans = dependsOn.getStringArray("value");
 			if (otherBeans.length > 0) {
 				beanDef.setDependsOn(otherBeans);
@@ -240,9 +245,9 @@ else if (configClass.getMetadata().isAnnotated(Lazy.class.getName())){
 			beanDef.setDestroyMethodName(destroyMethodName);
 		}
 
-		// consider scoping
+		// Consider scoping
 		ScopedProxyMode proxyMode = ScopedProxyMode.NO;
-		AnnotationAttributes scope = attributesFor(metadata, Scope.class);
+		AnnotationAttributes scope = MetadataUtils.attributesFor(metadata, Scope.class);
 		if (scope != null) {
 			beanDef.setScope(scope.getString("value"));
 			proxyMode = scope.getEnum("proxyMode");
@@ -251,7 +256,7 @@ else if (configClass.getMetadata().isAnnotated(Lazy.class.getName())){
 			}
 		}
 
-		// replace the original bean definition with the target one, if necessary
+		// Replace the original bean definition with the target one, if necessary
 		BeanDefinition beanDefToRegister = beanDef;
 		if (proxyMode != ScopedProxyMode.NO) {
 			BeanDefinitionHolder proxyDef = ScopedProxyCreator.createScopedProxy(
@@ -261,10 +266,11 @@ else if (configClass.getMetadata().isAnnotated(Lazy.class.getName())){
 		}
 
 		if (logger.isDebugEnabled()) {
-			logger.debug(String.format("Registering bean definition for @Bean method %s.%s()", configClass.getMetadata().getClassName(), beanName));
+			logger.debug(String.format("Registering bean definition for @Bean method %s.%s()",
+					configClass.getMetadata().getClassName(), beanName));
 		}
 
-		registry.registerBeanDefinition(beanName, beanDefToRegister);
+		this.registry.registerBeanDefinition(beanName, beanDefToRegister);
 	}
 
 
@@ -289,7 +295,8 @@ private void loadBeanDefinitionsFromImportedResources(
 					readerInstanceCache.put(readerClass, readerInstance);
 				}
 				catch (Exception ex) {
-					throw new IllegalStateException("Could not instantiate BeanDefinitionReader class [" + readerClass.getName() + "]");
+					throw new IllegalStateException(
+							"Could not instantiate BeanDefinitionReader class [" + readerClass.getName() + "]");
 				}
 			}
 			BeanDefinitionReader reader = readerInstanceCache.get(readerClass);
@@ -312,6 +319,7 @@ private static class ConfigurationClassBeanDefinition extends RootBeanDefinition
 
 		public ConfigurationClassBeanDefinition(ConfigurationClass configClass) {
 			this.annotationMetadata = configClass.getMetadata();
+			setLenientConstructorResolution(false);
 		}
 
 		public ConfigurationClassBeanDefinition(RootBeanDefinition original, ConfigurationClass configClass) {
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
index a74deefd07..fcc6818f15 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.support.SimpleInstantiationStrategy;
+import org.springframework.cglib.core.SpringNamingPolicy;
 import org.springframework.cglib.proxy.Callback;
 import org.springframework.cglib.proxy.CallbackFilter;
 import org.springframework.cglib.proxy.Enhancer;
@@ -39,8 +40,13 @@
 import org.springframework.util.Assert;
 
 /**
- * Enhances {@link Configuration} classes by generating a CGLIB subclass capable of
- * interacting with the Spring container to respect bean semantics.
+ * Enhances {@link Configuration} classes by generating a CGLIB subclass which
+ * interacts with the Spring container to respect bean scoping semantics for
+ * {@code @Bean} methods. Each such {@code @Bean} method will be overridden in
+ * the generated subclass, only delegating to the actual {@code @Bean} method
+ * implementation if the container actually requests the construction of a new
+ * instance. Otherwise, a call to such an {@code @Bean} method serves as a
+ * reference back to the container, obtaining the corresponding bean by name.
  *
  * @author Chris Beams
  * @author Juergen Hoeller
@@ -50,15 +56,15 @@
  */
 class ConfigurationClassEnhancer {
 
-	private static final Log logger = LogFactory.getLog(ConfigurationClassEnhancer.class);
-
-	private static final CallbackFilter CALLBACK_FILTER = new ConfigurationClassCallbackFilter();
-
 	private static final Callback DISPOSABLE_BEAN_METHOD_INTERCEPTOR = new DisposableBeanMethodInterceptor();
 
 	private static final Class<?>[] CALLBACK_TYPES =
 			{BeanMethodInterceptor.class, DisposableBeanMethodInterceptor.class, NoOp.class};
 
+	private static final CallbackFilter CALLBACK_FILTER = new ConfigurationClassCallbackFilter();
+
+	private static final Log logger = LogFactory.getLog(ConfigurationClassEnhancer.class);
+
 	private final Callback[] callbackInstances;
 
 
@@ -103,8 +109,9 @@ public Class<?> enhance(Class<?> configClass) {
 	private Enhancer newEnhancer(Class<?> superclass) {
 		Enhancer enhancer = new Enhancer();
 		enhancer.setSuperclass(superclass);
-		enhancer.setInterfaces(new Class[] {EnhancedConfiguration.class});
+		enhancer.setInterfaces(new Class<?>[] {EnhancedConfiguration.class});
 		enhancer.setUseFactory(false);
+		enhancer.setNamingPolicy(SpringNamingPolicy.INSTANCE);
 		enhancer.setCallbackFilter(CALLBACK_FILTER);
 		enhancer.setCallbackTypes(CALLBACK_TYPES);
 		return enhancer;
@@ -116,21 +123,21 @@ private Enhancer newEnhancer(Class<?> superclass) {
 	 */
 	private Class<?> createClass(Enhancer enhancer) {
 		Class<?> subclass = enhancer.createClass();
-		// registering callbacks statically (as opposed to threadlocal) is critical for usage in an OSGi env (SPR-5932)
+		// Registering callbacks statically (as opposed to thread-local)
+		// is critical for usage in an OSGi environment (SPR-5932)...
 		Enhancer.registerStaticCallbacks(subclass, this.callbackInstances);
 		return subclass;
 	}
 
 
-
 	/**
 	 * Marker interface to be implemented by all @Configuration CGLIB subclasses.
 	 * Facilitates idempotent behavior for {@link ConfigurationClassEnhancer#enhance(Class)}
 	 * through checking to see if candidate classes are already assignable to it, e.g.
 	 * have already been enhanced.
-	 * <p>Also extends {@link DisposableBean}, as all enhanced
-	 * {@code @Configuration} classes must de-register static CGLIB callbacks on
-	 * destruction, which is handled by the (private) {@code DisposableBeanMethodInterceptor}.
+	 * <p>Also extends {@link DisposableBean}, as all enhanced {@code @Configuration}
+	 * classes must de-register static CGLIB callbacks on destruction, which is handled
+	 * by the (private) {@code DisposableBeanMethodInterceptor}.
 	 * <p>Note that this interface is intended for framework-internal use only, however
 	 * must remain public in order to allow access to subclasses generated from other
 	 * packages (i.e. user code).
@@ -192,8 +199,8 @@ private static class DisposableBeanMethodInterceptor implements MethodIntercepto
 
 		public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable {
 			Enhancer.registerStaticCallbacks(obj.getClass(), null);
-			// does the actual (non-CGLIB) superclass actually implement DisposableBean?
-			// if so, call its dispose() method. If not, just exit.
+			// Does the actual (non-CGLIB) superclass actually implement DisposableBean?
+			// If so, call its dispose() method. If not, just exit.
 			if (DisposableBean.class.isAssignableFrom(obj.getClass().getSuperclass())) {
 				return proxy.invokeSuper(obj, args);
 			}
@@ -233,16 +240,15 @@ public BeanMethodInterceptor(ConfigurableBeanFactory beanFactory) {
 		/**
 		 * Enhance a {@link Bean @Bean} method to check the supplied BeanFactory for the
 		 * existence of this bean object.
-		 * @throws Throwable as a catch-all for any exception that may be thrown when
-		 * invoking the super implementation of the proxied method i.e., the actual
-		 * {@code @Bean} method.
+		 * @throws Throwable as a catch-all for any exception that may be thrown when invoking the
+		 * super implementation of the proxied method i.e., the actual {@code @Bean} method
 		 */
 		public Object intercept(Object enhancedConfigInstance, Method beanMethod, Object[] beanMethodArgs,
 					MethodProxy cglibMethodProxy) throws Throwable {
 
 			String beanName = BeanAnnotationHelper.determineBeanNameFor(beanMethod);
 
-			// determine whether this bean is a scoped-proxy
+			// Determine whether this bean is a scoped-proxy
 			Scope scope = AnnotationUtils.findAnnotation(beanMethod, Scope.class);
 			if (scope != null && scope.proxyMode() != ScopedProxyMode.NO) {
 				String scopedBeanName = ScopedProxyCreator.getTargetBeanName(beanName);
@@ -251,27 +257,27 @@ public Object intercept(Object enhancedConfigInstance, Method beanMethod, Object
 				}
 			}
 
-			// to handle the case of an inter-bean method reference, we must explicitly check the
-			// container for already cached instances
+			// To handle the case of an inter-bean method reference, we must explicitly check the
+			// container for already cached instances.
 
-			// first, check to see if the requested bean is a FactoryBean. If so, create a subclass
+			// First, check to see if the requested bean is a FactoryBean. If so, create a subclass
 			// proxy that intercepts calls to getObject() and returns any cached bean instance.
-			// this ensures that the semantics of calling a FactoryBean from within @Bean methods
+			// This ensures that the semantics of calling a FactoryBean from within @Bean methods
 			// is the same as that of referring to a FactoryBean within XML. See SPR-6602.
 			if (factoryContainsBean(BeanFactory.FACTORY_BEAN_PREFIX + beanName) && factoryContainsBean(beanName)) {
 				Object factoryBean = this.beanFactory.getBean(BeanFactory.FACTORY_BEAN_PREFIX + beanName);
 				if (factoryBean instanceof ScopedProxyFactoryBean) {
-					// pass through - scoped proxy factory beans are a special case and should not
+					// Pass through - scoped proxy factory beans are a special case and should not
 					// be further proxied
 				}
 				else {
-					// it is a candidate FactoryBean - go ahead with enhancement
+					// It is a candidate FactoryBean - go ahead with enhancement
 					return enhanceFactoryBean(factoryBean.getClass(), beanName);
 				}
 			}
 
 			if (isCurrentlyInvokedFactoryMethod(beanMethod) && !this.beanFactory.containsSingleton(beanName)) {
-				// the factory is calling the bean method in order to instantiate and register the bean
+				// The factory is calling the bean method in order to instantiate and register the bean
 				// (i.e. via a getBean() call) -> invoke the super implementation of the method to actually
 				// create the bean instance.
 				if (BeanFactoryPostProcessor.class.isAssignableFrom(beanMethod.getReturnType())) {
@@ -280,13 +286,13 @@ public Object intercept(Object enhancedConfigInstance, Method beanMethod, Object
 							"result in a failure to process annotations such as @Autowired, " +
 							"@Resource and @PostConstruct within the method's declaring " +
 							"@Configuration class. Add the 'static' modifier to this method to avoid " +
-							"these container lifecycle issues; see @Bean Javadoc for complete details",
+							"these container lifecycle issues; see @Bean javadoc for complete details",
 							beanMethod.getDeclaringClass().getSimpleName(), beanMethod.getName()));
 				}
 				return cglibMethodProxy.invokeSuper(enhancedConfigInstance, beanMethodArgs);
 			}
 			else {
-				// the user (i.e. not the factory) is requesting this bean through a
+				// The user (i.e. not the factory) is requesting this bean through a
 				// call to the bean method, direct or indirect. The bean may have already been
 				// marked as 'in creation' in certain autowiring scenarios; if so, temporarily
 				// set the in-creation status to false in order to avoid an exception.
@@ -303,7 +309,6 @@ public Object intercept(Object enhancedConfigInstance, Method beanMethod, Object
 					}
 				}
 			}
-
 		}
 
 		/**
@@ -354,7 +359,7 @@ private Object enhanceFactoryBean(Class<?> fbClass, String beanName) throws Inst
 			};
 			enhancer.setCallbackTypes(CALLBACK_TYPES);
 			Class<?> fbSubclass = enhancer.createClass();
-			Enhancer.registerCallbacks(fbSubclass, callbackInstances);
+			Enhancer.registerStaticCallbacks(fbSubclass, callbackInstances);
 			return fbSubclass.newInstance();
 		}
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
index c03aca61dd..74e2d435b8 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,12 @@
 package org.springframework.context.annotation;
 
 import java.io.IOException;
+import java.lang.annotation.Annotation;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
@@ -41,7 +42,9 @@
 import org.springframework.beans.factory.support.BeanDefinitionReader;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanNameGenerator;
+import org.springframework.context.EnvironmentAware;
 import org.springframework.context.ResourceLoaderAware;
+import org.springframework.core.NestedIOException;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.Environment;
@@ -54,11 +57,9 @@
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.filter.AssignableTypeFilter;
-import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import static org.springframework.context.annotation.MetadataUtils.*;
-
 /**
  * Parses a {@link Configuration} class definition, populating a collection of
  * {@link ConfigurationClass} objects (parsing a single Configuration class may result in
@@ -83,16 +84,6 @@ class ConfigurationClassParser {
 
 	private final ProblemReporter problemReporter;
 
-	private final ImportStack importStack = new ImportStack();
-
-	private final Set<String> knownSuperclasses = new LinkedHashSet<String>();
-
-	private final Set<ConfigurationClass> configurationClasses =
-		new LinkedHashSet<ConfigurationClass>();
-
-	private final Stack<PropertySource<?>> propertySources =
-		new Stack<PropertySource<?>>();
-
 	private final Environment environment;
 
 	private final ResourceLoader resourceLoader;
@@ -101,6 +92,14 @@ class ConfigurationClassParser {
 
 	private final ComponentScanAnnotationParser componentScanParser;
 
+	private final Set<ConfigurationClass> configurationClasses = new LinkedHashSet<ConfigurationClass>();
+
+	private final Map<String, ConfigurationClass> knownSuperclasses = new HashMap<String, ConfigurationClass>();
+
+	private final Stack<PropertySource<?>> propertySources = new Stack<PropertySource<?>>();
+
+	private final ImportStack importStack = new ImportStack();
+
 
 	/**
 	 * Create a new {@link ConfigurationClassParser} instance that will be used
@@ -149,77 +148,48 @@ protected void processConfigurationClass(ConfigurationClass configClass) throws
 			}
 		}
 
-		// recursively process the configuration class and its superclass hierarchy
-		do {
-			metadata = doProcessConfigurationClass(configClass, metadata);
-		}
-		while (metadata != null);
-
 		if (this.configurationClasses.contains(configClass) && configClass.getBeanName() != null) {
 			// Explicit bean definition found, probably replacing an import.
 			// Let's remove the old one and go with the new one.
 			this.configurationClasses.remove(configClass);
+			for (Iterator<ConfigurationClass> it = this.knownSuperclasses.values().iterator(); it.hasNext();) {
+				if (configClass.equals(it.next())) {
+					it.remove();
+				}
+			}
 		}
 
+		// Recursively process the configuration class and its superclass hierarchy.
+		do {
+			metadata = doProcessConfigurationClass(configClass, metadata);
+		}
+		while (metadata != null);
+
 		this.configurationClasses.add(configClass);
 	}
 
 	/**
-	 * @return annotation metadata of superclass, null if none found or previously processed
+	 * @return annotation metadata of superclass, {@code null} if none found or previously processed
 	 */
-	protected AnnotationMetadata doProcessConfigurationClass(
-			ConfigurationClass configClass, AnnotationMetadata metadata) throws IOException {
-
-		// recursively process any member (nested) classes first
-		for (String memberClassName : metadata.getMemberClassNames()) {
-			MetadataReader reader = this.metadataReaderFactory.getMetadataReader(memberClassName);
-			AnnotationMetadata memberClassMetadata = reader.getAnnotationMetadata();
-			if (ConfigurationClassUtils.isConfigurationCandidate(memberClassMetadata)) {
-				processConfigurationClass(new ConfigurationClass(reader, true));
-			}
-		}
+	protected AnnotationMetadata doProcessConfigurationClass(ConfigurationClass configClass, AnnotationMetadata metadata) throws IOException {
+		// Recursively process any member (nested) classes first
+		processMemberClasses(metadata);
 
-		// process any @PropertySource annotations
-		AnnotationAttributes propertySource =
-				attributesFor(metadata, org.springframework.context.annotation.PropertySource.class);
+		// Process any @PropertySource annotations
+		AnnotationAttributes propertySource = MetadataUtils.attributesFor(metadata,
+				org.springframework.context.annotation.PropertySource.class);
 		if (propertySource != null) {
-			String name = propertySource.getString("name");
-			String[] locations = propertySource.getStringArray("value");
-			int nLocations = locations.length;
-			if (nLocations == 0) {
-				throw new IllegalArgumentException("At least one @PropertySource(value) location is required");
-			}
-			for (int i = 0; i < nLocations; i++) {
-				locations[i] = this.environment.resolveRequiredPlaceholders(locations[i]);
-			}
-			ClassLoader classLoader = this.resourceLoader.getClassLoader();
-			if (!StringUtils.hasText(name)) {
-				for (String location : locations) {
-					this.propertySources.push(new ResourcePropertySource(location, classLoader));
-				}
-			}
-			else {
-				if (nLocations == 1) {
-					this.propertySources.push(new ResourcePropertySource(name, locations[0], classLoader));
-				}
-				else {
-					CompositePropertySource ps = new CompositePropertySource(name);
-					for (String location : locations) {
-						ps.addPropertySource(new ResourcePropertySource(location, classLoader));
-					}
-					this.propertySources.push(ps);
-				}
-			}
+			processPropertySource(propertySource);
 		}
 
-		// process any @ComponentScan annotions
-		AnnotationAttributes componentScan = attributesFor(metadata, ComponentScan.class);
+		// Process any @ComponentScan annotations
+		AnnotationAttributes componentScan = MetadataUtils.attributesFor(metadata, ComponentScan.class);
 		if (componentScan != null) {
-			// the config class is annotated with @ComponentScan -> perform the scan immediately
+			// The config class is annotated with @ComponentScan -> perform the scan immediately
 			Set<BeanDefinitionHolder> scannedBeanDefinitions =
 					this.componentScanParser.parse(componentScan, metadata.getClassName());
 
-			// check the set of scanned definitions for any further config classes and parse recursively if necessary
+			// Check the set of scanned definitions for any further config classes and parse recursively if necessary
 			for (BeanDefinitionHolder holder : scannedBeanDefinitions) {
 				if (ConfigurationClassUtils.checkConfigurationClassCandidate(holder.getBeanDefinition(), this.metadataReaderFactory)) {
 					this.parse(holder.getBeanDefinition().getBeanClassName(), holder.getBeanName());
@@ -227,47 +197,41 @@ protected AnnotationMetadata doProcessConfigurationClass(
 			}
 		}
 
-		// process any @Import annotations
-		Set<String> imports = getImports(metadata.getClassName(), null, new HashSet<String>());
-		if (!CollectionUtils.isEmpty(imports)) {
-			processImport(configClass, imports.toArray(new String[imports.size()]), true);
+		// Process any @Import annotations
+		Set<Object> imports = new LinkedHashSet<Object>();
+		Set<String> visited = new LinkedHashSet<String>();
+		collectImports(metadata, imports, visited);
+		if (!imports.isEmpty()) {
+			processImport(configClass, metadata, imports, true);
 		}
 
-		// process any @ImportResource annotations
+		// Process any @ImportResource annotations
 		if (metadata.isAnnotated(ImportResource.class.getName())) {
-			AnnotationAttributes importResource = attributesFor(metadata, ImportResource.class);
+			AnnotationAttributes importResource = MetadataUtils.attributesFor(metadata, ImportResource.class);
 			String[] resources = importResource.getStringArray("value");
 			Class<? extends BeanDefinitionReader> readerClass = importResource.getClass("reader");
 			for (String resource : resources) {
-				configClass.addImportedResource(resource, readerClass);
+				String resolvedResource = this.environment.resolveRequiredPlaceholders(resource);
+				configClass.addImportedResource(resolvedResource, readerClass);
 			}
 		}
 
-		// process individual @Bean methods
+		// Process individual @Bean methods
 		Set<MethodMetadata> beanMethods = metadata.getAnnotatedMethods(Bean.class.getName());
 		for (MethodMetadata methodMetadata : beanMethods) {
 			configClass.addBeanMethod(new BeanMethod(methodMetadata, configClass));
 		}
 
-		// process superclass, if any
+		// Process superclass, if any
 		if (metadata.hasSuperClass()) {
 			String superclass = metadata.getSuperClassName();
-			if (this.knownSuperclasses.add(superclass)) {
+			if (!superclass.startsWith("java") && !this.knownSuperclasses.containsKey(superclass)) {
+				this.knownSuperclasses.put(superclass, configClass);
 				// superclass found, return its annotation metadata and recurse
 				if (metadata instanceof StandardAnnotationMetadata) {
 					Class<?> clazz = ((StandardAnnotationMetadata) metadata).getIntrospectedClass();
 					return new StandardAnnotationMetadata(clazz.getSuperclass(), true);
 				}
-				else if (superclass.startsWith("java")) {
-					// never load core JDK classes via ASM, in particular not java.lang.Object!
-					try {
-						return new StandardAnnotationMetadata(
-								this.resourceLoader.getClassLoader().loadClass(superclass), true);
-					}
-					catch (ClassNotFoundException ex) {
-						throw new IllegalStateException(ex);
-					}
-				}
 				else {
 					MetadataReader reader = this.metadataReaderFactory.getMetadataReader(superclass);
 					return reader.getAnnotationMetadata();
@@ -275,10 +239,69 @@ else if (superclass.startsWith("java")) {
 			}
 		}
 
-		// no superclass, processing is complete
+		// No superclass -> processing is complete
 		return null;
 	}
 
+	/**
+	 * Register member (nested) classes that happen to be configuration classes themselves.
+	 * @param metadata the metadata representation of the containing class
+	 * @throws IOException if there is any problem reading metadata from a member class
+	 */
+	private void processMemberClasses(AnnotationMetadata metadata) throws IOException {
+		if (metadata instanceof StandardAnnotationMetadata) {
+			for (Class<?> memberClass : ((StandardAnnotationMetadata) metadata).getIntrospectedClass().getDeclaredClasses()) {
+				if (ConfigurationClassUtils.isConfigurationCandidate(new StandardAnnotationMetadata(memberClass))) {
+					processConfigurationClass(new ConfigurationClass(memberClass, true));
+				}
+			}
+		}
+		else {
+			for (String memberClassName : metadata.getMemberClassNames()) {
+				MetadataReader reader = this.metadataReaderFactory.getMetadataReader(memberClassName);
+				AnnotationMetadata memberClassMetadata = reader.getAnnotationMetadata();
+				if (ConfigurationClassUtils.isConfigurationCandidate(memberClassMetadata)) {
+					processConfigurationClass(new ConfigurationClass(reader, true));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Process the given <code>@PropertySource</code> annotation metadata.
+	 * @param propertySource metadata for the <code>@PropertySource</code> annotation found
+	 * @throws IOException if loading a property source failed
+	 */
+	private void processPropertySource(AnnotationAttributes propertySource) throws IOException {
+		String name = propertySource.getString("name");
+		String[] locations = propertySource.getStringArray("value");
+		int locationCount = locations.length;
+		if (locationCount == 0) {
+			throw new IllegalArgumentException("At least one @PropertySource(value) location is required");
+		}
+		for (int i = 0; i < locationCount; i++) {
+			locations[i] = this.environment.resolveRequiredPlaceholders(locations[i]);
+		}
+		ClassLoader classLoader = this.resourceLoader.getClassLoader();
+		if (!StringUtils.hasText(name)) {
+			for (String location : locations) {
+				this.propertySources.push(new ResourcePropertySource(location, classLoader));
+			}
+		}
+		else {
+			if (locationCount == 1) {
+				this.propertySources.push(new ResourcePropertySource(name, locations[0], classLoader));
+			}
+			else {
+				CompositePropertySource ps = new CompositePropertySource(name);
+				for (int i = locations.length - 1; i >= 0; i--) {
+					ps.addPropertySource(new ResourcePropertySource(locations[i], classLoader));
+				}
+				this.propertySources.push(ps);
+			}
+		}
+	}
+
 	/**
 	 * Recursively collect all declared {@code @Import} values. Unlike most
 	 * meta-annotations it is valid to have several {@code @Import}s declared with
@@ -287,78 +310,136 @@ else if (superclass.startsWith("java")) {
 	 * <p>For example, it is common for a {@code @Configuration} class to declare direct
 	 * {@code @Import}s in addition to meta-imports originating from an {@code @Enable}
 	 * annotation.
-	 * @param className the class name to search
-	 * @param imports the imports collected so far or {@code null}
-	 * @param visited used to track visited classes to prevent infinite recursion (must not be null)
-	 * @return a set of all {@link Import#value() import values} or {@code null}
+	 * @param metadata the metadata representation of the class to search
+	 * @param imports the imports collected so far
+	 * @param visited used to track visited classes to prevent infinite recursion
 	 * @throws IOException if there is any problem reading metadata from the named class
 	 */
-	private Set<String> getImports(String className, Set<String> imports, Set<String> visited) throws IOException {
-		if (visited.add(className) && !className.startsWith("java")) {
-			AnnotationMetadata metadata = metadataReaderFactory.getMetadataReader(className).getAnnotationMetadata();
-			for (String annotationType : metadata.getAnnotationTypes()) {
-				imports = getImports(annotationType, imports, visited);
+	private void collectImports(AnnotationMetadata metadata, Set<Object> imports, Set<String> visited) throws IOException {
+		String className = metadata.getClassName();
+		if (visited.add(className)) {
+			if (metadata instanceof StandardAnnotationMetadata) {
+				StandardAnnotationMetadata stdMetadata = (StandardAnnotationMetadata) metadata;
+				for (Annotation ann : stdMetadata.getIntrospectedClass().getAnnotations()) {
+					if (!ann.annotationType().getName().startsWith("java") && !(ann instanceof Import)) {
+						collectImports(new StandardAnnotationMetadata(ann.annotationType()), imports, visited);
+					}
+				}
+				Map<String, Object> attributes = stdMetadata.getAnnotationAttributes(Import.class.getName(), false);
+				if (attributes != null) {
+					Class<?>[] value = (Class<?>[]) attributes.get("value");
+					if (!ObjectUtils.isEmpty(value)) {
+						for (Class<?> importedClass : value) {
+							// Catch duplicate from ASM-based parsing...
+							imports.remove(importedClass.getName());
+							imports.add(importedClass);
+						}
+					}
+				}
 			}
-			Map<String, Object> attributes = metadata.getAnnotationAttributes(Import.class.getName(), true);
-			if (attributes != null) {
-				String[] value = (String[]) attributes.get("value");
-				if (value != null && value.length > 0) {
-					imports = (imports == null ? new LinkedHashSet<String>() : imports);
-					imports.addAll(Arrays.asList(value));
+			else {
+				for (String annotationType : metadata.getAnnotationTypes()) {
+					if (!className.startsWith("java") && !className.equals(Import.class.getName())) {
+						try {
+							collectImports(
+									new StandardAnnotationMetadata(this.resourceLoader.getClassLoader().loadClass(annotationType)),
+									imports, visited);
+						}
+						catch (ClassNotFoundException ex) {
+							// Silently ignore...
+						}
+					}
+				}
+				Map<String, Object> attributes = metadata.getAnnotationAttributes(Import.class.getName(), true);
+				if (attributes != null) {
+					String[] value = (String[]) attributes.get("value");
+					if (!ObjectUtils.isEmpty(value)) {
+						for (String importedClassName : value) {
+							// Catch duplicate from reflection-based parsing...
+							boolean alreadyThereAsClass = false;
+							for (Object existingImport : imports) {
+								if (existingImport instanceof Class &&
+										((Class<?>) existingImport).getName().equals(importedClassName)) {
+									alreadyThereAsClass = true;
+								}
+							}
+							if (!alreadyThereAsClass) {
+								imports.add(importedClassName);
+							}
+						}
+					}
 				}
 			}
 		}
-		return imports;
 	}
 
-	private void processImport(ConfigurationClass configClass, String[] classesToImport, boolean checkForCircularImports) throws IOException {
+	private void processImport(ConfigurationClass configClass, AnnotationMetadata metadata,
+			Collection<?> classesToImport, boolean checkForCircularImports) throws IOException {
+
 		if (checkForCircularImports && this.importStack.contains(configClass)) {
 			this.problemReporter.error(new CircularImportProblem(configClass, this.importStack, configClass.getMetadata()));
 		}
 		else {
 			this.importStack.push(configClass);
-			AnnotationMetadata importingClassMetadata = configClass.getMetadata();
-			for (String candidate : classesToImport) {
-				MetadataReader reader = this.metadataReaderFactory.getMetadataReader(candidate);
-				if (new AssignableTypeFilter(ImportSelector.class).match(reader, this.metadataReaderFactory)) {
-					// the candidate class is an ImportSelector -> delegate to it to determine imports
-					try {
-						ImportSelector selector = BeanUtils.instantiateClass(
-								this.resourceLoader.getClassLoader().loadClass(candidate), ImportSelector.class);
-						processImport(configClass, selector.selectImports(importingClassMetadata), false);
-					}
-					catch (ClassNotFoundException ex) {
-						throw new IllegalStateException(ex);
+			try {
+				for (Object candidate : classesToImport) {
+					Object candidateToCheck = (candidate instanceof Class ? (Class) candidate :
+							this.metadataReaderFactory.getMetadataReader((String) candidate));
+					if (checkAssignability(ImportSelector.class, candidateToCheck)) {
+						// Candidate class is an ImportSelector -> delegate to it to determine imports
+						Class<?> candidateClass = (candidate instanceof Class ? (Class) candidate :
+								this.resourceLoader.getClassLoader().loadClass((String) candidate));
+						ImportSelector selector = BeanUtils.instantiateClass(candidateClass, ImportSelector.class);
+						processImport(configClass, metadata, Arrays.asList(selector.selectImports(metadata)), false);
 					}
-				}
-				else if (new AssignableTypeFilter(ImportBeanDefinitionRegistrar.class).match(reader, this.metadataReaderFactory)) {
-					// the candidate class is an ImportBeanDefinitionRegistrar -> delegate to it to register additional bean definitions
-					try {
-						ImportBeanDefinitionRegistrar registrar = BeanUtils.instantiateClass(
-								this.resourceLoader.getClassLoader().loadClass(candidate), ImportBeanDefinitionRegistrar.class);
+					else if (checkAssignability(ImportBeanDefinitionRegistrar.class, candidateToCheck)) {
+						// Candidate class is an ImportBeanDefinitionRegistrar ->
+						// delegate to it to register additional bean definitions
+						Class<?> candidateClass = (candidate instanceof Class ? (Class) candidate :
+								this.resourceLoader.getClassLoader().loadClass((String) candidate));
+						ImportBeanDefinitionRegistrar registrar =
+								BeanUtils.instantiateClass(candidateClass, ImportBeanDefinitionRegistrar.class);
 						invokeAwareMethods(registrar);
-						registrar.registerBeanDefinitions(importingClassMetadata, registry);
+						registrar.registerBeanDefinitions(metadata, this.registry);
 					}
-					catch (ClassNotFoundException ex) {
-						throw new IllegalStateException(ex);
+					else {
+						// Candidate class not an ImportSelector or ImportBeanDefinitionRegistrar ->
+						// process it as a @Configuration class
+						this.importStack.registerImport(metadata,
+								(candidate instanceof Class ? ((Class) candidate).getName() : (String) candidate));
+						processConfigurationClass(candidateToCheck instanceof Class ?
+								new ConfigurationClass((Class) candidateToCheck, true) :
+								new ConfigurationClass((MetadataReader) candidateToCheck, true));
 					}
 				}
-				else {
-					// the candidate class not an ImportSelector or ImportBeanDefinitionRegistrar -> process it as a @Configuration class
-					this.importStack.registerImport(importingClassMetadata.getClassName(), candidate);
-					processConfigurationClass(new ConfigurationClass(reader, true));
-				}
 			}
-			this.importStack.pop();
+			catch (ClassNotFoundException ex) {
+				throw new NestedIOException("Failed to load import candidate class", ex);
+			}
+			finally {
+				this.importStack.pop();
+			}
+		}
+	}
+
+	private boolean checkAssignability(Class<?> clazz, Object candidate) throws IOException {
+		if (candidate instanceof Class) {
+			return clazz.isAssignableFrom((Class) candidate);
+		}
+		else {
+			return new AssignableTypeFilter(clazz).match((MetadataReader) candidate, this.metadataReaderFactory);
 		}
 	}
 
 	/**
-	 * Invoke {@link ResourceLoaderAware}, {@link BeanClassLoaderAware} and
-	 * {@link BeanFactoryAware} contracts if implemented by the given {@code registrar}.
+	 * Invoke {@link EnvironmentAware}, {@link ResourceLoaderAware}, {@link BeanClassLoaderAware}
+	 * and {@link BeanFactoryAware} contracts if implemented by the given {@code registrar}.
 	 */
 	private void invokeAwareMethods(ImportBeanDefinitionRegistrar registrar) {
 		if (registrar instanceof Aware) {
+			if (registrar instanceof EnvironmentAware) {
+				((EnvironmentAware) registrar).setEnvironment(this.environment);
+			}
 			if (registrar instanceof ResourceLoaderAware) {
 				((ResourceLoaderAware) registrar).setResourceLoader(this.resourceLoader);
 			}
@@ -393,27 +474,27 @@ public Stack<PropertySource<?>> getPropertySources() {
 		return this.propertySources;
 	}
 
-	public ImportRegistry getImportRegistry() {
+	ImportRegistry getImportRegistry() {
 		return this.importStack;
 	}
 
 
 	interface ImportRegistry {
 
-		String getImportingClassFor(String importedClass);
+		AnnotationMetadata getImportingClassFor(String importedClass);
 	}
 
 
 	@SuppressWarnings("serial")
 	private static class ImportStack extends Stack<ConfigurationClass> implements ImportRegistry {
 
-		private final Map<String, String> imports = new HashMap<String, String>();
+		private final Map<String, AnnotationMetadata> imports = new HashMap<String, AnnotationMetadata>();
 
-		public void registerImport(String importingClass, String importedClass) {
+		public void registerImport(AnnotationMetadata importingClass, String importedClass) {
 			this.imports.put(importedClass, importingClass);
 		}
 
-		public String getImportingClassFor(String importedClass) {
+		public AnnotationMetadata getImportingClassFor(String importedClass) {
 			return this.imports.get(importedClass);
 		}
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
index 7afbc02733..dac68b997a 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.BeanFactory;
@@ -61,7 +60,6 @@
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -85,7 +83,7 @@
  * @since 3.0
  */
 public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPostProcessor,
-		ResourceLoaderAware, BeanClassLoaderAware, EnvironmentAware {
+		Ordered, ResourceLoaderAware, BeanClassLoaderAware, EnvironmentAware {
 
 	private static final String IMPORT_AWARE_PROCESSOR_BEAN_NAME =
 			ConfigurationClassPostProcessor.class.getName() + ".importAwareProcessor";
@@ -130,6 +128,10 @@ protected String buildDefaultBeanName(BeanDefinition definition) {
 	};
 
 
+	public int getOrder() {
+		return Ordered.HIGHEST_PRECEDENCE;
+	}
+
 	/**
 	 * Set the {@link SourceExtractor} to use for generated bean definitions
 	 * that correspond to {@link Bean} factory methods.
@@ -233,8 +235,8 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 			throw new IllegalStateException(
 					"postProcessBeanFactory already called for this post-processor against " + beanFactory);
 		}
-		this.factoriesPostProcessed.add((factoryId));
-		if (!this.registriesPostProcessed.contains((factoryId))) {
+		this.factoriesPostProcessed.add(factoryId);
+		if (!this.registriesPostProcessed.contains(factoryId)) {
 			// BeanDefinitionRegistryPostProcessor hook apparently not supported...
 			// Simply call processConfigurationClasses lazily at this point then.
 			processConfigBeanDefinitions((BeanDefinitionRegistry) beanFactory);
@@ -369,43 +371,33 @@ public void enhanceConfigurationClasses(ConfigurableListableBeanFactory beanFact
 	}
 
 
-	private static class ImportAwareBeanPostProcessor implements PriorityOrdered, BeanFactoryAware, BeanPostProcessor {
+	private static class ImportAwareBeanPostProcessor implements BeanPostProcessor, BeanFactoryAware, PriorityOrdered {
 
 		private BeanFactory beanFactory;
 
-		public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+		public void setBeanFactory(BeanFactory beanFactory) {
 			this.beanFactory = beanFactory;
 		}
 
-		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+		public int getOrder() {
+			return Ordered.HIGHEST_PRECEDENCE;
+		}
+
+		@Override
+		public Object postProcessBeforeInitialization(Object bean, String beanName)  {
 			if (bean instanceof ImportAware) {
 				ImportRegistry importRegistry = this.beanFactory.getBean(IMPORT_REGISTRY_BEAN_NAME, ImportRegistry.class);
-				String importingClass = importRegistry.getImportingClassFor(bean.getClass().getSuperclass().getName());
+				AnnotationMetadata importingClass = importRegistry.getImportingClassFor(bean.getClass().getSuperclass().getName());
 				if (importingClass != null) {
-					try {
-						AnnotationMetadata metadata =
-								new SimpleMetadataReaderFactory().getMetadataReader(importingClass).getAnnotationMetadata();
-						((ImportAware) bean).setImportMetadata(metadata);
-					}
-					catch (IOException ex) {
-						// should never occur -> at this point we know the class is present anyway
-						throw new IllegalStateException(ex);
-					}
-				}
-				else {
-					// no importing class was found
+					((ImportAware) bean).setImportMetadata(importingClass);
 				}
 			}
 			return bean;
 		}
 
-		public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+		public Object postProcessAfterInitialization(Object bean, String beanName) {
 			return bean;
 		}
-
-		public int getOrder() {
-			return Ordered.HIGHEST_PRECEDENCE;
-		}
 	}
 
 }
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java
index 645203933a..de6d7760be 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.core.Conventions;
@@ -37,14 +38,14 @@
  */
 abstract class ConfigurationClassUtils {
 
-	private static final Log logger = LogFactory.getLog(ConfigurationClassUtils.class);
-
 	private static final String CONFIGURATION_CLASS_FULL = "full";
 
 	private static final String CONFIGURATION_CLASS_LITE = "lite";
 
 	private static final String CONFIGURATION_CLASS_ATTRIBUTE =
-		Conventions.getQualifiedAttributeName(ConfigurationClassPostProcessor.class, "configurationClass");
+			Conventions.getQualifiedAttributeName(ConfigurationClassPostProcessor.class, "configurationClass");
+
+	private static final Log logger = LogFactory.getLog(ConfigurationClassUtils.class);
 
 
 	/**
@@ -92,23 +93,45 @@ else if (isLiteConfigurationCandidate(metadata)) {
 		return false;
 	}
 
+	/**
+	 * Check the given metadata for a configuration class candidate
+	 * (or nested component class declared within a configuration/component class).
+	 * @param metadata the metadata of the annotated class
+	 * @return {@code true} if the given class is to be registered as a
+	 * reflection-detected bean definition; {@code false} otherwise
+	 */
 	public static boolean isConfigurationCandidate(AnnotationMetadata metadata) {
-		return isFullConfigurationCandidate(metadata) || isLiteConfigurationCandidate(metadata);
+		return (isFullConfigurationCandidate(metadata) || isLiteConfigurationCandidate(metadata));
 	}
 
+	/**
+	 * Check the given metadata for a full configuration class candidate
+	 * (i.e. a class annotated with {@code @Configuration}).
+	 * @param metadata the metadata of the annotated class
+	 * @return {@code true} if the given class is to be processed as a full
+	 * configuration class, including cross-method call interception
+	 */
 	public static boolean isFullConfigurationCandidate(AnnotationMetadata metadata) {
 		return metadata.isAnnotated(Configuration.class.getName());
 	}
 
+	/**
+	 * Check the given metadata for a lite configuration class candidate
+	 * (e.g. a class annotated with {@code @Component} or just having
+	 * {@code @Bean methods}).
+	 * @param metadata the metadata of the annotated class
+	 * @return {@code true} if the given class is to be processed as a lite
+	 * configuration class, just registering it and scanning it for {@code @Bean} methods
+	 */
 	public static boolean isLiteConfigurationCandidate(AnnotationMetadata metadata) {
-		return !metadata.isInterface() && // not an interface or an annotation
-				(metadata.isAnnotated(Component.class.getName()) ||
-				metadata.hasAnnotatedMethods(Bean.class.getName()));
+		// Do not consider an interface or an annotation...
+		return (!metadata.isInterface() && (
+				metadata.isAnnotated(Component.class.getName()) || metadata.hasAnnotatedMethods(Bean.class.getName())));
 	}
 
-
 	/**
-	 * Determine whether the given bean definition indicates a full @Configuration class.
+	 * Determine whether the given bean definition indicates a full
+	 * {@code @Configuration} class.
 	 */
 	public static boolean isFullConfigurationClass(BeanDefinition beanDef) {
 		return CONFIGURATION_CLASS_FULL.equals(beanDef.getAttribute(CONFIGURATION_CLASS_ATTRIBUTE));
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationMethod.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationMethod.java
index 624be36d0d..b359be7d64 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationMethod.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@ public ConfigurationMethod(MethodMetadata metadata, ConfigurationClass configura
 		this.configurationClass = configurationClass;
 	}
 
+
 	public MethodMetadata getMetadata() {
 		return this.metadata;
 	}
@@ -48,13 +49,22 @@ public Location getResourceLocation() {
 		return new Location(this.configurationClass.getResource(), this.metadata);
 	}
 
+	String getFullyQualifiedMethodName() {
+		return this.metadata.getDeclaringClassName() + "#" + this.metadata.getMethodName();
+	}
+
+	static String getShortMethodName(String fullyQualifiedMethodName) {
+		return fullyQualifiedMethodName.substring(fullyQualifiedMethodName.indexOf('#') + 1);
+	}
+
 	public void validate(ProblemReporter problemReporter) {
 	}
 
+
 	@Override
 	public String toString() {
 		return String.format("[%s:name=%s,declaringClass=%s]",
-				this.getClass().getSimpleName(), this.getMetadata().getMethodName(), this.getMetadata().getDeclaringClassName());
+				getClass().getSimpleName(), getMetadata().getMethodName(), getMetadata().getDeclaringClassName());
 	}
 
 }
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java b/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java
index 26bd302d8e..746424007d 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.springframework.context.annotation;
 
-import org.springframework.core.type.filter.AssignableTypeFilter;
-
-
 /**
  * Enumeration of the type filters that may be used in conjunction with
  * {@link ComponentScan @ComponentScan}.
@@ -42,12 +39,12 @@ public enum FilterType {
 
 	/**
 	 * Filter candidates assignable to a given type.
-	 * @see AssignableTypeFilter
+	 * @see org.springframework.core.type.filter.AssignableTypeFilter
 	 */
 	ASSIGNABLE_TYPE,
 
 	/** Filter candidates using a given custom
-	 * {@link org.springframework.core.type.filter.TypeFilter} implementation
+	 * {@link org.springframework.core.type.filter.TypeFilter} implementation.
 	 */
 	CUSTOM
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java b/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java
index d81821b703..50d3ae81f7 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,16 +26,15 @@
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.instrument.classloading.LoadTimeWeaver;
-import org.springframework.util.Assert;
 
 import static org.springframework.context.weaving.AspectJWeavingEnabler.*;
 
 /**
  * {@code @Configuration} class that registers a {@link LoadTimeWeaver} bean.
  *
- * <p>This configuration class is automatically imported when using the @{@link
- * EnableLoadTimeWeaving} annotation.  See {@code @EnableLoadTimeWeaving} Javadoc for
- * complete usage details.
+ * <p>This configuration class is automatically imported when using the
+ * {@link EnableLoadTimeWeaving} annotation. See {@code @EnableLoadTimeWeaving}
+ * javadoc for complete usage details.
  *
  * @author Chris Beams
  * @since 3.1
@@ -47,28 +46,31 @@ public class LoadTimeWeavingConfiguration implements ImportAware, BeanClassLoade
 
 	private AnnotationAttributes enableLTW;
 
-	@Autowired(required=false)
+	@Autowired(required = false)
 	private LoadTimeWeavingConfigurer ltwConfigurer;
 
 	private ClassLoader beanClassLoader;
 
+
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		this.enableLTW = MetadataUtils.attributesFor(importMetadata, EnableLoadTimeWeaving.class);
-		Assert.notNull(this.enableLTW,
-				"@EnableLoadTimeWeaving is not present on importing class " +
-				importMetadata.getClassName());
+		if (this.enableLTW == null) {
+			throw new IllegalArgumentException(
+					"@EnableLoadTimeWeaving is not present on importing class " + importMetadata.getClassName());
+		}
 	}
 
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
 
-	@Bean(name=ConfigurableApplicationContext.LOAD_TIME_WEAVER_BEAN_NAME)
+
+	@Bean(name = ConfigurableApplicationContext.LOAD_TIME_WEAVER_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public LoadTimeWeaver loadTimeWeaver() {
 		LoadTimeWeaver loadTimeWeaver = null;
 
-		if (ltwConfigurer != null) {
+		if (this.ltwConfigurer != null) {
 			// the user has provided a custom LTW instance
 			loadTimeWeaver = ltwConfigurer.getLoadTimeWeaver();
 		}
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java b/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java
index f9d38ecefd..223729cd19 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,29 +17,27 @@
 package org.springframework.context.annotation;
 
 import java.util.Map;
-
 import javax.management.MBeanServer;
+import javax.naming.NamingException;
 
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.jmx.MBeanServerNotFoundException;
 import org.springframework.jmx.export.annotation.AnnotationMBeanExporter;
 import org.springframework.jmx.support.RegistrationPolicy;
 import org.springframework.jmx.support.WebSphereMBeanServerFactoryBean;
-import org.springframework.jndi.JndiObjectFactoryBean;
-import org.springframework.util.Assert;
+import org.springframework.jndi.JndiLocatorDelegate;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
  * {@code @Configuration} class that registers a {@link AnnotationMBeanExporter} bean.
  *
- * <p>This configuration class is automatically imported when using the @{@link
- * EnableMBeanExport} annotation. See its Javadoc for complete usage details.
+ * <p>This configuration class is automatically imported when using the
+ * {@link EnableMBeanExport} annotation. See its javadoc for complete usage details.
  *
  * @author Phillip Webb
  * @author Chris Beams
@@ -51,23 +49,26 @@ public class MBeanExportConfiguration implements ImportAware, BeanFactoryAware {
 
 	private static final String MBEAN_EXPORTER_BEAN_NAME = "mbeanExporter";
 
-	private AnnotationAttributes attributes;
+	private AnnotationAttributes enableMBeanExport;
 
 	private BeanFactory beanFactory;
 
 
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		Map<String, Object> map = importMetadata.getAnnotationAttributes(EnableMBeanExport.class.getName());
-		this.attributes = AnnotationAttributes.fromMap(map);
-		Assert.notNull(this.attributes, "@EnableMBeanExport is not present on " +
-				"importing class " + importMetadata.getClassName());
+		this.enableMBeanExport = AnnotationAttributes.fromMap(map);
+		if (this.enableMBeanExport == null) {
+			throw new IllegalArgumentException(
+					"@EnableMBeanExport is not present on importing class " + importMetadata.getClassName());
+		}
 	}
 
-	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
-	@Bean(name=MBEAN_EXPORTER_BEAN_NAME)
+
+	@Bean(name = MBEAN_EXPORTER_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public AnnotationMBeanExporter mbeanExporter() {
 		AnnotationMBeanExporter exporter = new AnnotationMBeanExporter();
@@ -78,46 +79,51 @@ public AnnotationMBeanExporter mbeanExporter() {
 	}
 
 	private void setupDomain(AnnotationMBeanExporter exporter) {
-		String defaultDomain = this.attributes.getString("defaultDomain");
+		String defaultDomain = this.enableMBeanExport.getString("defaultDomain");
 		if (StringUtils.hasText(defaultDomain)) {
 			exporter.setDefaultDomain(defaultDomain);
 		}
 	}
 
 	private void setupServer(AnnotationMBeanExporter exporter) {
-		String server = this.attributes.getString("server");
+		String server = this.enableMBeanExport.getString("server");
 		if (StringUtils.hasText(server)) {
 			exporter.setServer(this.beanFactory.getBean(server, MBeanServer.class));
 		}
 		else {
 			SpecificPlatform specificPlatform = SpecificPlatform.get();
-			if(specificPlatform != null) {
+			if (specificPlatform != null) {
 				exporter.setServer(specificPlatform.getMBeanServer());
 			}
 		}
 	}
 
 	private void setupRegistrationPolicy(AnnotationMBeanExporter exporter) {
-		RegistrationPolicy registrationPolicy = this.attributes.getEnum("registration");
+		RegistrationPolicy registrationPolicy = this.enableMBeanExport.getEnum("registration");
 		exporter.setRegistrationPolicy(registrationPolicy);
 	}
 
 
-	private static enum SpecificPlatform {
+	public static enum SpecificPlatform {
 
 		WEBLOGIC("weblogic.management.Helper") {
 			@Override
-			public FactoryBean<?> getMBeanServerFactory() {
-				JndiObjectFactoryBean factory = new JndiObjectFactoryBean();
-				factory.setJndiName("java:comp/env/jmx/runtime");
-				return factory;
+			public MBeanServer getMBeanServer() {
+				try {
+					return new JndiLocatorDelegate().lookup("java:comp/env/jmx/runtime", MBeanServer.class);
+				}
+				catch (NamingException ex) {
+					throw new MBeanServerNotFoundException("Failed to retrieve WebLogic MBeanServer from JNDI", ex);
+				}
 			}
 		},
 
 		WEBSPHERE("com.ibm.websphere.management.AdminServiceFactory") {
 			@Override
-			public FactoryBean<MBeanServer> getMBeanServerFactory() {
-				return new WebSphereMBeanServerFactoryBean();
+			public MBeanServer getMBeanServer() {
+				WebSphereMBeanServerFactoryBean fb = new WebSphereMBeanServerFactoryBean();
+				fb.afterPropertiesSet();
+				return fb.getObject();
 			}
 		};
 
@@ -127,27 +133,17 @@ private SpecificPlatform(String identifyingClass) {
 			this.identifyingClass = identifyingClass;
 		}
 
-		public MBeanServer getMBeanServer() {
-			Object server;
-			try {
-				server = getMBeanServerFactory().getObject();
-				Assert.isInstanceOf(MBeanServer.class, server);
-				return (MBeanServer) server;
-			} catch (Exception ex) {
-				throw new IllegalStateException(ex);
-			}
-		}
-
-		protected abstract FactoryBean<?> getMBeanServerFactory();
+		public abstract MBeanServer getMBeanServer();
 
 		public static SpecificPlatform get() {
 			ClassLoader classLoader = MBeanExportConfiguration.class.getClassLoader();
 			for (SpecificPlatform environment : values()) {
-				if(ClassUtils.isPresent(environment.identifyingClass, classLoader)) {
+				if (ClassUtils.isPresent(environment.identifyingClass, classLoader)) {
 					return environment;
 				}
 			}
 			return null;
 		}
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Profile.java b/spring-context/src/main/java/org/springframework/context/annotation/Profile.java
index ab793599c0..4d9c603910 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Profile.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Profile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.context.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -44,11 +45,11 @@
  *
  * <p>If a {@code @Configuration} class is marked with {@code @Profile}, all of the
  * {@code @Bean} methods and {@link Import @Import} annotations associated with that class
- * will be bypassed unless one or more the specified profiles are active. This is very
+ * will be bypassed unless one or more of the specified profiles are active. This is very
  * similar to the behavior in Spring XML: if the {@code profile} attribute of the
  * {@code beans} element is supplied e.g., {@code <beans profile="p1,p2">}, the
  * {@code beans} element will not be parsed unless profiles 'p1' and/or 'p2' have been
- * activated.  Likewise, if a {@code @Component} or {@code @Configuration} class is marked
+ * activated. Likewise, if a {@code @Component} or {@code @Configuration} class is marked
  * with {@code @Profile({"p1", "p2"})}, that class will not be registered/processed unless
  * profiles 'p1' and/or 'p2' have been activated.
  *
@@ -73,10 +74,11 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Documented
 public @interface Profile {
 
 	/**
-	 * The set of profiles for which this component should be registered.
+	 * The set of profiles for which the annotated component should be registered.
 	 */
 	String[] value();
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Role.java b/spring-context/src/main/java/org/springframework/context/annotation/Role.java
index 3abdca32b1..f8dc81ca6d 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Role.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Role.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,16 +28,16 @@
  * Indicates the 'role' hint for a given bean.
  *
  * <p>May be used on any class directly or indirectly annotated with
- * {@link org.springframework.stereotype.Component} or on methods annotated with
- * {@link Bean}.
+ * {@link org.springframework.stereotype.Component} or on methods
+ * annotated with {@link Bean}.
  *
- * <p>If this annotation is not present on a Component or Bean definition, the
- * default value of {@link BeanDefinition#ROLE_APPLICATION} will apply.
+ * <p>If this annotation is not present on a Component or Bean definition,
+ * the default value of {@link BeanDefinition#ROLE_APPLICATION} will apply.
  *
- * <p>If Role is present on a {@link Configuration @Configuration} class, this
- * indicates the role of the configuration class bean definition and does not
- * cascade to all @{@code Bean} methods defined within.  This behavior is
- * different than that of the @{@link Lazy} annotation, for example.
+ * <p>If Role is present on a {@link Configuration @Configuration} class,
+ * this indicates the role of the configuration class bean definition and
+ * does not cascade to all @{@code Bean} methods defined within. This behavior
+ * is different than that of the @{@link Lazy} annotation, for example.
  *
  * @author Chris Beams
  * @since 3.1
diff --git a/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
index 055b5e59db..2957f98f4d 100644
--- a/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
+++ b/spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,11 +23,16 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.beans.factory.support.AbstractBeanFactory;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.OrderComparator;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Abstract implementation of the {@link ApplicationEventMulticaster} interface,
@@ -48,64 +53,80 @@
  * @see #getApplicationListeners(ApplicationEvent)
  * @see SimpleApplicationEventMulticaster
  */
-public abstract class AbstractApplicationEventMulticaster implements ApplicationEventMulticaster, BeanFactoryAware {
+public abstract class AbstractApplicationEventMulticaster
+		implements ApplicationEventMulticaster, BeanClassLoaderAware, BeanFactoryAware {
 
 	private final ListenerRetriever defaultRetriever = new ListenerRetriever(false);
 
 	private final Map<ListenerCacheKey, ListenerRetriever> retrieverCache =
 			new ConcurrentHashMap<ListenerCacheKey, ListenerRetriever>(64);
 
+	private ClassLoader beanClassLoader;
+
 	private BeanFactory beanFactory;
 
+	private Object retrievalMutex = this.defaultRetriever;
+
+
+	public void setBeanClassLoader(ClassLoader classLoader) {
+		this.beanClassLoader = classLoader;
+	}
+
+	public void setBeanFactory(BeanFactory beanFactory) {
+		this.beanFactory = beanFactory;
+		if (this.beanClassLoader == null && beanFactory instanceof ConfigurableBeanFactory) {
+			this.beanClassLoader = ((ConfigurableBeanFactory) beanFactory).getBeanClassLoader();
+		}
+		if (beanFactory instanceof AbstractBeanFactory) {
+			this.retrievalMutex = ((AbstractBeanFactory) beanFactory).getSingletonMutex();
+		}
+	}
+
+	private BeanFactory getBeanFactory() {
+		if (this.beanFactory == null) {
+			throw new IllegalStateException("ApplicationEventMulticaster cannot retrieve listener beans " +
+					"because it is not associated with a BeanFactory");
+		}
+		return this.beanFactory;
+	}
+
 
 	public void addApplicationListener(ApplicationListener listener) {
-		synchronized (this.defaultRetriever) {
+		synchronized (this.retrievalMutex) {
 			this.defaultRetriever.applicationListeners.add(listener);
 			this.retrieverCache.clear();
 		}
 	}
 
 	public void addApplicationListenerBean(String listenerBeanName) {
-		synchronized (this.defaultRetriever) {
+		synchronized (this.retrievalMutex) {
 			this.defaultRetriever.applicationListenerBeans.add(listenerBeanName);
 			this.retrieverCache.clear();
 		}
 	}
 
 	public void removeApplicationListener(ApplicationListener listener) {
-		synchronized (this.defaultRetriever) {
+		synchronized (this.retrievalMutex) {
 			this.defaultRetriever.applicationListeners.remove(listener);
 			this.retrieverCache.clear();
 		}
 	}
 
 	public void removeApplicationListenerBean(String listenerBeanName) {
-		synchronized (this.defaultRetriever) {
+		synchronized (this.retrievalMutex) {
 			this.defaultRetriever.applicationListenerBeans.remove(listenerBeanName);
 			this.retrieverCache.clear();
 		}
 	}
 
 	public void removeAllListeners() {
-		synchronized (this.defaultRetriever) {
+		synchronized (this.retrievalMutex) {
 			this.defaultRetriever.applicationListeners.clear();
 			this.defaultRetriever.applicationListenerBeans.clear();
 			this.retrieverCache.clear();
 		}
 	}
 
-	public final void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	private BeanFactory getBeanFactory() {
-		if (this.beanFactory == null) {
-			throw new IllegalStateException("ApplicationEventMulticaster cannot retrieve listener beans " +
-					"because it is not associated with a BeanFactory");
-		}
-		return this.beanFactory;
-	}
-
 
 	/**
 	 * Return a Collection containing all ApplicationListeners.
@@ -113,7 +134,7 @@ private BeanFactory getBeanFactory() {
 	 * @see org.springframework.context.ApplicationListener
 	 */
 	protected Collection<ApplicationListener> getApplicationListeners() {
-		synchronized (this.defaultRetriever) {
+		synchronized (this.retrievalMutex) {
 			return this.defaultRetriever.getApplicationListeners();
 		}
 	}
@@ -128,41 +149,77 @@ protected Collection<ApplicationListener> getApplicationListeners() {
 	 */
 	protected Collection<ApplicationListener> getApplicationListeners(ApplicationEvent event) {
 		Class<? extends ApplicationEvent> eventType = event.getClass();
-		Class sourceType = event.getSource().getClass();
+		Object source = event.getSource();
+		Class<?> sourceType = (source != null ? source.getClass() : null);
 		ListenerCacheKey cacheKey = new ListenerCacheKey(eventType, sourceType);
+
+		// Quick check for existing entry on ConcurrentHashMap...
 		ListenerRetriever retriever = this.retrieverCache.get(cacheKey);
 		if (retriever != null) {
 			return retriever.getApplicationListeners();
 		}
-		else {
-			retriever = new ListenerRetriever(true);
-			LinkedList<ApplicationListener> allListeners = new LinkedList<ApplicationListener>();
-			Set<ApplicationListener> listeners;
-			Set<String> listenerBeans;
-			synchronized (this.defaultRetriever) {
-				listeners = new LinkedHashSet<ApplicationListener>(this.defaultRetriever.applicationListeners);
-				listenerBeans = new LinkedHashSet<String>(this.defaultRetriever.applicationListenerBeans);
+
+		if (this.beanClassLoader == null ||
+				(ClassUtils.isCacheSafe(eventType, this.beanClassLoader) &&
+						(sourceType == null || ClassUtils.isCacheSafe(sourceType, this.beanClassLoader)))) {
+			// Fully synchronized building and caching of a ListenerRetriever
+			synchronized (this.retrievalMutex) {
+				retriever = this.retrieverCache.get(cacheKey);
+				if (retriever != null) {
+					return retriever.getApplicationListeners();
+				}
+				retriever = new ListenerRetriever(true);
+				Collection<ApplicationListener> listeners =
+						retrieveApplicationListeners(eventType, sourceType, retriever);
+				this.retrieverCache.put(cacheKey, retriever);
+				return listeners;
 			}
-			for (ApplicationListener listener : listeners) {
-				if (supportsEvent(listener, eventType, sourceType)) {
+		}
+		else {
+			// No ListenerRetriever caching -> no synchronization necessary
+			return retrieveApplicationListeners(eventType, sourceType, null);
+		}
+	}
+
+	/**
+	 * Actually retrieve the application listeners for the given event and source type.
+	 * @param eventType the application event type
+	 * @param sourceType the event source type
+	 * @param retriever the ListenerRetriever, if supposed to populate one (for caching purposes)
+	 * @return the pre-filtered list of application listeners for the given event and source type
+	 */
+	private Collection<ApplicationListener> retrieveApplicationListeners(
+			Class<? extends ApplicationEvent> eventType, Class<?> sourceType, ListenerRetriever retriever) {
+
+		LinkedList<ApplicationListener> allListeners = new LinkedList<ApplicationListener>();
+		Set<ApplicationListener> listeners;
+		Set<String> listenerBeans;
+		synchronized (this.retrievalMutex) {
+			listeners = new LinkedHashSet<ApplicationListener>(this.defaultRetriever.applicationListeners);
+			listenerBeans = new LinkedHashSet<String>(this.defaultRetriever.applicationListenerBeans);
+		}
+		for (ApplicationListener listener : listeners) {
+			if (supportsEvent(listener, eventType, sourceType)) {
+				if (retriever != null) {
 					retriever.applicationListeners.add(listener);
-					allListeners.add(listener);
 				}
+				allListeners.add(listener);
 			}
-			if (!listenerBeans.isEmpty()) {
-				BeanFactory beanFactory = getBeanFactory();
-				for (String listenerBeanName : listenerBeans) {
-					ApplicationListener listener = beanFactory.getBean(listenerBeanName, ApplicationListener.class);
-					if (!allListeners.contains(listener) && supportsEvent(listener, eventType, sourceType)) {
+		}
+		if (!listenerBeans.isEmpty()) {
+			BeanFactory beanFactory = getBeanFactory();
+			for (String listenerBeanName : listenerBeans) {
+				ApplicationListener listener = beanFactory.getBean(listenerBeanName, ApplicationListener.class);
+				if (!allListeners.contains(listener) && supportsEvent(listener, eventType, sourceType)) {
+					if (retriever != null) {
 						retriever.applicationListenerBeans.add(listenerBeanName);
-						allListeners.add(listener);
 					}
+					allListeners.add(listener);
 				}
 			}
-			OrderComparator.sort(allListeners);
-			this.retrieverCache.put(cacheKey, retriever);
-			return allListeners;
 		}
+		OrderComparator.sort(allListeners);
+		return allListeners;
 	}
 
 	/**
@@ -174,11 +231,11 @@ protected Collection<ApplicationListener> getApplicationListeners(ApplicationEve
 	 * @param listener the target listener to check
 	 * @param eventType the event type to check against
 	 * @param sourceType the source type to check against
-	 * @return whether the given listener should be included in the
-	 * candidates for the given event type
+	 * @return whether the given listener should be included in the candidates
+	 * for the given event type
 	 */
 	protected boolean supportsEvent(
-			ApplicationListener listener, Class<? extends ApplicationEvent> eventType, Class sourceType) {
+			ApplicationListener listener, Class<? extends ApplicationEvent> eventType, Class<?> sourceType) {
 
 		SmartApplicationListener smartListener = (listener instanceof SmartApplicationListener ?
 				(SmartApplicationListener) listener : new GenericApplicationListenerAdapter(listener));
@@ -191,11 +248,11 @@ protected boolean supportsEvent(
 	 */
 	private static class ListenerCacheKey {
 
-		private final Class eventType;
+		private final Class<?> eventType;
 
-		private final Class sourceType;
+		private final Class<?> sourceType;
 
-		public ListenerCacheKey(Class eventType, Class sourceType) {
+		public ListenerCacheKey(Class<?> eventType, Class<?> sourceType) {
 			this.eventType = eventType;
 			this.sourceType = sourceType;
 		}
@@ -206,12 +263,13 @@ public boolean equals(Object other) {
 				return true;
 			}
 			ListenerCacheKey otherKey = (ListenerCacheKey) other;
-			return (this.eventType.equals(otherKey.eventType) && this.sourceType.equals(otherKey.sourceType));
+			return ObjectUtils.nullSafeEquals(this.eventType, otherKey.eventType) &&
+					ObjectUtils.nullSafeEquals(this.sourceType, otherKey.sourceType);
 		}
 
 		@Override
 		public int hashCode() {
-			return this.eventType.hashCode() * 29 + this.sourceType.hashCode();
+			return ObjectUtils.nullSafeHashCode(this.eventType) * 29 + ObjectUtils.nullSafeHashCode(this.sourceType);
 		}
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java b/spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java
index 5866212e87..f70fadf98b 100644
--- a/spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java
+++ b/spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,9 +52,9 @@ public void onApplicationEvent(ApplicationEvent event) {
 	}
 
 	public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
-		Class typeArg = GenericTypeResolver.resolveTypeArgument(this.delegate.getClass(), ApplicationListener.class);
+		Class<?> typeArg = GenericTypeResolver.resolveTypeArgument(this.delegate.getClass(), ApplicationListener.class);
 		if (typeArg == null || typeArg.equals(ApplicationEvent.class)) {
-			Class targetClass = AopUtils.getTargetClass(this.delegate);
+			Class<?> targetClass = AopUtils.getTargetClass(this.delegate);
 			if (targetClass != this.delegate.getClass()) {
 				typeArg = GenericTypeResolver.resolveTypeArgument(targetClass, ApplicationListener.class);
 			}
diff --git a/spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java b/spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java
index a9326c5b16..2fef497de2 100644
--- a/spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java
+++ b/spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
 	}
 
 	public boolean supportsSourceType(Class<?> sourceType) {
-		return sourceType.isInstance(this.source);
+		return (sourceType != null && sourceType.isInstance(this.source));
 	}
 
 	public int getOrder() {
diff --git a/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java
index 486ded925f..dc0a77b643 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,11 @@
  */
 public class BeanFactoryAccessor implements PropertyAccessor {
 
+	public Class<?>[] getSpecificTargetClasses() {
+		return new Class<?>[] {BeanFactory.class};
+	}
+
+	@Override
 	public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 		return (((BeanFactory) target).containsBean(name));
 	}
@@ -48,8 +53,4 @@ public void write(EvaluationContext context, Object target, String name, Object
 		throw new AccessException("Beans in a BeanFactory are read-only");
 	}
 
-	public Class[] getSpecificTargetClasses() {
-		return new Class[] {BeanFactory.class};
-	}
-
 }
diff --git a/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java
index d041610a5e..36be60abee 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/EnvironmentAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 public class EnvironmentAccessor implements PropertyAccessor {
 
 	public Class<?>[] getSpecificTargetClasses() {
-		return new Class[] { Environment.class };
+		return new Class<?>[] {Environment.class};
 	}
 
 	/**
@@ -48,19 +48,18 @@ public boolean canRead(EvaluationContext context, Object target, String name) th
 	 * environment.
 	 */
 	public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
-		return new TypedValue(((Environment)target).getProperty(name));
+		return new TypedValue(((Environment) target).getProperty(name));
 	}
 
 	/**
-	 * Read only.
-	 * @return false
+	 * Read-only: returns {@code false}.
 	 */
 	public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 		return false;
 	}
 
 	/**
-	 * Read only. No-op.
+	 * Read-only: no-op.
 	 */
 	public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException {
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java
index 155fefbbc1..a897614d6e 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,10 @@
  */
 public class MapAccessor implements PropertyAccessor {
 
+	public Class<?>[] getSpecificTargetClasses() {
+		return new Class<?>[] {Map.class};
+	}
+
 	public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 		Map map = (Map) target;
 		return map.containsKey(name);
@@ -57,10 +61,6 @@ public void write(EvaluationContext context, Object target, String name, Object
 		map.put(name, newValue);
 	}
 
-	public Class[] getSpecificTargetClasses() {
-		return new Class[] {Map.class};
-	}
-
 
 	/**
 	 * Exception thrown from {@code read} in order to reset a cached
diff --git a/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java b/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java
index 2ca6ea2f85..c1d716793a 100644
--- a/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java
+++ b/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,8 @@ public static void resetLocaleContext() {
 	/**
 	 * Associate the given LocaleContext with the current thread,
 	 * <i>not</i> exposing it as inheritable for child threads.
-	 * @param localeContext the current LocaleContext
+	 * @param localeContext the current LocaleContext,
+	 * or {@code null} to reset the thread-bound context
 	 */
 	public static void setLocaleContext(LocaleContext localeContext) {
 		setLocaleContext(localeContext, false);
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
index 6bfc380aa5..873e235e67 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.EmbeddedValueResolverAware;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.context.HierarchicalMessageSource;
 import org.springframework.context.LifecycleProcessor;
@@ -217,7 +218,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * Create a new AbstractApplicationContext with no parent.
 	 */
 	public AbstractApplicationContext() {
-		this(null);
+		this.resourcePatternResolver = getResourcePatternResolver();
 	}
 
 	/**
@@ -225,8 +226,8 @@ public AbstractApplicationContext() {
 	 * @param parent the parent context
 	 */
 	public AbstractApplicationContext(ApplicationContext parent) {
-		this.parent = parent;
-		this.resourcePatternResolver = getResourcePatternResolver();
+		this();
+		setParent(parent);
 	}
 
 
@@ -404,8 +405,9 @@ public void setParent(ApplicationContext parent) {
 		}
 	}
 
-	public void addBeanFactoryPostProcessor(BeanFactoryPostProcessor beanFactoryPostProcessor) {
-		this.beanFactoryPostProcessors.add(beanFactoryPostProcessor);
+	public void addBeanFactoryPostProcessor(BeanFactoryPostProcessor postProcessor) {
+		Assert.notNull(postProcessor, "BeanFactoryPostProcessor must not be null");
+		this.beanFactoryPostProcessors.add(postProcessor);
 	}
 
 
@@ -418,6 +420,7 @@ public List<BeanFactoryPostProcessor> getBeanFactoryPostProcessors() {
 	}
 
 	public void addApplicationListener(ApplicationListener<?> listener) {
+		Assert.notNull(listener, "ApplicationListener must not be null");
 		if (this.applicationEventMulticaster != null) {
 			this.applicationEventMulticaster.addApplicationListener(listener);
 		}
@@ -483,6 +486,11 @@ public void refresh() throws BeansException, IllegalStateException {
 			}
 
 			catch (BeansException ex) {
+				if (logger.isWarnEnabled()) {
+					logger.warn("Exception encountered during context initialization - " +
+							"cancelling refresh attempt: " + ex);
+				}
+
 				// Destroy already created singletons to avoid dangling resources.
 				destroyBeans();
 
@@ -555,11 +563,12 @@ protected void prepareBeanFactory(ConfigurableListableBeanFactory beanFactory) {
 
 		// Configure the bean factory with context callbacks.
 		beanFactory.addBeanPostProcessor(new ApplicationContextAwareProcessor(this));
+		beanFactory.ignoreDependencyInterface(EnvironmentAware.class);
+		beanFactory.ignoreDependencyInterface(EmbeddedValueResolverAware.class);
 		beanFactory.ignoreDependencyInterface(ResourceLoaderAware.class);
 		beanFactory.ignoreDependencyInterface(ApplicationEventPublisherAware.class);
 		beanFactory.ignoreDependencyInterface(MessageSourceAware.class);
 		beanFactory.ignoreDependencyInterface(ApplicationContextAware.class);
-		beanFactory.ignoreDependencyInterface(EnvironmentAware.class);
 
 		// BeanFactory interface not registered as resolvable type in a plain factory.
 		// MessageSource registered (and found for autowiring) as a bean.
@@ -882,11 +891,12 @@ protected void registerListeners() {
 		for (ApplicationListener<?> listener : getApplicationListeners()) {
 			getApplicationEventMulticaster().addApplicationListener(listener);
 		}
+
 		// Do not initialize FactoryBeans here: We need to leave all regular beans
 		// uninitialized to let post-processors apply to them!
 		String[] listenerBeanNames = getBeanNamesForType(ApplicationListener.class, true, false);
-		for (String lisName : listenerBeanNames) {
-			getApplicationEventMulticaster().addApplicationListenerBean(lisName);
+		for (String listenerBeanName : listenerBeanNames) {
+			getApplicationEventMulticaster().addApplicationListenerBean(listenerBeanName);
 		}
 	}
 
@@ -1285,7 +1295,7 @@ public void stop() {
 	}
 
 	public boolean isRunning() {
-		return getLifecycleProcessor().isRunning();
+		return (this.lifecycleProcessor != null && this.lifecycleProcessor.isRunning());
 	}
 
 
diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
index e120f667fb..eef4d80ba4 100644
--- a/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,10 +45,9 @@ public class GenericXmlApplicationContext extends GenericApplicationContext {
 
 	/**
 	 * Create a new GenericXmlApplicationContext that needs to be
-	 * {@linkplain #load loaded} and then manually {@link #refresh refreshed}.
+	 * {@link #load loaded} and then manually {@link #refresh refreshed}.
 	 */
 	public GenericXmlApplicationContext() {
-		reader.setEnvironment(this.getEnvironment());
 	}
 
 	/**
@@ -91,14 +90,13 @@ public void setValidating(boolean validating) {
 	}
 
 	/**
-	 * {@inheritDoc}
-	 * <p>Delegates the given environment to underlying {@link XmlBeanDefinitionReader}.
-	 * Should be called before any call to {@link #load}.
+	 * Delegates the given environment to underlying {@link XmlBeanDefinitionReader}.
+	 * Should be called before any call to {@code #load}.
 	 */
 	@Override
 	public void setEnvironment(ConfigurableEnvironment environment) {
 		super.setEnvironment(environment);
-		this.reader.setEnvironment(this.getEnvironment());
+		this.reader.setEnvironment(getEnvironment());
 	}
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java b/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java
index 7cdfb8d492..73863ef6c0 100644
--- a/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java
+++ b/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import javax.management.ObjectName;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -40,7 +41,7 @@
  * (driven by the {@value #MBEAN_DOMAIN_PROPERTY_NAME} environment property).
  *
  * <p>Note: This feature is still in beta and primarily designed for use with
- * Spring Tool Suite 3.1.
+ * Spring Tool Suite 3.1 and higher.
  *
  * @author Juergen Hoeller
  * @since 3.2
@@ -56,6 +57,7 @@ public class LiveBeansView implements LiveBeansViewMBean, ApplicationContextAwar
 	private static final Set<ConfigurableApplicationContext> applicationContexts =
 			new LinkedHashSet<ConfigurableApplicationContext>();
 
+
 	static void registerApplicationContext(ConfigurableApplicationContext applicationContext) {
 		String mbeanDomain = applicationContext.getEnvironment().getProperty(MBEAN_DOMAIN_PROPERTY_NAME);
 		if (mbeanDomain != null) {
@@ -93,6 +95,7 @@ static void unregisterApplicationContext(ConfigurableApplicationContext applicat
 
 	private ConfigurableApplicationContext applicationContext;
 
+
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		Assert.isTrue(applicationContext instanceof ConfigurableApplicationContext,
 				"ApplicationContext does not implement ConfigurableApplicationContext");
@@ -116,6 +119,17 @@ public String getSnapshotAsJson() {
 		return generateJson(contexts);
 	}
 
+	/**
+	 * Find all applicable ApplicationContexts for the current application.
+	 * <p>Called if no specific ApplicationContext has been set for this LiveBeansView.
+	 * @return the set of ApplicationContexts
+	 */
+	protected Set<ConfigurableApplicationContext> findApplicationContexts() {
+		synchronized (applicationContexts) {
+			return new LinkedHashSet<ConfigurableApplicationContext>(applicationContexts);
+		}
+	}
+
 	/**
 	 * Actually generate a JSON snapshot of the beans in the given ApplicationContexts.
 	 * <p>This implementation doesn't use any JSON parsing libraries in order to avoid
@@ -141,11 +155,13 @@ protected String generateJson(Set<ConfigurableApplicationContext> contexts) {
 			result.append("\"beans\": [\n");
 			ConfigurableListableBeanFactory bf = context.getBeanFactory();
 			String[] beanNames = bf.getBeanDefinitionNames();
-			for (int i = 0; i < beanNames.length; i++) {
-				String beanName = beanNames[i];
+			boolean elementAppended = false;
+			for (String beanName : beanNames) {
 				BeanDefinition bd = bf.getBeanDefinition(beanName);
-				if (bd.getRole() != BeanDefinition.ROLE_INFRASTRUCTURE &&
-						(!bd.isLazyInit() || bf.containsSingleton(beanName))) {
+				if (isBeanEligible(beanName, bd, bf)) {
+					if (elementAppended) {
+						result.append(",\n");
+					}
 					result.append("{\n\"bean\": \"").append(beanName).append("\",\n");
 					String scope = bd.getScope();
 					if (!StringUtils.hasText(scope)) {
@@ -159,8 +175,7 @@ protected String generateJson(Set<ConfigurableApplicationContext> contexts) {
 					else {
 						result.append("\"type\": null,\n");
 					}
-					String resource = StringUtils.replace(bd.getResourceDescription(), "\\", "/");
-					result.append("\"resource\": \"").append(resource).append("\",\n");
+					result.append("\"resource\": \"").append(getEscapedResourceDescription(bd)).append("\",\n");
 					result.append("\"dependencies\": [");
 					String[] dependencies = bf.getDependenciesForBean(beanName);
 					if (dependencies.length > 0) {
@@ -171,9 +186,7 @@ protected String generateJson(Set<ConfigurableApplicationContext> contexts) {
 						result.append("\"");
 					}
 					result.append("]\n}");
-					if (i < beanNames.length - 1) {
-						result.append(",\n");
-					}
+					elementAppended = true;
 				}
 			}
 			result.append("]\n");
@@ -187,14 +200,43 @@ protected String generateJson(Set<ConfigurableApplicationContext> contexts) {
 	}
 
 	/**
-	 * Find all applicable ApplicationContexts for the current application.
-	 * <p>Called if no specific ApplicationContext has been set for this LiveBeansView.
-	 * @return the set of ApplicationContexts
+	 * Determine whether the specified bean is eligible for inclusion in the
+	 * LiveBeansView JSON snapshot.
+	 * @param beanName the name of the bean
+	 * @param bd the corresponding bean definition
+	 * @param bf the containing bean factory
+	 * @return {@code true} if the bean is to be included; {@code false} otherwise
 	 */
-	protected Set<ConfigurableApplicationContext> findApplicationContexts() {
-		synchronized (applicationContexts) {
-			return new LinkedHashSet<ConfigurableApplicationContext>(applicationContexts);
+	protected boolean isBeanEligible(String beanName, BeanDefinition bd, ConfigurableBeanFactory bf) {
+		return (bd.getRole() != BeanDefinition.ROLE_INFRASTRUCTURE &&
+				(!bd.isLazyInit() || bf.containsSingleton(beanName)));
+	}
+
+	/**
+	 * Determine a resource description for the given bean definition and
+	 * apply basic JSON escaping (backslashes, double quotes) to it.
+	 * @param bd the bean definition to build the resource description for
+	 * @return the JSON-escaped resource description
+	 */
+	protected String getEscapedResourceDescription(BeanDefinition bd) {
+		String resourceDescription = bd.getResourceDescription();
+		if (resourceDescription == null) {
+			return null;
+		}
+		StringBuilder result = new StringBuilder(resourceDescription.length() + 16);
+		for (int i = 0; i < resourceDescription.length(); i++) {
+			char character = resourceDescription.charAt(i);
+			if (character == '\\') {
+				result.append('/');
+			}
+			else if (character == '"') {
+				result.append("\\").append('"');
+			}
+			else {
+				result.append(character);
+			}
 		}
+		return result.toString();
 	}
 
 }
diff --git a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
index c831bbb855..3182390402 100644
--- a/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
+++ b/spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -108,8 +108,8 @@ public void setEnvironment(Environment environment) {
 	 * <p>Processing occurs by replacing ${...} placeholders in bean definitions by resolving each
 	 * against this configurer's set of {@link PropertySources}, which includes:
 	 * <ul>
-	 * <li>all {@linkplain org.springframework.core.env.ConfigurableEnvironment#getPropertySources environment property sources}, if an
-	 * {@code Environment} {@linkplain #setEnvironment is present}
+	 * <li>all {@linkplain org.springframework.core.env.ConfigurableEnvironment#getPropertySources
+	 * environment property sources}, if an {@code Environment} {@linkplain #setEnvironment is present}
 	 * <li>{@linkplain #mergeProperties merged local properties}, if {@linkplain #setLocation any}
 	 * {@linkplain #setLocations have} {@linkplain #setProperties been}
 	 * {@linkplain #setPropertiesArray specified}
@@ -135,7 +135,7 @@ public String getProperty(String key) {
 			}
 			try {
 				PropertySource<?> localPropertySource =
-					new PropertiesPropertySource(LOCAL_PROPERTIES_PROPERTY_SOURCE_NAME, this.mergeProperties());
+					new PropertiesPropertySource(LOCAL_PROPERTIES_PROPERTY_SOURCE_NAME, mergeProperties());
 				if (this.localOverride) {
 					this.propertySources.addFirst(localPropertySource);
 				}
@@ -148,7 +148,7 @@ public String getProperty(String key) {
 			}
 		}
 
-		this.processProperties(beanFactory, new PropertySourcesPropertyResolver(this.propertySources));
+		processProperties(beanFactory, new PropertySourcesPropertyResolver(this.propertySources));
 	}
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java
index 8d711989d9..56d73102f9 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ResourceBundleMessageSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -422,6 +422,8 @@ private class MessageSourceControl extends ResourceBundle.Control {
 		@Override
 		public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload)
 				throws IllegalAccessException, InstantiationException, IOException {
+
+			// Special handling of default encoding
 			if (format.equals("java.properties")) {
 				String bundleName = toBundleName(baseName, locale);
 				final String resourceName = toResourceName(bundleName, "properties");
@@ -468,6 +470,7 @@ public InputStream run() throws IOException {
 				}
 			}
 			else {
+				// Delegate handling of "java.class" format to standard Control
 				return super.newBundle(baseName, locale, format, loader, reload);
 			}
 		}
diff --git a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
index 30aad8a078..00be39f062 100644
--- a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
+++ b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,14 +27,17 @@
 import org.springframework.core.NamedThreadLocal;
 
 /**
- * Thread-backed {@link Scope} implementation.
+ * A simple thread-backed {@link Scope} implementation.
  *
- * <p><strong>Note</strong> that the {@code SimpleThreadScope} <em>does not clean up any objects</em> associated
- * with it. As such, it's typically preferable to use the {@link org.springframework.web.context.request.RequestScope}
- * in Web environments.
+ * <p><strong>Note:</strong> {@code SimpleThreadScope} <em>does not clean up
+ * any objects</em> associated with it. As such, it is typically preferable to
+ * use {@link org.springframework.web.context.request.RequestScope RequestScope}
+ * in web environments.
  *
- * <p>For a implementation of a thread-based {@code Scope} with support for destruction callbacks, refer to <a
- * href="http://www.springbyexample.org/twiki/bin/view/Example/CustomThreadScopeModule">this module</a>.
+ * <p>For an implementation of a thread-based {@code Scope} with support for
+ * destruction callbacks, refer to the
+ * <a href="http://www.springbyexample.org/examples/custom-thread-scope-module.html">
+*  Spring by Example Custom Thread Scope Module</a>.
  *
  * <p>Thanks to Eugene Kuleshov for submitting the original prototype for a thread scope!
  *
@@ -55,8 +58,9 @@ protected Map<String, Object> initialValue() {
 				}
 			};
 
-	public Object get(String name, ObjectFactory objectFactory) {
-		Map<String, Object> scope = threadScope.get();
+
+	public Object get(String name, ObjectFactory<?> objectFactory) {
+		Map<String, Object> scope = this.threadScope.get();
 		Object object = scope.get(name);
 		if (object == null) {
 			object = objectFactory.getObject();
@@ -66,13 +70,13 @@ public Object get(String name, ObjectFactory objectFactory) {
 	}
 
 	public Object remove(String name) {
-		Map<String, Object> scope = threadScope.get();
+		Map<String, Object> scope = this.threadScope.get();
 		return scope.remove(name);
 	}
 
 	public void registerDestructionCallback(String name, Runnable callback) {
-		logger.warn("SimpleThreadScope does not support descruction callbacks. " +
-				"Consider using a RequestScope in a Web environment.");
+		logger.warn("SimpleThreadScope does not support destruction callbacks. " +
+				"Consider using RequestScope in a web environment.");
 	}
 
 	public Object resolveContextualObject(String key) {
diff --git a/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java
index fb53938011..aaa5e720e1 100644
--- a/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.format;
 
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
 /**
- * A factory that creates formatters to format values of fields annotated with a particular {@link Annotation}.
+ * A factory that creates formatters to format values of fields annotated with a particular
+ * {@link Annotation}.
  *
  * <p>For example, a {@code DateTimeFormatAnnotationFormatterFactory} might create a formatter
  * that formats {@code Date} values set on fields annotated with {@code @DateTimeFormat}.
@@ -36,8 +38,10 @@ public interface AnnotationFormatterFactory<A extends Annotation> {
 	Set<Class<?>> getFieldTypes();
 
 	/**
-	 * Get the Printer to print the value of a field of {@code fieldType} annotated with {@code annotation}.
-	 * If the type &lt;T&gt; the printer accepts is not assignable to {@code fieldType}, a coersion from {@code fieldType} to &lt;T&gt; will be attempted before the Printer is invoked.
+	 * Get the Printer to print the value of a field of {@code fieldType} annotated with
+	 * {@code annotation}.
+	 * <p>If the type T the printer accepts is not assignable to {@code fieldType}, a
+	 * coercion from {@code fieldType} to T will be attempted before the Printer is invoked.
 	 * @param annotation the annotation instance
 	 * @param fieldType the type of field that was annotated
 	 * @return the printer
@@ -45,8 +49,10 @@ public interface AnnotationFormatterFactory<A extends Annotation> {
 	Printer<?> getPrinter(A annotation, Class<?> fieldType);
 
 	/**
-	 * Get the Parser to parse a submitted value for a field of {@code fieldType} annotated with {@code annotation}.
-	 * If the object the parser returns is not assignable to {@code fieldType}, a coersion to {@code fieldType} will be attempted before the field is set.
+	 * Get the Parser to parse a submitted value for a field of {@code fieldType}
+	 * annotated with {@code annotation}.
+	 * <p>If the object the parser returns is not assignable to {@code fieldType},
+	 * a coercion to {@code fieldType} will be attempted before the field is set.
 	 * @param annotation the annotation instance
 	 * @param fieldType the type of field that was annotated
 	 * @return the parser
diff --git a/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java b/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java
index 8d22560e0f..62de5432d3 100644
--- a/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java
+++ b/spring-context/src/main/java/org/springframework/format/annotation/DateTimeFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.format.annotation;
 
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -23,51 +24,57 @@
 
 /**
  * Declares that a field should be formatted as a date time.
- * Supports formatting by style pattern, ISO date time pattern, or custom format pattern string.
- * Can be applied to {@code java.util.Date}, {@code java.util.Calendar}, {@code java.long.Long}, or Joda Time fields.
- * <p>
- * For style-based formatting, set the {@link #style()} attribute to be the style pattern code.
+ *
+ * <p>Supports formatting by style pattern, ISO date time pattern, or custom format pattern string.
+ * Can be applied to {@code java.util.Date}, {@code java.util.Calendar}, {@code java.long.Long},
+ * Joda-Time value types; and as of Spring 4 and JDK 8, to JSR-310 <code>java.time</code> types too.
+ *
+ * <p>For style-based formatting, set the {@link #style} attribute to be the style pattern code.
  * The first character of the code is the date style, and the second character is the time style.
  * Specify a character of 'S' for short style, 'M' for medium, 'L' for long, and 'F' for full.
  * A date or time may be omitted by specifying the style character '-'.
- * <p>
- * For ISO-based formatting, set the {@link #iso()} attribute to be the desired {@link ISO} format, such as {@link ISO#DATE}.
- <p>
- * For custom formatting, set the {@link #pattern()} attribute to be the DateTime pattern, such as {@code yyyy/MM/dd hh:mm:ss a}.
- * <p>
- * Each attribute is mutually exclusive, so only set one attribute per annotation instance (the one most convenient one for your formatting needs).
+ *
+ * <p>For ISO-based formatting, set the {@link #iso} attribute to be the desired {@link ISO} format,
+ * such as {@link ISO#DATE}. For custom formatting, set the {@link #pattern()} attribute to be the
+ * DateTime pattern, such as {@code yyyy/MM/dd hh:mm:ss a}.
+ *
+ * <p>Each attribute is mutually exclusive, so only set one attribute per annotation instance
+ * (the one most convenient one for your formatting needs).
  * When the pattern attribute is specified, it takes precedence over both the style and ISO attribute.
- * When the iso attribute is specified, if takes precedence over the style attribute.
- * When no annotation attributes are specified, the default format applied is style-based with a style code of 'SS' (short date, short time).
+ * When the {@link #iso} attribute is specified, it takes precedence over the style attribute.
+ * When no annotation attributes are specified, the default format applied is style-based
+ * with a style code of 'SS' (short date, short time).
  *
  * @author Keith Donald
  * @author Juergen Hoeller
  * @since 3.0
  * @see org.joda.time.format.DateTimeFormat
  */
-@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE})
+@Documented
 @Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE})
 public @interface DateTimeFormat {
 
 	/**
 	 * The style pattern to use to format the field.
-	 * Defaults to 'SS' for short date time.
-	 * Set this attribute when you wish to format your field in accordance with a common style other than the default style.
+	 * <p>Defaults to 'SS' for short date time. Set this attribute when you wish to format
+	 * your field in accordance with a common style other than the default style.
 	 */
 	String style() default "SS";
 
 	/**
 	 * The ISO pattern to use to format the field.
 	 * The possible ISO patterns are defined in the {@link ISO} enum.
-	 * Defaults to ISO.NONE, indicating this attribute should be ignored.
-	 * Set this attribute when you wish to format your field in accordance with an ISO date time format.
+	 * <p>Defaults to {@link ISO#NONE}, indicating this attribute should be ignored.
+	 * Set this attribute when you wish to format your field in accordance with an ISO format.
 	 */
 	ISO iso() default ISO.NONE;
 
 	/**
 	 * The custom pattern to use to format the field.
-	 * Defaults to empty String, indicating no custom pattern String has been specified.
-	 * Set this attribute when you wish to format your field in accordance with a custom date time pattern not represented by a style or ISO format.
+	 * <p>Defaults to empty String, indicating no custom pattern String has been specified.
+	 * Set this attribute when you wish to format your field in accordance with a custom
+	 * date time pattern not represented by a style or ISO format.
 	 */
 	String pattern() default "";
 
@@ -75,21 +82,24 @@
 	/**
 	 * Common ISO date time format patterns.
 	 */
-	public enum ISO {
+	enum ISO {
 
 		/**
-		 * The most common ISO Date Format {@code yyyy-MM-dd} e.g. 2000-10-31.
+		 * The most common ISO Date Format {@code yyyy-MM-dd},
+		 * e.g. "2000-10-31".
 		 */
 		DATE,
 
 		/**
-		 * The most common ISO Time Format {@code HH:mm:ss.SSSZ} e.g. 01:30:00.000-05:00.
+		 * The most common ISO Time Format {@code HH:mm:ss.SSSZ},
+		 * e.g. "01:30:00.000-05:00".
 		 */
 		TIME,
 
 		/**
-		 * The most common ISO DateTime Format {@code yyyy-MM-dd'T'HH:mm:ss.SSSZ} e.g. 2000-10-31 01:30:00.000-05:00.
-		 * The default if no annotation value is specified.
+		 * The most common ISO DateTime Format {@code yyyy-MM-dd'T'HH:mm:ss.SSSZ},
+		 * e.g. "2000-10-31T01:30:00.000-05:00".
+		 * <p>This is the default if no annotation value is specified.
 		 */
 		DATE_TIME,
 
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/DateFormatter.java b/spring-context/src/main/java/org/springframework/format/datetime/DateFormatter.java
index 365800aba8..2e34f7309e 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/DateFormatter.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/DateFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
 import org.springframework.format.Formatter;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat.ISO;
-import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
@@ -45,8 +44,9 @@
 public class DateFormatter implements Formatter<Date> {
 
 	private static final Map<ISO, String> ISO_PATTERNS;
+
 	static {
-		Map<ISO, String> formats = new HashMap<DateTimeFormat.ISO, String>();
+		Map<ISO, String> formats = new HashMap<DateTimeFormat.ISO, String>(4);
 		formats.put(ISO.DATE, "yyyy-MM-dd");
 		formats.put(ISO.TIME, "HH:mm:ss.SSSZ");
 		formats.put(ISO.DATE_TIME, "yyyy-MM-dd'T'HH:mm:ss.SSSZ");
@@ -89,6 +89,15 @@ public void setPattern(String pattern) {
 		this.pattern = pattern;
 	}
 
+	/**
+	 * Set the ISO format used for this date.
+	 * @param iso the {@link ISO} format
+	 * @since 3.2
+	 */
+	public void setIso(ISO iso) {
+		this.iso = iso;
+	}
+
 	/**
 	 * Set the style to use to format date values.
 	 * <p>If not specified, DateFormat's default style will be used.
@@ -112,7 +121,7 @@ public void setStyle(int style) {
 	 * <li>'F' = Full</li>
 	 * <li>'-' = Omitted</li>
 	 * <ul>
-	 * This method mimics the styles supported by Joda Time.
+	 * This method mimics the styles supported by Joda-Time.
 	 * @param stylePattern two characters from the set {"S", "M", "L", "F", "-"}
 	 * @since 3.2
 	 */
@@ -120,14 +129,6 @@ public void setStylePattern(String stylePattern) {
 		this.stylePattern = stylePattern;
 	}
 
-	/**
-	 * Set the ISO format used for this date.
-	 * @param iso the {@link ISO} format
-	 * @since 3.2
-	 */
-	public void setIso(ISO iso) {
-		this.iso = iso;
-	}
 	/**
 	 * Set the TimeZone to normalize the date values into, if any.
 	 */
@@ -167,34 +168,36 @@ private DateFormat createDateFormat(Locale locale) {
 		if (StringUtils.hasLength(this.pattern)) {
 			return new SimpleDateFormat(this.pattern, locale);
 		}
-		if (iso != null && iso != ISO.NONE) {
-			String pattern = ISO_PATTERNS.get(iso);
-			Assert.state(pattern != null, "Unsupported ISO format " + iso);
+		if (this.iso != null && this.iso != ISO.NONE) {
+			String pattern = ISO_PATTERNS.get(this.iso);
+			if (pattern == null) {
+				throw new IllegalStateException("Unsupported ISO format " + this.iso);
+			}
 			SimpleDateFormat format = new SimpleDateFormat(pattern);
 			format.setTimeZone(TimeZone.getTimeZone("UTC"));
 			return format;
 		}
-		if(StringUtils.hasLength(stylePattern)) {
+		if (StringUtils.hasLength(this.stylePattern)) {
 			int dateStyle = getStylePatternForChar(0);
 			int timeStyle = getStylePatternForChar(1);
-			if(dateStyle != -1 && timeStyle != -1) {
+			if (dateStyle != -1 && timeStyle != -1) {
 				return DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
 			}
-			if(dateStyle != -1) {
+			if (dateStyle != -1) {
 				return DateFormat.getDateInstance(dateStyle, locale);
 			}
-			if(timeStyle != -1) {
+			if (timeStyle != -1) {
 				return DateFormat.getTimeInstance(timeStyle, locale);
 			}
-			throw new IllegalStateException("Unsupported style pattern '"+ stylePattern+ "'");
+			throw new IllegalStateException("Unsupported style pattern '" + this.stylePattern + "'");
 
 		}
 		return DateFormat.getDateInstance(this.style, locale);
 	}
 
 	private int getStylePatternForChar(int index) {
-		if(stylePattern != null && stylePattern.length() > index) {
-			switch (stylePattern.charAt(index)) {
+		if (this.stylePattern != null && this.stylePattern.length() > index) {
+			switch (this.stylePattern.charAt(index)) {
 				case 'S': return DateFormat.SHORT;
 				case 'M': return DateFormat.MEDIUM;
 				case 'L': return DateFormat.LONG;
@@ -202,6 +205,7 @@ private int getStylePatternForChar(int index) {
 				case '-': return -1;
 			}
 		}
-		throw new IllegalStateException("Unsupported style pattern '"+ stylePattern+ "'");
+		throw new IllegalStateException("Unsupported style pattern '" + this.stylePattern + "'");
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/DateFormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/datetime/DateFormatterRegistrar.java
index b74b53262b..b94ddc9e7d 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/DateFormatterRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/DateFormatterRegistrar.java
@@ -27,8 +27,8 @@
 
 /**
  * Configures Date formatting for use with Spring.
- * <p>
- * Designed for direct instantiation but also exposes the static
+ *
+ * <p>Designed for direct instantiation but also exposes the static
  * {@link #addDateConverters(ConverterRegistry)} utility method for ad hoc use
  * against any {@code ConverterRegistry} instance.
  *
@@ -39,32 +39,32 @@
  */
 public class DateFormatterRegistrar implements FormatterRegistrar {
 
-
 	private DateFormatter dateFormatter;
 
 
+	/**
+	 * Set the date formatter to register. If not specified no formatter is registered.
+	 * This method can be used if global formatter configuration is required.
+	 * @param dateFormatter the date formatter
+	 */
+	public void setFormatter(DateFormatter dateFormatter) {
+		Assert.notNull(dateFormatter, "DateFormatter must not be null");
+		this.dateFormatter = dateFormatter;
+	}
+
+
 	public void registerFormatters(FormatterRegistry registry) {
 		addDateConverters(registry);
 		registry.addFormatterForFieldAnnotation(new DateTimeFormatAnnotationFormatterFactory());
 
 		// In order to retain back compatibility we only register Date/Calendar
 		// types when a user defined formatter is specified (see SPR-10105)
-		if(this.dateFormatter != null) {
+		if (this.dateFormatter != null) {
 			registry.addFormatter(this.dateFormatter);
 			registry.addFormatterForFieldType(Calendar.class, this.dateFormatter);
 		}
 	}
 
-	/**
-	 * Set the date formatter to register. If not specified no formatter is registered.
-	 * This method can be used if global formatter configuration is required.
-	 * @param dateFormatter the date formatter
-	 */
-	public void setFormatter(DateFormatter dateFormatter) {
-		Assert.notNull(dateFormatter, "DateFormatter must not be null");
-		this.dateFormatter = dateFormatter;
-	}
-
 	/**
 	 * Add date converters to the specified registry.
 	 * @param converterRegistry the registry of converters to add to
@@ -80,6 +80,7 @@ public static void addDateConverters(ConverterRegistry converterRegistry) {
 
 
 	private static class DateToLongConverter implements Converter<Date, Long> {
+
 		public Long convert(Date source) {
 			return source.getTime();
 		}
@@ -87,6 +88,7 @@ public Long convert(Date source) {
 
 
 	private static class DateToCalendarConverter implements Converter<Date, Calendar> {
+
 		public Calendar convert(Date source) {
 			Calendar calendar = Calendar.getInstance();
 			calendar.setTime(source);
@@ -96,6 +98,7 @@ public Calendar convert(Date source) {
 
 
 	private static class CalendarToDateConverter implements Converter<Calendar, Date> {
+
 		public Date convert(Calendar source) {
 			return source.getTime();
 		}
@@ -103,13 +106,15 @@ public Date convert(Calendar source) {
 
 
 	private static class CalendarToLongConverter implements Converter<Calendar, Long> {
+
 		public Long convert(Calendar source) {
-			return source.getTime().getTime();
+			return source.getTimeInMillis();
 		}
 	}
 
 
 	private static class LongToDateConverter implements Converter<Long, Date> {
+
 		public Date convert(Long source) {
 			return new Date(source);
 		}
@@ -118,10 +123,11 @@ public Date convert(Long source) {
 
 	private static class LongToCalendarConverter implements Converter<Long, Calendar> {
 
-		private DateToCalendarConverter dateToCalendarConverter = new DateToCalendarConverter();
-
 		public Calendar convert(Long source) {
-			return this.dateToCalendarConverter.convert(new Date(source));
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTimeInMillis(source);
+			return calendar;
 		}
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java
index 93efaf43a8..e4a8d8bf6d 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class DateTimeFormatAnnotationFormatterFactory implements
 
 	private static final Set<Class<?>> FIELD_TYPES;
 	static {
-		Set<Class<?>> fieldTypes = new HashSet<Class<?>>();
+		Set<Class<?>> fieldTypes = new HashSet<Class<?>>(4);
 		fieldTypes.add(Date.class);
 		fieldTypes.add(Calendar.class);
 		fieldTypes.add(Long.class);
@@ -82,4 +82,5 @@ protected Formatter<Date> getFormatter(DateTimeFormat annotation, Class<?> field
 	protected String resolveEmbeddedValue(String value) {
 		return (this.embeddedValueResolver != null ? this.embeddedValueResolver.resolveStringValue(value) : value);
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactory.java
index 53d487b1d2..d0efdaa3a1 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,32 +22,34 @@
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
+
 import org.springframework.format.annotation.DateTimeFormat.ISO;
 import org.springframework.util.StringUtils;
 
 /**
- * Factory that creates a Joda {@link DateTimeFormatter}. Formatters will be
- * created using the defined {@link #setPattern(String) pattern}, {@link #setIso ISO},
- * or {@link #setStyle(String) style} (considered in that order).
+ * Factory that creates a Joda-Time {@link DateTimeFormatter}.
+ *
+ * <p>Formatters will be created using the defined {@link #setPattern pattern},
+ * {@link #setIso ISO}, and {@link #setStyle style} methods (considered in that order).
  *
  * @author Phillip Webb
  * @author Sam Brannen
  * @since 3.2
  * @see #createDateTimeFormatter()
  * @see #createDateTimeFormatter(DateTimeFormatter)
- * @see #setPattern(String)
+ * @see #setPattern
+ * @see #setStyle
  * @see #setIso
- * @see #setStyle(String)
  * @see DateTimeFormatterFactoryBean
  */
 public class DateTimeFormatterFactory {
 
+	private String pattern;
+
 	private ISO iso;
 
 	private String style;
 
-	private String pattern;
-
 	private TimeZone timeZone;
 
 
@@ -67,9 +69,50 @@ public DateTimeFormatterFactory(String pattern) {
 
 
 	/**
-	 * Create a new {@code DateTimeFormatter} using this factory. If no specific
-	 * {@link #setStyle(String) style}, {@link #setIso ISO}, or
-	 * {@link #setPattern(String) pattern} have been defined the
+	 * Set the pattern to use to format date values.
+	 * @param pattern the format pattern
+	 */
+	public void setPattern(String pattern) {
+		this.pattern = pattern;
+	}
+
+	/**
+	 * Set the ISO format used to format date values.
+	 * @param iso the ISO format
+	 */
+	public void setIso(ISO iso) {
+		this.iso = iso;
+	}
+
+	/**
+	 * Set the two characters to use to format date values, in Joda-Time style.
+	 * <p>The first character is used for the date style; the second is for
+	 * the time style. Supported characters are:
+	 * <ul>
+	 * <li>'S' = Small</li>
+	 * <li>'M' = Medium</li>
+	 * <li>'L' = Long</li>
+	 * <li>'F' = Full</li>
+	 * <li>'-' = Omitted</li>
+	 * </ul>
+	 * @param style two characters from the set {"S", "M", "L", "F", "-"}
+	 */
+	public void setStyle(String style) {
+		this.style = style;
+	}
+
+	/**
+	 * Set the {@code TimeZone} to normalize the date values into, if any.
+	 * @param timeZone the time zone
+	 */
+	public void setTimeZone(TimeZone timeZone) {
+		this.timeZone = timeZone;
+	}
+
+
+	/**
+	 * Create a new {@code DateTimeFormatter} using this factory.
+	 * <p>If no specific pattern or style has been defined,
 	 * {@link DateTimeFormat#mediumDateTime() medium date time format} will be used.
 	 * @return a new date time formatter
 	 * @see #createDateTimeFormatter(DateTimeFormatter)
@@ -79,21 +122,20 @@ public DateTimeFormatter createDateTimeFormatter() {
 	}
 
 	/**
-	 * Create a new {@code DateTimeFormatter} using this factory. If no specific
-	 * {@link #setStyle(String) style}, {@link #setIso ISO}, or
-	 * {@link #setPattern(String) pattern} have been defined the supplied
-	 * {@code fallbackFormatter} will be used.
-	 * @param fallbackFormatter the fall-back formatter to use when no specific factory
-	 *        properties have been set (can be {@code null}).
+	 * Create a new {@code DateTimeFormatter} using this factory.
+	 * <p>If no specific pattern or style has been defined,
+	 * the supplied {@code fallbackFormatter} will be used.
+	 * @param fallbackFormatter the fall-back formatter to use when no specific
+	 * factory properties have been set (can be {@code null}).
 	 * @return a new date time formatter
 	 */
 	public DateTimeFormatter createDateTimeFormatter(DateTimeFormatter fallbackFormatter) {
 		DateTimeFormatter dateTimeFormatter = null;
-		if (StringUtils.hasLength(pattern)) {
-			dateTimeFormatter = DateTimeFormat.forPattern(pattern);
+		if (StringUtils.hasLength(this.pattern)) {
+			dateTimeFormatter = DateTimeFormat.forPattern(this.pattern);
 		}
-		else if (iso != null && iso != ISO.NONE) {
-			switch (iso) {
+		else if (this.iso != null && this.iso != ISO.NONE) {
+			switch (this.iso) {
 				case DATE:
 					dateTimeFormatter = ISODateTimeFormat.date();
 					break;
@@ -107,11 +149,11 @@ else if (iso != null && iso != ISO.NONE) {
 					/* no-op */
 					break;
 				default:
-					throw new IllegalStateException("Unsupported ISO format: " + iso);
+					throw new IllegalStateException("Unsupported ISO format: " + this.iso);
 			}
 		}
-		else if (StringUtils.hasLength(style)) {
-			dateTimeFormatter = DateTimeFormat.forStyle(style);
+		else if (StringUtils.hasLength(this.style)) {
+			dateTimeFormatter = DateTimeFormat.forStyle(this.style);
 		}
 
 		if (dateTimeFormatter != null && this.timeZone != null) {
@@ -120,44 +162,4 @@ else if (StringUtils.hasLength(style)) {
 		return (dateTimeFormatter != null ? dateTimeFormatter : fallbackFormatter);
 	}
 
-	/**
-	 * Set the {@code TimeZone} to normalize the date values into, if any.
-	 * @param timeZone the time zone
-	 */
-	public void setTimeZone(TimeZone timeZone) {
-		this.timeZone = timeZone;
-	}
-
-	/**
-	 * Set the two characters to use to format date values. The first character is used for
-	 * the date style; the second is for the time style. Supported characters are:
-	 * <ul>
-	 * <li>'S' = Small</li>
-	 * <li>'M' = Medium</li>
-	 * <li>'L' = Long</li>
-	 * <li>'F' = Full</li>
-	 * <li>'-' = Omitted</li>
-	 * </ul>
-	 * <p>This method mimics the styles supported by Joda Time.
-	 * @param style two characters from the set {"S", "M", "L", "F", "-"}
-	 */
-	public void setStyle(String style) {
-		this.style = style;
-	}
-
-	/**
-	 * Set the ISO format used to format date values.
-	 * @param iso the ISO format
-	 */
-	public void setIso(ISO iso) {
-		this.iso = iso;
-	}
-
-	/**
-	 * Set the pattern to use to format date values.
-	 * @param pattern the format pattern
-	 */
-	public void setPattern(String pattern) {
-		this.pattern = pattern;
-	}
 }
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBean.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBean.java
index 8c12e4b317..20aceca9e1 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,15 +22,15 @@
 import org.springframework.beans.factory.InitializingBean;
 
 /**
- * {@link FactoryBean} that creates a Joda {@link DateTimeFormatter}. See the
- * {@linkplain DateTimeFormatterFactory base class} for configuration details.
+ * {@link FactoryBean} that creates a Joda-Time {@link DateTimeFormatter}.
+ * See the {@link DateTimeFormatterFactory base class} for configuration details.
  *
  * @author Phillip Webb
  * @author Sam Brannen
  * @since 3.2
- * @see #setPattern(String)
- * @see #setIso(org.springframework.format.annotation.DateTimeFormat.ISO)
- * @see #setStyle(String)
+ * @see #setPattern
+ * @see #setIso
+ * @see #setStyle
  * @see DateTimeFormatterFactory
  */
 public class DateTimeFormatterFactoryBean extends DateTimeFormatterFactory
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java
index 2c5638c26f..3e18d374c6 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaDateTimeFormatAnnotationFormatterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ public class JodaDateTimeFormatAnnotationFormatterFactory
 		// (if we did not do this, the default byType rules for LocalDate, LocalTime,
 		// and LocalDateTime would take precedence over the annotation rule, which
 		// is not what we want)
-		Set<Class<?>> fieldTypes = new HashSet<Class<?>>(7);
+		Set<Class<?>> fieldTypes = new HashSet<Class<?>>(8);
 		fieldTypes.add(ReadableInstant.class);
 		fieldTypes.add(LocalDate.class);
 		fieldTypes.add(LocalTime.class);
@@ -71,10 +71,6 @@ public class JodaDateTimeFormatAnnotationFormatterFactory
 	private StringValueResolver embeddedValueResolver;
 
 
-	public final Set<Class<?>> getFieldTypes() {
-		return FIELD_TYPES;
-	}
-
 	public void setEmbeddedValueResolver(StringValueResolver resolver) {
 		this.embeddedValueResolver = resolver;
 	}
@@ -83,20 +79,24 @@ protected String resolveEmbeddedValue(String value) {
 		return (this.embeddedValueResolver != null ? this.embeddedValueResolver.resolveStringValue(value) : value);
 	}
 
+
+	public final Set<Class<?>> getFieldTypes() {
+		return FIELD_TYPES;
+	}
+
 	public Printer<?> getPrinter(DateTimeFormat annotation, Class<?> fieldType) {
 		DateTimeFormatter formatter = getFormatter(annotation, fieldType);
-		if (ReadableInstant.class.isAssignableFrom(fieldType)) {
-			return new ReadableInstantPrinter(formatter);
-		}
 		if (ReadablePartial.class.isAssignableFrom(fieldType)) {
 			return new ReadablePartialPrinter(formatter);
 		}
-		if (Calendar.class.isAssignableFrom(fieldType)) {
+		else if (ReadableInstant.class.isAssignableFrom(fieldType) || Calendar.class.isAssignableFrom(fieldType)) {
 			// assumes Calendar->ReadableInstant converter is registered
 			return new ReadableInstantPrinter(formatter);
 		}
-		// assumes Date->Long converter is registered
-		return new MillisecondInstantPrinter(formatter);
+		else {
+			// assumes Date->Long converter is registered
+			return new MillisecondInstantPrinter(formatter);
+		}
 	}
 
 	public Parser<DateTime> getParser(DateTimeFormat annotation, Class<?> fieldType) {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java
index f80fcd6242..e4db4a2557 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,10 @@
 import org.joda.time.format.DateTimeFormatter;
 
 /**
- * A context that holds user-specific Joda Time settings such as the user's Chronology (calendar system) and time zone.
- * A {@code null} property value indicate the user has not specified a setting.
+ * A context that holds user-specific Joda-Time settings such as the user's
+ * Chronology (calendar system) and time zone.
+ *
+ * <p>A {@code null} property value indicate the user has not specified a setting.
  *
  * @author Keith Donald
  * @since 3.0
@@ -36,40 +38,40 @@ public class JodaTimeContext {
 
 
 	/**
-	 * Set the user's chronology.
+	 * Set the user's chronology (calendar system).
 	 */
 	public void setChronology(Chronology chronology) {
 		this.chronology = chronology;
 	}
 
 	/**
-	 * The user's chronology (calendar system).
-	 * Null if not specified.
+	 * Return the user's chronology (calendar system), if any.
 	 */
 	public Chronology getChronology() {
 		return this.chronology;
 	}
 
 	/**
-	 * Set the user's timezone.
+	 * Set the user's time zone.
 	 */
 	public void setTimeZone(DateTimeZone timeZone) {
 		this.timeZone = timeZone;
 	}
 
 	/**
-	 * The user's timezone.
-	 * Null if not specified.
+	 * Return the user's time zone, if any.
 	 */
 	public DateTimeZone getTimeZone() {
-		return timeZone;
+		return this.timeZone;
 	}
 
 
 	/**
-	 * Gets the Formatter with the this context's settings applied to the base {@code formatter}.
-	 * @param formatter the base formatter that establishes default formatting rules, generally context independent
-	 * @return the context DateTimeFormatter
+	 * Get the DateTimeFormatter with the this context's settings
+	 * applied to the base {@code formatter}.
+	 * @param formatter the base formatter that establishes default
+	 * formatting rules, generally context-independent
+	 * @return the contextual DateTimeFormatter
 	 */
 	public DateTimeFormatter getFormatter(DateTimeFormatter formatter) {
 		if (this.chronology != null) {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java
index 85ca71044a..ffc2b71137 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@
 import org.springframework.core.NamedThreadLocal;
 
 /**
- * A holder for a thread-local user {@link JodaTimeContext}.
+ * A holder for a thread-local {@link JodaTimeContext}
+ * with user-specific Joda-Time settings.
  *
  * @author Keith Donald
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java
index b49b607255..9c966e4346 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeConverters.java
@@ -27,12 +27,14 @@
 import org.joda.time.LocalTime;
 import org.joda.time.MutableDateTime;
 import org.joda.time.ReadableInstant;
+
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConverterRegistry;
 import org.springframework.format.datetime.DateFormatterRegistrar;
 
 /**
- * Installs lower-level type converters required to integrate Joda Time support into Spring's field formatting system.
+ * Installs lower-level type converters required to integrate
+ * Joda-Time support into Spring's field formatting system.
  *
  * @author Keith Donald
  * @author Phillip Webb
@@ -50,125 +52,111 @@ public static void registerConverters(ConverterRegistry registry) {
 		registry.addConverter(new DateTimeToLocalTimeConverter());
 		registry.addConverter(new DateTimeToLocalDateTimeConverter());
 		registry.addConverter(new DateTimeToDateMidnightConverter());
-		registry.addConverter(new DateTimeToInstantConverter());
 		registry.addConverter(new DateTimeToMutableDateTimeConverter());
+		registry.addConverter(new DateTimeToInstantConverter());
 		registry.addConverter(new DateTimeToDateConverter());
 		registry.addConverter(new DateTimeToCalendarConverter());
 		registry.addConverter(new DateTimeToLongConverter());
-		registry.addConverter(new CalendarToReadableInstantConverter());
 		registry.addConverter(new DateToReadableInstantConverter());
+		registry.addConverter(new CalendarToReadableInstantConverter());
 	}
 
 
-	/**
-	 * Used when binding a parsed DateTime to a LocalDate field.
-	 * @see DateTimeParser
-	 **/
 	private static class DateTimeToLocalDateConverter implements Converter<DateTime, LocalDate> {
+
 		public LocalDate convert(DateTime source) {
 			return source.toLocalDate();
 		}
 	}
 
-	/**
-	 * Used when binding a parsed DateTime to a LocalTime field.
-	 * @see DateTimeParser
-	 */
+
 	private static class DateTimeToLocalTimeConverter implements Converter<DateTime, LocalTime> {
+
 		public LocalTime convert(DateTime source) {
 			return source.toLocalTime();
 		}
 	}
 
-	/**
-	 * Used when binding a parsed DateTime to a LocalDateTime field.
-	 * @see DateTimeParser
-	 */
+
 	private static class DateTimeToLocalDateTimeConverter implements Converter<DateTime, LocalDateTime> {
+
 		public LocalDateTime convert(DateTime source) {
 			return source.toLocalDateTime();
 		}
 	}
 
-	/**
-	 * Used when binding a parsed DateTime to a DateMidnight field.
-	 * @see DateTimeParser
-	 */
+
 	private static class DateTimeToDateMidnightConverter implements Converter<DateTime, DateMidnight> {
+
 		public DateMidnight convert(DateTime source) {
 			return source.toDateMidnight();
 		}
 	}
 
-	/**
-	 * Used when binding a parsed DateTime to an Instant field.
-	 * @see DateTimeParser
-	 */
-	private static class DateTimeToInstantConverter implements Converter<DateTime, Instant> {
-		public Instant convert(DateTime source) {
-			return source.toInstant();
-		}
-	}
 
-	/**
-	 * Used when binding a parsed DateTime to a MutableDateTime field.
-	 * @see DateTimeParser
-	 */
 	private static class DateTimeToMutableDateTimeConverter implements Converter<DateTime, MutableDateTime> {
+
 		public MutableDateTime convert(DateTime source) {
 			return source.toMutableDateTime();
 		}
 	}
 
-	/**
-	 * Used when binding a parsed DateTime to a java.util.Date field.
-	 * @see DateTimeParser
-	 */
+
+	private static class DateTimeToInstantConverter implements Converter<DateTime, Instant> {
+
+		public Instant convert(DateTime source) {
+			return source.toInstant();
+		}
+	}
+
+
 	private static class DateTimeToDateConverter implements Converter<DateTime, Date> {
+
 		public Date convert(DateTime source) {
 			return source.toDate();
 		}
 	}
 
-	/**
-	 * Used when binding a parsed DateTime to a java.util.Calendar field.
-	 * @see DateTimeParser
-	 */
+
 	private static class DateTimeToCalendarConverter implements Converter<DateTime, Calendar> {
+
 		public Calendar convert(DateTime source) {
 			return source.toGregorianCalendar();
 		}
 	}
 
-	/**
-	 * Used when binding a parsed DateTime to a java.lang.Long field.
-	 * @see DateTimeParser
-	 */
+
 	private static class DateTimeToLongConverter implements Converter<DateTime, Long> {
+
 		public Long convert(DateTime source) {
 			return source.getMillis();
 		}
 	}
 
+
 	/**
-	 * Used when printing a java.util.Calendar field with a ReadableInstantPrinter.
+	 * Used when printing a java.util.Date field with a ReadableInstantPrinter.
 	 * @see MillisecondInstantPrinter
 	 * @see JodaDateTimeFormatAnnotationFormatterFactory
 	 */
-	private static class CalendarToReadableInstantConverter implements Converter<Calendar, ReadableInstant> {
-		public ReadableInstant convert(Calendar source) {
+	private static class DateToReadableInstantConverter implements Converter<Date, ReadableInstant> {
+
+		public ReadableInstant convert(Date source) {
 			return new DateTime(source);
 		}
 	}
 
+
 	/**
-	 * Used when printing a java.util.Date field with a ReadableInstantPrinter.
+	 * Used when printing a java.util.Calendar field with a ReadableInstantPrinter.
 	 * @see MillisecondInstantPrinter
 	 * @see JodaDateTimeFormatAnnotationFormatterFactory
 	 */
-	private static class DateToReadableInstantConverter implements Converter<Date, ReadableInstant> {
-		public ReadableInstant convert(Date source) {
+	private static class CalendarToReadableInstantConverter implements Converter<Calendar, ReadableInstant> {
+
+		public ReadableInstant convert(Calendar source) {
 			return new DateTime(source);
 		}
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
index 7ad1a4e62e..a0f385123e 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormatterRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.format.datetime.joda;
 
 import java.util.Calendar;
@@ -35,7 +36,7 @@
 import org.springframework.format.annotation.DateTimeFormat.ISO;
 
 /**
- * Configures Joda Time's formatting system for use with Spring.
+ * Configures Joda-Time's formatting system for use with Spring.
  *
  * @author Keith Donald
  * @author Juergen Hoeller
@@ -51,15 +52,18 @@
  */
 public class JodaTimeFormatterRegistrar implements FormatterRegistrar {
 
+	private static enum Type {DATE, TIME, DATE_TIME}
+
+
 	/**
 	 * User defined formatters.
 	 */
-	private Map<Type, DateTimeFormatter> formatters = new HashMap<Type, DateTimeFormatter>();
+	private final Map<Type, DateTimeFormatter> formatters = new HashMap<Type, DateTimeFormatter>();
 
 	/**
 	 * Factories used when specific formatters have not been specified.
 	 */
-	private Map<Type, DateTimeFormatterFactory> factories;
+	private final Map<Type, DateTimeFormatterFactory> factories;
 
 
 	public JodaTimeFormatterRegistrar() {
@@ -70,12 +74,24 @@ public JodaTimeFormatterRegistrar() {
 	}
 
 
+	/**
+	 * Set whether standard ISO formatting should be applied to all date/time types.
+	 * Default is "false" (no).
+	 * <p>If set to "true", the "dateStyle", "timeStyle" and "dateTimeStyle"
+	 * properties are effectively ignored.
+	 */
+	public void setUseIsoFormat(boolean useIsoFormat) {
+		this.factories.get(Type.DATE).setIso(useIsoFormat ? ISO.DATE : null);
+		this.factories.get(Type.TIME).setIso(useIsoFormat ? ISO.TIME : null);
+		this.factories.get(Type.DATE_TIME).setIso(useIsoFormat ? ISO.DATE_TIME : null);
+	}
+
 	/**
 	 * Set the default format style of Joda {@link LocalDate} objects.
 	 * Default is {@link DateTimeFormat#shortDate()}.
 	 */
 	public void setDateStyle(String dateStyle) {
-		this.factories.get(Type.DATE).setStyle(dateStyle+"-");
+		this.factories.get(Type.DATE).setStyle(dateStyle + "-");
 	}
 
 	/**
@@ -83,7 +99,7 @@ public void setDateStyle(String dateStyle) {
 	 * Default is {@link DateTimeFormat#shortTime()}.
 	 */
 	public void setTimeStyle(String timeStyle) {
-		this.factories.get(Type.TIME).setStyle("-"+timeStyle);
+		this.factories.get(Type.TIME).setStyle("-" + timeStyle);
 	}
 
 	/**
@@ -95,25 +111,14 @@ public void setDateTimeStyle(String dateTimeStyle) {
 		this.factories.get(Type.DATE_TIME).setStyle(dateTimeStyle);
 	}
 
-	/**
-	 * Set whether standard ISO formatting should be applied to all Date/Time types.
-	 * Default is false (no).
-	 * If set to true, the dateStyle, timeStyle, and dateTimeStyle properties are ignored.
-	 */
-	public void setUseIsoFormat(boolean useIsoFormat) {
-		this.factories.get(Type.DATE).setIso(useIsoFormat ? ISO.DATE : null);
-		this.factories.get(Type.TIME).setIso(useIsoFormat ? ISO.TIME : null);
-		this.factories.get(Type.DATE_TIME).setIso(useIsoFormat ? ISO.DATE_TIME : null);
-	}
-
 	/**
 	 * Set the formatter that will be used for objects representing date values.
 	 * <p>This formatter will be used for the {@link LocalDate} type. When specified
 	 * the {@link #setDateStyle(String) dateStyle} and
 	 * {@link #setUseIsoFormat(boolean) useIsoFormat} properties will be ignored.
 	 * @param formatter the formatter to use
-	 * @see #setTimeFormatter(DateTimeFormatter)
-	 * @see #setDateTimeFormatter(DateTimeFormatter)
+	 * @see #setTimeFormatter
+	 * @see #setDateTimeFormatter
 	 * @since 3.2
 	 */
 	public void setDateFormatter(DateTimeFormatter formatter) {
@@ -126,8 +131,8 @@ public void setDateFormatter(DateTimeFormatter formatter) {
 	 * the {@link #setTimeStyle(String) timeStyle} and
 	 * {@link #setUseIsoFormat(boolean) useIsoFormat} properties will be ignored.
 	 * @param formatter the formatter to use
-	 * @see #setDateFormatter(DateTimeFormatter)
-	 * @see #setDateTimeFormatter(DateTimeFormatter)
+	 * @see #setDateFormatter
+	 * @see #setDateTimeFormatter
 	 * @since 3.2
 	 */
 	public void setTimeFormatter(DateTimeFormatter formatter) {
@@ -141,14 +146,15 @@ public void setTimeFormatter(DateTimeFormatter formatter) {
 	 * the {@link #setDateTimeStyle(String) dateTimeStyle} and
 	 * {@link #setUseIsoFormat(boolean) useIsoFormat} properties will be ignored.
 	 * @param formatter the formatter to use
-	 * @see #setDateFormatter(DateTimeFormatter)
-	 * @see #setTimeFormatter(DateTimeFormatter)
+	 * @see #setDateFormatter
+	 * @see #setTimeFormatter
 	 * @since 3.2
 	 */
 	public void setDateTimeFormatter(DateTimeFormatter formatter) {
 		this.formatters.put(Type.DATE_TIME, formatter);
 	}
 
+
 	public void registerFormatters(FormatterRegistry registry) {
 		JodaTimeConverters.registerConverters(registry);
 
@@ -176,26 +182,25 @@ public void registerFormatters(FormatterRegistry registry) {
 				new DateTimeParser(dateTimeFormatter),
 				ReadableInstant.class);
 
-		// In order to retain back compatibility we only register Date/Calendar
+		// In order to retain backwards compatibility we only register Date/Calendar
 		// types when a user defined formatter is specified (see SPR-10105)
-		if(this.formatters.containsKey(Type.DATE_TIME)) {
+		if (this.formatters.containsKey(Type.DATE_TIME)) {
 			addFormatterForFields(registry,
 					new ReadableInstantPrinter(dateTimeFormatter),
 					new DateTimeParser(dateTimeFormatter),
 					Date.class, Calendar.class);
 		}
 
-		registry.addFormatterForFieldAnnotation(
-				new JodaDateTimeFormatAnnotationFormatterFactory());
+		registry.addFormatterForFieldAnnotation(new JodaDateTimeFormatAnnotationFormatterFactory());
 	}
 
 	private DateTimeFormatter getFormatter(Type type) {
 		DateTimeFormatter formatter = this.formatters.get(type);
-		if(formatter != null) {
+		if (formatter != null) {
 			return formatter;
 		}
 		DateTimeFormatter fallbackFormatter = getFallbackFormatter(type);
-		return this.factories.get(type).createDateTimeFormatter(fallbackFormatter );
+		return this.factories.get(type).createDateTimeFormatter(fallbackFormatter);
 	}
 
 	private DateTimeFormatter getFallbackFormatter(Type type) {
@@ -208,10 +213,10 @@ private DateTimeFormatter getFallbackFormatter(Type type) {
 
 	private void addFormatterForFields(FormatterRegistry registry, Printer<?> printer,
 			Parser<?> parser, Class<?>... fieldTypes) {
+
 		for (Class<?> fieldType : fieldTypes) {
 			registry.addFormatterForFieldType(fieldType, printer, parser);
 		}
 	}
 
-	private static enum Type {DATE, TIME, DATE_TIME}
 }
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java
index 29867fba1b..857da5300a 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Integration with the Joda Time for formatting Joda types as well as standard JDK Date types.
+ * Integration with Joda-Time for formatting Joda date and time types as well as standard JDK Date types.
  */
 package org.springframework.format.datetime.joda;
diff --git a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java
index 7c5fceaed5..7e95c4b42c 100644
--- a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java
+++ b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -85,7 +85,7 @@ public void addFormatterForFieldType(Class<?> fieldType, Printer<?> printer, Par
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void addFormatterForFieldAnnotation(AnnotationFormatterFactory annotationFormatterFactory) {
-		final Class<? extends Annotation> annotationType = (Class<? extends Annotation>)
+		Class<? extends Annotation> annotationType = (Class<? extends Annotation>)
 				GenericTypeResolver.resolveTypeArgument(annotationFormatterFactory.getClass(), AnnotationFormatterFactory.class);
 		if (annotationType == null) {
 			throw new IllegalArgumentException("Unable to extract parameterized Annotation type argument from AnnotationFormatterFactory [" +
@@ -95,7 +95,7 @@ public void addFormatterForFieldAnnotation(AnnotationFormatterFactory annotation
 			((EmbeddedValueResolverAware) annotationFormatterFactory).setEmbeddedValueResolver(this.embeddedValueResolver);
 		}
 		Set<Class<?>> fieldTypes = annotationFormatterFactory.getFieldTypes();
-		for (final Class<?> fieldType : fieldTypes) {
+		for (Class<?> fieldType : fieldTypes) {
 			addConverter(new AnnotationPrinterConverter(annotationType, annotationFormatterFactory, fieldType));
 			addConverter(new AnnotationParserConverter(annotationType, annotationFormatterFactory, fieldType));
 		}
@@ -104,14 +104,14 @@ public void addFormatterForFieldAnnotation(AnnotationFormatterFactory annotation
 
 	private static class PrinterConverter implements GenericConverter {
 
-		private Class<?> fieldType;
+		private final Class<?> fieldType;
 
-		private TypeDescriptor printerObjectType;
+		private final TypeDescriptor printerObjectType;
 
 		@SuppressWarnings("rawtypes")
-		private Printer printer;
+		private final Printer printer;
 
-		private ConversionService conversionService;
+		private final ConversionService conversionService;
 
 		public PrinterConverter(Class<?> fieldType, Printer<?> printer, ConversionService conversionService) {
 			this.fieldType = fieldType;
@@ -139,6 +139,7 @@ private Class<?> resolvePrinterObjectType(Printer<?> printer) {
 			return GenericTypeResolver.resolveTypeArgument(printer.getClass(), Printer.class);
 		}
 
+		@Override
 		public String toString() {
 			return this.fieldType.getName() + " -> " + String.class.getName() + " : " + this.printer;
 		}
@@ -147,11 +148,11 @@ public String toString() {
 
 	private static class ParserConverter implements GenericConverter {
 
-		private Class<?> fieldType;
+		private final Class<?> fieldType;
 
-		private Parser<?> parser;
+		private final Parser<?> parser;
 
-		private ConversionService conversionService;
+		private final ConversionService conversionService;
 
 		public ParserConverter(Class<?> fieldType, Parser<?> parser, ConversionService conversionService) {
 			this.fieldType = fieldType;
@@ -185,6 +186,7 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 			return result;
 		}
 
+		@Override
 		public String toString() {
 			return String.class.getName() + " -> " + this.fieldType.getName() + ": " + this.parser;
 		}
@@ -193,55 +195,56 @@ public String toString() {
 
 	private class AnnotationPrinterConverter implements ConditionalGenericConverter {
 
-		private Class<? extends Annotation> annotationType;
+		private final Class<? extends Annotation> annotationType;
 
-        private AnnotationFormatterFactory annotationFormatterFactory;
+		private final AnnotationFormatterFactory annotationFormatterFactory;
 
-		private Class<?> fieldType;
+		private final Class<?> fieldType;
 
 		public AnnotationPrinterConverter(Class<? extends Annotation> annotationType,
-				AnnotationFormatterFactory annotationFormatterFactory, Class<?> fieldType) {
+				AnnotationFormatterFactory<?> annotationFormatterFactory, Class<?> fieldType) {
 			this.annotationType = annotationType;
 			this.annotationFormatterFactory = annotationFormatterFactory;
 			this.fieldType = fieldType;
 		}
 
 		public Set<ConvertiblePair> getConvertibleTypes() {
-			return Collections.singleton(new ConvertiblePair(fieldType, String.class));
+			return Collections.singleton(new ConvertiblePair(this.fieldType, String.class));
 		}
 
 		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
-			return sourceType.hasAnnotation(annotationType);
+			return sourceType.hasAnnotation(this.annotationType);
 		}
 
 		@SuppressWarnings("unchecked")
 		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			AnnotationConverterKey converterKey =
-					new AnnotationConverterKey(sourceType.getAnnotation(annotationType), sourceType.getObjectType());
+					new AnnotationConverterKey(sourceType.getAnnotation(this.annotationType), sourceType.getObjectType());
 			GenericConverter converter = cachedPrinters.get(converterKey);
 			if (converter == null) {
-				Printer<?> printer = annotationFormatterFactory.getPrinter(
+				Printer<?> printer = this.annotationFormatterFactory.getPrinter(
 						converterKey.getAnnotation(), converterKey.getFieldType());
-				converter = new PrinterConverter(fieldType, printer, FormattingConversionService.this);
+				converter = new PrinterConverter(this.fieldType, printer, FormattingConversionService.this);
 				cachedPrinters.put(converterKey, converter);
 			}
 			return converter.convert(source, sourceType, targetType);
 		}
 
+		@Override
 		public String toString() {
-			return "@" + annotationType.getName() + " " + fieldType.getName() + " -> " +
-					String.class.getName() + ": " + annotationFormatterFactory;
+			return "@" + this.annotationType.getName() + " " + this.fieldType.getName() + " -> " +
+					String.class.getName() + ": " + this.annotationFormatterFactory;
 		}
 	}
 
 
 	private class AnnotationParserConverter implements ConditionalGenericConverter {
 
-		private Class<? extends Annotation> annotationType;
+		private final Class<? extends Annotation> annotationType;
 
-		private AnnotationFormatterFactory annotationFormatterFactory;
+		private final AnnotationFormatterFactory annotationFormatterFactory;
 
-		private Class<?> fieldType;
+		private final Class<?> fieldType;
 
 		public AnnotationParserConverter(Class<? extends Annotation> annotationType,
 				AnnotationFormatterFactory<?> annotationFormatterFactory, Class<?> fieldType) {
@@ -255,26 +258,27 @@ public Set<ConvertiblePair> getConvertibleTypes() {
 		}
 
 		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
-			return targetType.hasAnnotation(annotationType);
+			return targetType.hasAnnotation(this.annotationType);
 		}
 
 		@SuppressWarnings("unchecked")
 		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			AnnotationConverterKey converterKey =
-					new AnnotationConverterKey(targetType.getAnnotation(annotationType), targetType.getObjectType());
+					new AnnotationConverterKey(targetType.getAnnotation(this.annotationType), targetType.getObjectType());
 			GenericConverter converter = cachedParsers.get(converterKey);
 			if (converter == null) {
-				Parser<?> parser = annotationFormatterFactory.getParser(
+				Parser<?> parser = this.annotationFormatterFactory.getParser(
 						converterKey.getAnnotation(), converterKey.getFieldType());
-				converter = new ParserConverter(fieldType, parser, FormattingConversionService.this);
+				converter = new ParserConverter(this.fieldType, parser, FormattingConversionService.this);
 				cachedParsers.put(converterKey, converter);
 			}
 			return converter.convert(source, sourceType, targetType);
 		}
 
+		@Override
 		public String toString() {
-			return String.class.getName() + " -> @" + annotationType.getName() + " " +
-					fieldType.getName() + ": " + annotationFormatterFactory;
+			return String.class.getName() + " -> @" + this.annotationType.getName() + " " +
+					this.fieldType.getName() + ": " + this.annotationFormatterFactory;
 		}
 	}
 
@@ -291,23 +295,28 @@ public AnnotationConverterKey(Annotation annotation, Class<?> fieldType) {
 		}
 
 		public Annotation getAnnotation() {
-			return annotation;
+			return this.annotation;
 		}
 
 		public Class<?> getFieldType() {
-			return fieldType;
+			return this.fieldType;
 		}
 
-		public boolean equals(Object o) {
-			if (!(o instanceof AnnotationConverterKey)) {
+		@Override
+		public boolean equals(Object other) {
+			if (this == other) {
+				return true;
+			}
+			if (!(other instanceof AnnotationConverterKey)) {
 				return false;
 			}
-			AnnotationConverterKey key = (AnnotationConverterKey) o;
-			return this.annotation.equals(key.annotation) && this.fieldType.equals(key.fieldType);
+			AnnotationConverterKey otherKey = (AnnotationConverterKey) other;
+			return (this.annotation.equals(otherKey.annotation) && this.fieldType.equals(otherKey.fieldType));
 		}
 
+		@Override
 		public int hashCode() {
-			return this.annotation.hashCode() + 29 * this.fieldType.hashCode();
+			return (this.annotation.hashCode() + 29 * this.fieldType.hashCode());
 		}
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java
index 14d1beeb8a..d1f5187bbb 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,15 +98,14 @@ public ReflectiveLoadTimeWeaver(ClassLoader classLoader) {
 		this.classLoader = classLoader;
 		this.addTransformerMethod = ClassUtils.getMethodIfAvailable(
 				this.classLoader.getClass(), ADD_TRANSFORMER_METHOD_NAME,
-				new Class [] {ClassFileTransformer.class});
+				new Class[] {ClassFileTransformer.class});
 		if (this.addTransformerMethod == null) {
 			throw new IllegalStateException(
 					"ClassLoader [" + classLoader.getClass().getName() + "] does NOT provide an " +
 					"'addTransformer(ClassFileTransformer)' method.");
 		}
 		this.getThrowawayClassLoaderMethod = ClassUtils.getMethodIfAvailable(
-				this.classLoader.getClass(), GET_THROWAWAY_CLASS_LOADER_METHOD_NAME,
-				new Class[0]);
+				this.classLoader.getClass(), GET_THROWAWAY_CLASS_LOADER_METHOD_NAME, new Class[0]);
 		// getThrowawayClassLoader method is optional
 		if (this.getThrowawayClassLoaderMethod == null) {
 			if (logger.isInfoEnabled()) {
@@ -119,7 +118,7 @@ public ReflectiveLoadTimeWeaver(ClassLoader classLoader) {
 
 	public void addTransformer(ClassFileTransformer transformer) {
 		Assert.notNull(transformer, "Transformer must not be null");
-		ReflectionUtils.invokeMethod(this.addTransformerMethod, this.classLoader, new Object[] {transformer});
+		ReflectionUtils.invokeMethod(this.addTransformerMethod, this.classLoader, transformer);
 	}
 
 	public ClassLoader getInstrumentableClassLoader() {
@@ -128,11 +127,11 @@ public ClassLoader getInstrumentableClassLoader() {
 
 	public ClassLoader getThrowawayClassLoader() {
 		if (this.getThrowawayClassLoaderMethod != null) {
-			return (ClassLoader) ReflectionUtils.invokeMethod(this.getThrowawayClassLoaderMethod, this.classLoader,
-					new Object[0]);
+			return (ClassLoader) ReflectionUtils.invokeMethod(this.getThrowawayClassLoaderMethod, this.classLoader);
 		}
 		else {
 			return new SimpleThrowawayClassLoader(this.classLoader);
 		}
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java
index 5967740664..96b57f5c37 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,10 +39,11 @@ class WebLogicClassPreProcessorAdapter implements InvocationHandler {
 
 	private final ClassLoader loader;
 
+
 	/**
 	 * Creates a new {@link WebLogicClassPreProcessorAdapter}.
-	 * @param transformer the {@link ClassFileTransformer} to be adapted (must
-	 * not be {@code null})
+	 * @param transformer the {@link ClassFileTransformer} to be adapted
+	 * (must not be {@code null})
 	 */
 	public WebLogicClassPreProcessorAdapter(ClassFileTransformer transformer, ClassLoader loader) {
 		this.transformer = transformer;
@@ -51,40 +52,43 @@ public WebLogicClassPreProcessorAdapter(ClassFileTransformer transformer, ClassL
 
 	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 		String name = method.getName();
-
 		if ("equals".equals(name)) {
-			return (Boolean.valueOf(proxy == args[0]));
-		} else if ("hashCode".equals(name)) {
+			return (proxy == args[0]);
+		}
+		else if ("hashCode".equals(name)) {
 			return hashCode();
-		} else if ("toString".equals(name)) {
+		}
+		else if ("toString".equals(name)) {
 			return toString();
-		} else if ("initialize".equals(name)) {
-			initialize((Hashtable) args[0]);
+		}
+		else if ("initialize".equals(name)) {
+			initialize((Hashtable<?, ?>) args[0]);
 			return null;
-		} else if ("preProcess".equals(name)) {
+		}
+		else if ("preProcess".equals(name)) {
 			return preProcess((String) args[0], (byte[]) args[1]);
-		} else {
+		}
+		else {
 			throw new IllegalArgumentException("Unknown method: " + method);
 		}
 	}
 
-	public void initialize(Hashtable params) {
+	public void initialize(Hashtable<?, ?> params) {
 	}
 
 	public byte[] preProcess(String className, byte[] classBytes) {
 		try {
 			byte[] result = this.transformer.transform(this.loader, className, null, null, classBytes);
 			return (result != null ? result : classBytes);
-		} catch (IllegalClassFormatException ex) {
+		}
+		catch (IllegalClassFormatException ex) {
 			throw new IllegalStateException("Cannot transform due to illegal class format", ex);
 		}
 	}
 
 	@Override
 	public String toString() {
-		StringBuilder builder = new StringBuilder(getClass().getName());
-		builder.append(" for transformer: ");
-		builder.append(this.transformer);
-		return builder.toString();
+		return getClass().getName() + " for transformer: " + this.transformer;
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java
index 36894535ed..158d0f75bc 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,7 +107,7 @@ public class MBeanClientInterceptor
 
 	private boolean useStrictCasing = true;
 
-	private Class managementInterface;
+	private Class<?> managementInterface;
 
 	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
 
@@ -215,7 +215,7 @@ public void setUseStrictCasing(boolean useStrictCasing) {
 	 * setters and getters for MBean attributes and conventional Java methods
 	 * for MBean operations.
 	 */
-	public void setManagementInterface(Class managementInterface) {
+	public void setManagementInterface(Class<?> managementInterface) {
 		this.managementInterface = managementInterface;
 	}
 
@@ -223,7 +223,7 @@ public void setManagementInterface(Class managementInterface) {
 	 * Return the management interface of the target MBean,
 	 * or {@code null} if none specified.
 	 */
-	protected final Class getManagementInterface() {
+	protected final Class<?> getManagementInterface() {
 		return this.managementInterface;
 	}
 
@@ -262,7 +262,7 @@ public void prepare() {
 			this.invocationHandler = null;
 			if (this.useStrictCasing) {
 				// Use the JDK's own MBeanServerInvocationHandler,
-				// in particular for native MXBean support on Java 6.
+				// in particular for native MXBean support on Java 6+.
 				if (JmxUtils.isMXBeanSupportAvailable()) {
 					this.invocationHandler =
 							new MBeanServerInvocationHandler(this.serverToUse, this.objectName,
@@ -297,7 +297,7 @@ private void retrieveMBeanInfo() throws MBeanInfoRetrievalException {
 			MBeanOperationInfo[] operationInfo = info.getOperations();
 			this.allowedOperations = new HashMap<MethodCacheKey, MBeanOperationInfo>(operationInfo.length);
 			for (MBeanOperationInfo infoEle : operationInfo) {
-				Class[] paramTypes = JmxUtils.parameterInfoToTypes(infoEle.getSignature(), this.beanClassLoader);
+				Class<?>[] paramTypes = JmxUtils.parameterInfoToTypes(infoEle.getSignature(), this.beanClassLoader);
 				this.allowedOperations.put(new MethodCacheKey(infoEle.getName(), paramTypes), infoEle);
 			}
 		}
@@ -531,7 +531,7 @@ private Object invokeOperation(Method method, Object[] args) throws JMException,
 	 * is necessary
 	 */
 	protected Object convertResultValueIfNecessary(Object result, MethodParameter parameter) {
-		Class targetClass = parameter.getParameterType();
+		Class<?> targetClass = parameter.getParameterType();
 		try {
 			if (result == null) {
 				return null;
@@ -549,7 +549,7 @@ else if (result instanceof CompositeData[]) {
 					return convertDataArrayToTargetArray(array, targetClass);
 				}
 				else if (Collection.class.isAssignableFrom(targetClass)) {
-					Class elementType = GenericCollectionTypeResolver.getCollectionParameterType(parameter);
+					Class<?> elementType = GenericCollectionTypeResolver.getCollectionParameterType(parameter);
 					if (elementType != null) {
 						return convertDataArrayToTargetCollection(array, targetClass, elementType);
 					}
@@ -565,7 +565,7 @@ else if (result instanceof TabularData[]) {
 					return convertDataArrayToTargetArray(array, targetClass);
 				}
 				else if (Collection.class.isAssignableFrom(targetClass)) {
-					Class elementType = GenericCollectionTypeResolver.getCollectionParameterType(parameter);
+					Class<?> elementType = GenericCollectionTypeResolver.getCollectionParameterType(parameter);
 					if (elementType != null) {
 						return convertDataArrayToTargetCollection(array, targetClass, elementType);
 					}
@@ -581,8 +581,8 @@ else if (Collection.class.isAssignableFrom(targetClass)) {
 		}
 	}
 
-	private Object convertDataArrayToTargetArray(Object[] array, Class targetClass) throws NoSuchMethodException {
-		Class targetType = targetClass.getComponentType();
+	private Object convertDataArrayToTargetArray(Object[] array, Class<?> targetClass) throws NoSuchMethodException {
+		Class<?> targetType = targetClass.getComponentType();
 		Method fromMethod = targetType.getMethod("from", array.getClass().getComponentType());
 		Object resultArray = Array.newInstance(targetType, array.length);
 		for (int i = 0; i < array.length; i++) {
@@ -592,11 +592,11 @@ private Object convertDataArrayToTargetArray(Object[] array, Class targetClass)
 	}
 
 	@SuppressWarnings("unchecked")
-	private Collection convertDataArrayToTargetCollection(Object[] array, Class collectionType, Class elementType)
+	private Collection<?> convertDataArrayToTargetCollection(Object[] array, Class<?> collectionType, Class<?> elementType)
 			throws NoSuchMethodException {
 
 		Method fromMethod = elementType.getMethod("from", array.getClass().getComponentType());
-		Collection resultColl = CollectionFactory.createCollection(collectionType, Array.getLength(array));
+		Collection<Object> resultColl = CollectionFactory.createCollection(collectionType, Array.getLength(array));
 		for (int i = 0; i < array.length; i++) {
 			resultColl.add(ReflectionUtils.invokeMethod(fromMethod, null, array[i]));
 		}
@@ -608,6 +608,7 @@ public void destroy() {
 		this.connector.close();
 	}
 
+
 	/**
 	 * Simple wrapper class around a method name and its signature.
 	 * Used as the key when caching methods.
@@ -616,7 +617,7 @@ private static class MethodCacheKey {
 
 		private final String name;
 
-		private final Class[] parameterTypes;
+		private final Class<?>[] parameterTypes;
 
 		/**
 		 * Create a new instance of {@code MethodCacheKey} with the supplied
@@ -624,9 +625,9 @@ private static class MethodCacheKey {
 		 * @param name the name of the method
 		 * @param parameterTypes the arguments in the method signature
 		 */
-		public MethodCacheKey(String name, Class[] parameterTypes) {
+		public MethodCacheKey(String name, Class<?>[] parameterTypes) {
 			this.name = name;
-			this.parameterTypes = (parameterTypes != null ? parameterTypes : new Class[0]);
+			this.parameterTypes = (parameterTypes != null ? parameterTypes : new Class<?>[0]);
 		}
 
 		@Override
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
index 9e94a66df3..5c9ed67755 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,8 +96,8 @@
  * @see org.springframework.jmx.export.assembler.MBeanInfoAssembler
  * @see MBeanExporterListener
  */
-public class MBeanExporter extends MBeanRegistrationSupport
-		implements MBeanExportOperations, BeanClassLoaderAware, BeanFactoryAware, InitializingBean, DisposableBean {
+public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExportOperations,
+		BeanClassLoaderAware, BeanFactoryAware, InitializingBean, DisposableBean {
 
 	/**
 	 * Autodetection mode indicating that no autodetection should be used.
@@ -146,6 +146,12 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	/** Whether to eagerly initialize candidate beans when autodetecting MBeans */
 	private boolean allowEagerInit = false;
 
+	/** Stores the MBeanInfoAssembler to use for this exporter */
+	private MBeanInfoAssembler assembler = new SimpleReflectiveMBeanInfoAssembler();
+
+	/** The strategy to use for creating ObjectNames for an object */
+	private ObjectNamingStrategy namingStrategy = new KeyNamingStrategy();
+
 	/** Indicates whether Spring should modify generated ObjectNames */
 	private boolean ensureUniqueRuntimeObjectNames = true;
 
@@ -165,12 +171,6 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	private final Map<NotificationListenerBean, ObjectName[]> registeredNotificationListeners =
 			new LinkedHashMap<NotificationListenerBean, ObjectName[]>();
 
-	/** Stores the MBeanInfoAssembler to use for this exporter */
-	private MBeanInfoAssembler assembler = new SimpleReflectiveMBeanInfoAssembler();
-
-	/** The strategy to use for creating ObjectNames for an object */
-	private ObjectNamingStrategy namingStrategy = new KeyNamingStrategy();
-
 	/** Stores the ClassLoader to use for generating lazy-init proxies */
 	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
 
@@ -283,22 +283,6 @@ public void setNamingStrategy(ObjectNamingStrategy namingStrategy) {
 		this.namingStrategy = namingStrategy;
 	}
 
-	/**
-	 * Set the {@code MBeanExporterListener}s that should be notified
-	 * of MBean registration and unregistration events.
-	 * @see MBeanExporterListener
-	 */
-	public void setListeners(MBeanExporterListener[] listeners) {
-		this.listeners = listeners;
-	}
-
-	/**
-	 * Set the list of names for beans that should be excluded from autodetection.
-	 */
-	public void setExcludedBeans(String[] excludedBeans) {
-		this.excludedBeans = (excludedBeans != null ? new HashSet<String>(Arrays.asList(excludedBeans)) : null);
-	}
-
 	/**
 	 * Indicates whether Spring should ensure that {@link ObjectName ObjectNames}
 	 * generated by the configured {@link ObjectNamingStrategy} for
@@ -324,6 +308,22 @@ public void setExposeManagedResourceClassLoader(boolean exposeManagedResourceCla
 		this.exposeManagedResourceClassLoader = exposeManagedResourceClassLoader;
 	}
 
+	/**
+	 * Set the list of names for beans that should be excluded from autodetection.
+	 */
+	public void setExcludedBeans(String... excludedBeans) {
+		this.excludedBeans = (excludedBeans != null ? new HashSet<String>(Arrays.asList(excludedBeans)) : null);
+	}
+
+	/**
+	 * Set the {@code MBeanExporterListener}s that should be notified
+	 * of MBean registration and unregistration events.
+	 * @see MBeanExporterListener
+	 */
+	public void setListeners(MBeanExporterListener... listeners) {
+		this.listeners = listeners;
+	}
+
 	/**
 	 * Set the {@link NotificationListenerBean NotificationListenerBeans}
 	 * containing the
@@ -332,7 +332,7 @@ public void setExposeManagedResourceClassLoader(boolean exposeManagedResourceCla
 	 * @see #setNotificationListenerMappings(java.util.Map)
 	 * @see NotificationListenerBean
 	 */
-	public void setNotificationListeners(NotificationListenerBean[] notificationListeners) {
+	public void setNotificationListeners(NotificationListenerBean... notificationListeners) {
 		this.notificationListeners = notificationListeners;
 	}
 
@@ -398,16 +398,17 @@ public void setBeanFactory(BeanFactory beanFactory) {
 	//---------------------------------------------------------------------
 
 	/**
-	 * Start bean registration automatically when deployed in an
+	 * Kick off bean registration automatically when deployed in an
 	 * {@code ApplicationContext}.
 	 * @see #registerBeans()
 	 */
 	public void afterPropertiesSet() {
 		// If no server was provided then try to find one. This is useful in an environment
-		// such as JDK 1.5, Tomcat or JBoss where there is already an MBeanServer loaded.
+		// where there is already an MBeanServer loaded.
 		if (this.server == null) {
 			this.server = JmxUtils.locateMBeanServer();
 		}
+
 		try {
 			logger.info("Registering beans for JMX exposure on startup");
 			registerBeans();
@@ -445,7 +446,7 @@ public ObjectName registerManagedResource(Object managedResource) throws MBeanEx
 				objectName = JmxUtils.appendIdentityToObjectName(objectName, managedResource);
 			}
 		}
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			throw new MBeanExportException("Unable to generate ObjectName for MBean [" + managedResource + "]", ex);
 		}
 		registerManagedResource(managedResource, objectName);
@@ -512,7 +513,7 @@ protected void registerBeans() {
 			}
 			if (mode == AUTODETECT_MBEAN || mode == AUTODETECT_ALL) {
 				// Autodetect any beans that are already MBeans.
-				this.logger.debug("Autodetecting user-defined JMX MBeans");
+				logger.debug("Autodetecting user-defined JMX MBeans");
 				autodetectMBeans();
 			}
 			// Allow the assembler a chance to vote for bean inclusion.
@@ -547,7 +548,7 @@ protected boolean isBeanDefinitionLazyInit(ListableBeanFactory beanFactory, Stri
 	 * should be exposed to the {@code MBeanServer}. Specifically, if the
 	 * supplied {@code mapValue} is the name of a bean that is configured
 	 * for lazy initialization, then a proxy to the resource is registered with
-	 * the {@code MBeanServer} so that the the lazy load behavior is
+	 * the {@code MBeanServer} so that the lazy load behavior is
 	 * honored. If the bean is already an MBean then it will be registered
 	 * directly with the {@code MBeanServer} without any intervention. For
 	 * all other beans or bean names, the resource itself is registered with
@@ -555,7 +556,8 @@ protected boolean isBeanDefinitionLazyInit(ListableBeanFactory beanFactory, Stri
 	 * @param mapValue the value configured for this bean in the beans map;
 	 * may be either the {@code String} name of a bean, or the bean itself
 	 * @param beanKey the key associated with this bean in the beans map
-	 * @return the {@code ObjectName} under which the resource was registered
+	 * @return the {@code ObjectName} under which the resource was registered,
+	 * or {@code null} if the actual resource was {@code null} as well
 	 * @throws MBeanExportException if the export failed
 	 * @see #setBeans
 	 * @see #registerBeanInstance
@@ -576,12 +578,14 @@ protected ObjectName registerBeanNameOrInstance(Object mapValue, String beanKey)
 				}
 				else {
 					Object bean = this.beanFactory.getBean(beanName);
-					ObjectName objectName = registerBeanInstance(bean, beanKey);
-					replaceNotificationListenerBeanNameKeysIfNecessary(beanName, objectName);
-					return objectName;
+					if (bean != null) {
+						ObjectName objectName = registerBeanInstance(bean, beanKey);
+						replaceNotificationListenerBeanNameKeysIfNecessary(beanName, objectName);
+						return objectName;
+					}
 				}
 			}
-			else {
+			else if (mapValue != null) {
 				// Plain bean instance -> register it directly.
 				if (this.beanFactory != null) {
 					Map<String, ?> beansOfSameType =
@@ -598,10 +602,11 @@ protected ObjectName registerBeanNameOrInstance(Object mapValue, String beanKey)
 				return registerBeanInstance(mapValue, beanKey);
 			}
 		}
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			throw new UnableToRegisterMBeanException(
 					"Unable to register MBean [" + mapValue + "] with key '" + beanKey + "'", ex);
 		}
+		return null;
 	}
 
 	/**
@@ -739,7 +744,7 @@ protected ObjectName getObjectName(Object bean, String beanKey) throws Malformed
 	 * @return whether the class qualifies as an MBean
 	 * @see org.springframework.jmx.support.JmxUtils#isMBean(Class)
 	 */
-	protected boolean isMBean(Class beanClass) {
+	protected boolean isMBean(Class<?> beanClass) {
 		return JmxUtils.isMBean(beanClass);
 	}
 
@@ -753,24 +758,24 @@ protected boolean isMBean(Class beanClass) {
 	 */
 	@SuppressWarnings("unchecked")
 	protected DynamicMBean adaptMBeanIfPossible(Object bean) throws JMException {
-		Class targetClass = AopUtils.getTargetClass(bean);
+		Class<?> targetClass = AopUtils.getTargetClass(bean);
 		if (targetClass != bean.getClass()) {
-			Class ifc = JmxUtils.getMXBeanInterface(targetClass);
+			Class<?> ifc = JmxUtils.getMXBeanInterface(targetClass);
 			if (ifc != null) {
-				if (!(ifc.isInstance(bean))) {
+				if (!ifc.isInstance(bean)) {
 					throw new NotCompliantMBeanException("Managed bean [" + bean +
 							"] has a target class with an MXBean interface but does not expose it in the proxy");
 				}
-				return new StandardMBean(bean, ifc, true);
+				return new StandardMBean(bean, ((Class<Object>) ifc), true);
 			}
 			else {
 				ifc = JmxUtils.getMBeanInterface(targetClass);
 				if (ifc != null) {
-					if (!(ifc.isInstance(bean))) {
+					if (!ifc.isInstance(bean)) {
 						throw new NotCompliantMBeanException("Managed bean [" + bean +
 								"] has a target class with an MBean interface but does not expose it in the proxy");
 					}
-					return new StandardMBean(bean, ifc);
+					return new StandardMBean(bean, ((Class<Object>) ifc));
 				}
 			}
 		}
@@ -793,7 +798,7 @@ protected ModelMBean createAndConfigureMBean(Object managedResource, String bean
 			mbean.setManagedResource(managedResource, MR_TYPE_OBJECT_REFERENCE);
 			return mbean;
 		}
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			throw new MBeanExportException("Could not create ModelMBean for managed resource [" +
 					managedResource + "] with key '" + beanKey + "'", ex);
 		}
@@ -840,7 +845,7 @@ private ModelMBeanInfo getMBeanInfo(Object managedBean, String beanKey) throws J
 	 */
 	private void autodetectBeans(final AutodetectCapableMBeanInfoAssembler assembler) {
 		autodetect(new AutodetectCallback() {
-			public boolean include(Class beanClass, String beanName) {
+			public boolean include(Class<?> beanClass, String beanName) {
 				return assembler.includeBean(beanClass, beanName);
 			}
 		});
@@ -852,7 +857,7 @@ public boolean include(Class beanClass, String beanName) {
 	 */
 	private void autodetectMBeans() {
 		autodetect(new AutodetectCallback() {
-			public boolean include(Class beanClass, String beanName) {
+			public boolean include(Class<?> beanClass, String beanName) {
 				return isMBean(beanClass);
 			}
 		});
@@ -874,7 +879,7 @@ private void autodetect(AutodetectCallback callback) {
 		for (String beanName : beanNames) {
 			if (!isExcluded(beanName) && !isBeanDefinitionAbstract(this.beanFactory, beanName)) {
 				try {
-					Class beanClass = this.beanFactory.getType(beanName);
+					Class<?> beanClass = this.beanFactory.getType(beanName);
 					if (beanClass != null && callback.include(beanClass, beanName)) {
 						boolean lazyInit = isBeanDefinitionLazyInit(this.beanFactory, beanName);
 						Object beanInstance = (!lazyInit ? this.beanFactory.getBean(beanName) : null);
@@ -959,7 +964,7 @@ private void registerNotificationListeners() throws MBeanExportException {
 						}
 					}
 				}
-				catch (Exception ex) {
+				catch (Throwable ex) {
 					throw new MBeanExportException("Unable to register NotificationListener", ex);
 				}
 			}
@@ -979,7 +984,7 @@ private void unregisterNotificationListeners() {
 					this.server.removeNotificationListener(mappedObjectName, bean.getNotificationListener(),
 							bean.getNotificationFilter(), bean.getHandback());
 				}
-				catch (Exception ex) {
+				catch (Throwable ex) {
 					if (logger.isDebugEnabled()) {
 						logger.debug("Unable to unregister NotificationListener", ex);
 					}
@@ -1060,7 +1065,7 @@ private static interface AutodetectCallback {
 		 * @param beanClass the class of the bean
 		 * @param beanName the name of the bean
 		 */
-		boolean include(Class beanClass, String beanName);
+		boolean include(Class<?> beanClass, String beanName);
 	}
 
 
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java
index 741932841d..1db53ae379 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java
@@ -141,7 +141,7 @@ public ManagedOperationParameter[] getManagedOperationParameters(Method method)
 
 	public ManagedNotification[] getManagedNotifications(Class<?> clazz) throws InvalidMetadataException {
 		ManagedNotifications notificationsAnn = clazz.getAnnotation(ManagedNotifications.class);
-		if(notificationsAnn == null) {
+		if (notificationsAnn == null) {
 			return new ManagedNotification[0];
 		}
 		Annotation[] notifications = notificationsAnn.value();
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java
index f953d9465c..90e95bd559 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java
@@ -434,7 +434,7 @@ protected ModelMBeanOperationInfo createModelMBeanOperationInfo(Method method, S
 	 * @see #getClassToExpose(Class)
 	 * @see org.springframework.aop.framework.AopProxyUtils#proxiedUserInterfaces(Object)
 	 */
-	protected Class getClassForDescriptor(Object managedBean) {
+	protected Class<?> getClassForDescriptor(Object managedBean) {
 		if (AopUtils.isJdkDynamicProxy(managedBean)) {
 			return AopProxyUtils.proxiedUserInterfaces(managedBean)[0];
 		}
@@ -514,7 +514,7 @@ protected MBeanParameterInfo[] getOperationParameters(Method method, String bean
 
 		MBeanParameterInfo[] info = new MBeanParameterInfo[paramNames.length];
 		Class<?>[] typeParameters = method.getParameterTypes();
-		for(int i = 0; i < info.length; i++) {
+		for (int i = 0; i < info.length; i++) {
 			info[i] = new MBeanParameterInfo(paramNames[i], typeParameters[i].getName(), paramNames[i]);
 		}
 
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java
index b75e956dab..a9d7bed62f 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java
@@ -151,7 +151,7 @@ protected boolean includeWriteAttribute(Method method, String beanKey) {
 	protected boolean includeOperation(Method method, String beanKey) {
 		PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);
 		if (pd != null) {
-			if(hasManagedAttribute(method)) {
+			if (hasManagedAttribute(method)) {
 				return true;
 			}
 		}
@@ -261,7 +261,7 @@ protected MBeanParameterInfo[] getOperationParameters(Method method, String bean
 		}
 
 		MBeanParameterInfo[] parameterInfo = new MBeanParameterInfo[params.length];
-		Class[] methodParameters = method.getParameterTypes();
+		Class<?>[] methodParameters = method.getParameterTypes();
 		for (int i = 0; i < params.length; i++) {
 			ManagedOperationParameter param = params[i];
 			parameterInfo[i] =
@@ -332,7 +332,7 @@ protected void populateMBeanDescriptor(Descriptor desc, Object managedBean, Stri
 	 */
 	@Override
 	protected void populateAttributeDescriptor(Descriptor desc, Method getter, Method setter, String beanKey) {
-		if(getter != null && hasManagedMetric(getter)) {
+		if (getter != null && hasManagedMetric(getter)) {
 			populateMetricDescriptor(desc, this.attributeSource.getManagedMetric(getter));
 		}
 		else {
@@ -374,11 +374,11 @@ private void populateMetricDescriptor(Descriptor desc, ManagedMetric metric) {
 			desc.setField(FIELD_DISPLAY_NAME, metric.getDisplayName());
 		}
 
-		if(StringUtils.hasLength(metric.getUnit())) {
+		if (StringUtils.hasLength(metric.getUnit())) {
 			desc.setField(FIELD_UNITS, metric.getUnit());
 		}
 
-		if(StringUtils.hasLength(metric.getCategory())) {
+		if (StringUtils.hasLength(metric.getCategory())) {
 			desc.setField(FIELD_METRIC_CATEGORY, metric.getCategory());
 		}
 
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java
index e092c221cd..75178da128 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ public class MethodExclusionMBeanInfoAssembler extends AbstractConfigurableMBean
 	 * that bean is found in the {@code ignoredMethodsMappings} property.
 	 * @see #setIgnoredMethodMappings(java.util.Properties)
 	 */
-	public void setIgnoredMethods(String[] ignoredMethodNames) {
+	public void setIgnoredMethods(String... ignoredMethodNames) {
 		this.ignoredMethods = new HashSet<String>(Arrays.asList(ignoredMethodNames));
 	}
 
@@ -81,7 +81,7 @@ public void setIgnoredMethods(String[] ignoredMethodNames) {
 	 */
 	public void setIgnoredMethodMappings(Properties mappings) {
 		this.ignoredMethodMappings = new HashMap<String, Set<String>>();
-		for (Enumeration en = mappings.keys(); en.hasMoreElements();) {
+		for (Enumeration<?> en = mappings.keys(); en.hasMoreElements();) {
 			String beanKey = (String) en.nextElement();
 			String[] methodNames = StringUtils.commaDelimitedListToStringArray(mappings.getProperty(beanKey));
 			this.ignoredMethodMappings.put(beanKey, new HashSet<String>(Arrays.asList(methodNames)));
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java
index c4467ab58a..30f5da7638 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ public class MethodNameBasedMBeanInfoAssembler extends AbstractConfigurableMBean
 	 * @param methodNames an array of method names indicating the methods to use
 	 * @see #setMethodMappings
 	 */
-	public void setManagedMethods(String[] methodNames) {
+	public void setManagedMethods(String... methodNames) {
 		this.managedMethods = new HashSet<String>(Arrays.asList(methodNames));
 	}
 
@@ -85,7 +85,7 @@ public void setManagedMethods(String[] methodNames) {
 	 */
 	public void setMethodMappings(Properties mappings) {
 		this.methodMappings = new HashMap<String, Set<String>>();
-		for (Enumeration en = mappings.keys(); en.hasMoreElements();) {
+		for (Enumeration<?> en = mappings.keys(); en.hasMoreElements();) {
 			String beanKey = (String) en.nextElement();
 			String[] methodNames = StringUtils.commaDelimitedListToStringArray(mappings.getProperty(beanKey));
 			this.methodMappings.put(beanKey, new HashSet<String>(Arrays.asList(methodNames)));
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedNotification.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedNotification.java
index d60e66363a..78be5f5546 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedNotification.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public void setNotificationType(String notificationType) {
 	/**
 	 * Set a list of notification types.
 	 */
-	public void setNotificationTypes(String[] notificationTypes) {
+	public void setNotificationTypes(String... notificationTypes) {
 		this.notificationTypes = notificationTypes;
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java
index a717b8a1ab..dbee347fb6 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java
@@ -138,7 +138,7 @@ public void setDaemon(boolean daemon) {
 	 * the {@code JMXConnectorServer} will be started in a separate thread.
 	 * If the {@code daemon} flag is set to {@code true}, that thread will be
 	 * started as a daemon thread.
-	 * @throws JMException if a problem occured when registering the connector server
+	 * @throws JMException if a problem occurred when registering the connector server
 	 * with the {@code MBeanServer}
 	 * @throws IOException if there is a problem starting the connector server
 	 */
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java b/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java
index 1308f35087..a4f84b0dd0 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java
@@ -145,7 +145,7 @@ public static MBeanServer locateMBeanServer(String agentId) throws MBeanServerNo
 	 * @return the parameter types as classes
 	 * @throws ClassNotFoundException if a parameter type could not be resolved
 	 */
-	public static Class[] parameterInfoToTypes(MBeanParameterInfo[] paramInfo) throws ClassNotFoundException {
+	public static Class<?>[] parameterInfoToTypes(MBeanParameterInfo[] paramInfo) throws ClassNotFoundException {
 		return parameterInfoToTypes(paramInfo, ClassUtils.getDefaultClassLoader());
 	}
 
@@ -157,12 +157,12 @@ public static Class[] parameterInfoToTypes(MBeanParameterInfo[] paramInfo) throw
 	 * @return the parameter types as classes
 	 * @throws ClassNotFoundException if a parameter type could not be resolved
 	 */
-	public static Class[] parameterInfoToTypes(MBeanParameterInfo[] paramInfo, ClassLoader classLoader)
+	public static Class<?>[] parameterInfoToTypes(MBeanParameterInfo[] paramInfo, ClassLoader classLoader)
 			throws ClassNotFoundException {
 
-		Class[] types = null;
+		Class<?>[] types = null;
 		if (paramInfo != null && paramInfo.length > 0) {
-			types = new Class[paramInfo.length];
+			types = new Class<?>[paramInfo.length];
 			for (int x = 0; x < paramInfo.length; x++) {
 				types[x] = ClassUtils.forName(paramInfo[x].getType(), classLoader);
 			}
@@ -178,7 +178,7 @@ public static Class[] parameterInfoToTypes(MBeanParameterInfo[] paramInfo, Class
 	 * @return the signature as array of argument types
 	 */
 	public static String[] getMethodSignature(Method method) {
-		Class[] types = method.getParameterTypes();
+		Class<?>[] types = method.getParameterTypes();
 		String[] signature = new String[types.length];
 		for (int x = 0; x < types.length; x++) {
 			signature[x] = types[x].getName();
@@ -282,7 +282,7 @@ public static Class<?> getMBeanInterface(Class<?> clazz) {
 			return null;
 		}
 		String mbeanInterfaceName = clazz.getName() + MBEAN_SUFFIX;
-		Class[] implementedInterfaces = clazz.getInterfaces();
+		Class<?>[] implementedInterfaces = clazz.getInterfaces();
 		for (Class<?> iface : implementedInterfaces) {
 			if (iface.getName().equals(mbeanInterfaceName)) {
 				return iface;
@@ -302,7 +302,7 @@ public static Class<?> getMXBeanInterface(Class<?> clazz) {
 		if (clazz == null || clazz.getSuperclass() == null) {
 			return null;
 		}
-		Class[] implementedInterfaces = clazz.getInterfaces();
+		Class<?>[] implementedInterfaces = clazz.getInterfaces();
 		for (Class<?> iface : implementedInterfaces) {
 			boolean isMxBean = iface.getName().endsWith(MXBEAN_SUFFIX);
 			if (mxBeanAnnotationAvailable) {
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/MBeanRegistrationSupport.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanRegistrationSupport.java
index 38339d4b7f..eb208aa272 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/MBeanRegistrationSupport.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/MBeanRegistrationSupport.java
@@ -16,7 +16,6 @@
 
 package org.springframework.jmx.support;
 
-import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import javax.management.InstanceAlreadyExistsException;
@@ -113,7 +112,7 @@ public class MBeanRegistrationSupport {
 	/**
 	 * The beans that have been registered by this exporter.
 	 */
-	private final Set<ObjectName> registeredBeans = Collections.synchronizedSet(new LinkedHashSet<ObjectName>());
+	private final Set<ObjectName> registeredBeans = new LinkedHashSet<ObjectName>();
 
 	/**
 	 * The policy used when registering an MBean and finding that it already exists.
@@ -188,40 +187,45 @@ public void setRegistrationPolicy(RegistrationPolicy registrationPolicy) {
 	 * @throws JMException if the registration failed
 	 */
 	protected void doRegister(Object mbean, ObjectName objectName) throws JMException {
-		ObjectInstance registeredBean = null;
-		try {
-			registeredBean = this.server.registerMBean(mbean, objectName);
-		}
-		catch (InstanceAlreadyExistsException ex) {
-			if (this.registrationPolicy == RegistrationPolicy.IGNORE_EXISTING) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("Ignoring existing MBean at [" + objectName + "]");
-				}
+		ObjectName actualObjectName;
+
+		synchronized (this.registeredBeans) {
+			ObjectInstance registeredBean = null;
+			try {
+				registeredBean = this.server.registerMBean(mbean, objectName);
 			}
-			else if (this.registrationPolicy == RegistrationPolicy.REPLACE_EXISTING) {
-				try {
+			catch (InstanceAlreadyExistsException ex) {
+				if (this.registrationPolicy == RegistrationPolicy.IGNORE_EXISTING) {
 					if (logger.isDebugEnabled()) {
-						logger.debug("Replacing existing MBean at [" + objectName + "]");
+						logger.debug("Ignoring existing MBean at [" + objectName + "]");
+					}
+				}
+				else if (this.registrationPolicy == RegistrationPolicy.REPLACE_EXISTING) {
+					try {
+						if (logger.isDebugEnabled()) {
+							logger.debug("Replacing existing MBean at [" + objectName + "]");
+						}
+						this.server.unregisterMBean(objectName);
+						registeredBean = this.server.registerMBean(mbean, objectName);
+					}
+					catch (InstanceNotFoundException ex2) {
+						logger.error("Unable to replace existing MBean at [" + objectName + "]", ex2);
+						throw ex;
 					}
-					this.server.unregisterMBean(objectName);
-					registeredBean = this.server.registerMBean(mbean, objectName);
 				}
-				catch (InstanceNotFoundException ex2) {
-					logger.error("Unable to replace existing MBean at [" + objectName + "]", ex2);
+				else {
 					throw ex;
 				}
 			}
-			else {
-				throw ex;
+
+			// Track registration and notify listeners.
+			actualObjectName = (registeredBean != null ? registeredBean.getObjectName() : null);
+			if (actualObjectName == null) {
+				actualObjectName = objectName;
 			}
+			this.registeredBeans.add(actualObjectName);
 		}
 
-		// Track registration and notify listeners.
-		ObjectName actualObjectName = (registeredBean != null ? registeredBean.getObjectName() : null);
-		if (actualObjectName == null) {
-			actualObjectName = objectName;
-		}
-		this.registeredBeans.add(actualObjectName);
 		onRegister(actualObjectName, mbean);
 	}
 
@@ -229,7 +233,11 @@ else if (this.registrationPolicy == RegistrationPolicy.REPLACE_EXISTING) {
 	 * Unregisters all beans that have been registered by an instance of this class.
 	 */
 	protected void unregisterBeans() {
-		for (ObjectName objectName : new LinkedHashSet<ObjectName>(this.registeredBeans)) {
+		Set<ObjectName> snapshot;
+		synchronized (this.registeredBeans) {
+			snapshot = new LinkedHashSet<ObjectName>(this.registeredBeans);
+		}
+		for (ObjectName objectName : snapshot) {
 			doUnregister(objectName);
 		}
 	}
@@ -239,32 +247,43 @@ protected void unregisterBeans() {
 	 * @param objectName the suggested ObjectName for the MBean
 	 */
 	protected void doUnregister(ObjectName objectName) {
-		try {
-			// MBean might already have been unregistered by an external process.
-			if (this.server.isRegistered(objectName)) {
-				this.server.unregisterMBean(objectName);
-				onUnregister(objectName);
-			}
-			else {
-				if (logger.isWarnEnabled()) {
-					logger.warn("Could not unregister MBean [" + objectName + "] as said MBean " +
-							"is not registered (perhaps already unregistered by an external process)");
+		boolean actuallyUnregistered = false;
+
+		synchronized (this.registeredBeans) {
+			if (this.registeredBeans.remove(objectName)) {
+				try {
+					// MBean might already have been unregistered by an external process
+					if (this.server.isRegistered(objectName)) {
+						this.server.unregisterMBean(objectName);
+						actuallyUnregistered = true;
+					}
+					else {
+						if (logger.isWarnEnabled()) {
+							logger.warn("Could not unregister MBean [" + objectName + "] as said MBean " +
+									"is not registered (perhaps already unregistered by an external process)");
+						}
+					}
+				}
+				catch (JMException ex) {
+					if (logger.isErrorEnabled()) {
+						logger.error("Could not unregister MBean [" + objectName + "]", ex);
+					}
 				}
 			}
 		}
-		catch (JMException ex) {
-			if (logger.isErrorEnabled()) {
-				logger.error("Could not unregister MBean [" + objectName + "]", ex);
-			}
+
+		if (actuallyUnregistered) {
+			onUnregister(objectName);
 		}
-		this.registeredBeans.remove(objectName);
 	}
 
 	/**
 	 * Return the {@link ObjectName ObjectNames} of all registered beans.
 	 */
 	protected final ObjectName[] getRegisteredObjectNames() {
-		return this.registeredBeans.toArray(new ObjectName[this.registeredBeans.size()]);
+		synchronized (this.registeredBeans) {
+			return this.registeredBeans.toArray(new ObjectName[this.registeredBeans.size()]);
+		}
 	}
 
 
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java
index 504a96ad8c..a906dab947 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,14 @@
 import org.aopalliance.intercept.MethodInvocation;
 
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.beans.SimpleTypeConverter;
+import org.springframework.beans.TypeConverter;
+import org.springframework.beans.TypeMismatchException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -61,9 +67,10 @@
  * @see #setCache
  * @see JndiObjectTargetSource
  */
-public class JndiObjectFactoryBean extends JndiObjectLocator implements FactoryBean<Object>, BeanClassLoaderAware {
+public class JndiObjectFactoryBean extends JndiObjectLocator
+		implements FactoryBean<Object>, BeanFactoryAware, BeanClassLoaderAware {
 
-	private Class[] proxyInterfaces;
+	private Class<?>[] proxyInterfaces;
 
 	private boolean lookupOnStartup = true;
 
@@ -73,6 +80,8 @@ public class JndiObjectFactoryBean extends JndiObjectLocator implements FactoryB
 
 	private Object defaultObject;
 
+	private ConfigurableBeanFactory beanFactory;
+
 	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
 
 	private Object jndiObject;
@@ -87,8 +96,8 @@ public class JndiObjectFactoryBean extends JndiObjectLocator implements FactoryB
 	 * @see #setLookupOnStartup
 	 * @see #setCache
 	 */
-	public void setProxyInterface(Class proxyInterface) {
-		this.proxyInterfaces = new Class[] {proxyInterface};
+	public void setProxyInterface(Class<?> proxyInterface) {
+		this.proxyInterfaces = new Class<?>[] {proxyInterface};
 	}
 
 	/**
@@ -100,7 +109,7 @@ public void setProxyInterface(Class proxyInterface) {
 	 * @see #setLookupOnStartup
 	 * @see #setCache
 	 */
-	public void setProxyInterfaces(Class[] proxyInterfaces) {
+	public void setProxyInterfaces(Class<?>... proxyInterfaces) {
 		this.proxyInterfaces = proxyInterfaces;
 	}
 
@@ -149,12 +158,26 @@ public void setExposeAccessContext(boolean exposeAccessContext) {
 	 * It is typically used for literal values in scenarios where the JNDI environment
 	 * might define specific config settings but those are not required to be present.
 	 * <p>Note: This is only supported for lookup on startup.
+	 * If specified together with {@link #setExpectedType}, the specified value
+	 * needs to be either of that type or convertible to it.
 	 * @see #setLookupOnStartup
+	 * @see ConfigurableBeanFactory#getTypeConverter()
+	 * @see SimpleTypeConverter
 	 */
 	public void setDefaultObject(Object defaultObject) {
 		this.defaultObject = defaultObject;
 	}
 
+	@Override
+	public void setBeanFactory(BeanFactory beanFactory) {
+		if (beanFactory instanceof ConfigurableBeanFactory) {
+			// Just optional - for getting a specifically configured TypeConverter if needed.
+			// We'll simply fall back to a SimpleTypeConverter if no specific one available.
+			this.beanFactory = (ConfigurableBeanFactory) beanFactory;
+		}
+	}
+
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -179,9 +202,16 @@ public void afterPropertiesSet() throws IllegalArgumentException, NamingExceptio
 		else {
 			if (this.defaultObject != null && getExpectedType() != null &&
 					!getExpectedType().isInstance(this.defaultObject)) {
-				throw new IllegalArgumentException("Default object [" + this.defaultObject +
-						"] of type [" + this.defaultObject.getClass().getName() +
-						"] is not of expected type [" + getExpectedType().getName() + "]");
+				TypeConverter converter = (this.beanFactory != null ?
+						this.beanFactory.getTypeConverter() : new SimpleTypeConverter());
+				try {
+					this.defaultObject = converter.convertIfNecessary(this.defaultObject, getExpectedType());
+				}
+				catch (TypeMismatchException ex) {
+					throw new IllegalArgumentException("Default object [" + this.defaultObject + "] of type [" +
+							this.defaultObject.getClass().getName() + "] is not of expected type [" +
+							getExpectedType().getName() + "] and cannot be converted either", ex);
+				}
 			}
 			// Locate specified JNDI object.
 			this.jndiObject = lookupWithFallback();
@@ -263,7 +293,7 @@ public boolean isSingleton() {
 	 * @return the merged interface as Class
 	 * @see java.lang.reflect.Proxy#getProxyClass
 	 */
-	protected Class createCompositeInterface(Class[] interfaces) {
+	protected Class<?> createCompositeInterface(Class<?>[] interfaces) {
 		return ClassUtils.createCompositeInterface(interfaces, this.beanClassLoader);
 	}
 
@@ -290,13 +320,13 @@ private static Object createJndiObjectProxy(JndiObjectFactoryBean jof) throws Na
 				proxyFactory.setInterfaces(jof.proxyInterfaces);
 			}
 			else {
-				Class targetClass = targetSource.getTargetClass();
+				Class<?> targetClass = targetSource.getTargetClass();
 				if (targetClass == null) {
 					throw new IllegalStateException(
 							"Cannot deactivate 'lookupOnStartup' without specifying a 'proxyInterface' or 'expectedType'");
 				}
-				Class[] ifcs = ClassUtils.getAllInterfacesForClass(targetClass, jof.beanClassLoader);
-				for (Class ifc : ifcs) {
+				Class<?>[] ifcs = ClassUtils.getAllInterfacesForClass(targetClass, jof.beanClassLoader);
+				for (Class<?> ifc : ifcs) {
 					if (Modifier.isPublic(ifc.getModifiers())) {
 						proxyFactory.addInterface(ifc);
 					}
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java b/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java
index 46886023a4..b33fc6d885 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,9 +69,9 @@ public JndiPropertySource(String name, JndiLocatorDelegate jndiLocator) {
 		super(name, jndiLocator);
 	}
 
+
 	/**
-	 * {@inheritDoc}
-	 * <p>This implementation looks up and returns the value associated with the given
+	 * This implementation looks up and returns the value associated with the given
 	 * name from the underlying {@link JndiLocatorDelegate}. If a {@link NamingException}
 	 * is thrown during the call to {@link JndiLocatorDelegate#lookup(String)}, returns
 	 * {@code null} and issues a DEBUG-level log statement with the exception message.
@@ -80,12 +80,16 @@ public JndiPropertySource(String name, JndiLocatorDelegate jndiLocator) {
 	public Object getProperty(String name) {
 		try {
 			Object value = this.source.lookup(name);
-			logger.debug("JNDI lookup for name [" + name + "] returned: [" + value + "]");
+			if (logger.isDebugEnabled()) {
+				logger.debug("JNDI lookup for name [" + name + "] returned: [" + value + "]");
+			}
 			return value;
 		}
 		catch (NamingException ex) {
-			logger.debug("JNDI lookup for name [" + name + "] threw NamingException " +
-					"with message: " + ex.getMessage() + ". Returning null.");
+			if (logger.isDebugEnabled()) {
+				logger.debug("JNDI lookup for name [" + name + "] threw NamingException " +
+						"with message: " + ex.getMessage() + ". Returning null.");
+			}
 			return null;
 		}
 	}
diff --git a/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java
index f565f37edf..558e271dee 100644
--- a/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java
+++ b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
@@ -66,7 +65,7 @@ public class SimpleJndiBeanFactory extends JndiLocatorSupport implements BeanFac
 	private final Map<String, Object> singletonObjects = new HashMap<String, Object>();
 
 	/** Cache of the types of nonshareable resources: bean name --> bean type */
-	private final Map<String, Class> resourceTypes = new HashMap<String, Class>();
+	private final Map<String, Class<?>> resourceTypes = new HashMap<String, Class<?>>();
 
 
 	public SimpleJndiBeanFactory() {
@@ -75,23 +74,23 @@ public SimpleJndiBeanFactory() {
 
 
 	/**
-	 * Set a list of names of shareable JNDI resources,
+	 * Add the name of a shareable JNDI resource,
 	 * which this factory is allowed to cache once obtained.
-	 * @param shareableResources the JNDI names
+	 * @param shareableResource the JNDI name
 	 * (typically within the "java:comp/env/" namespace)
 	 */
-	public void setShareableResources(String[] shareableResources) {
-		this.shareableResources.addAll(Arrays.asList(shareableResources));
+	public void addShareableResource(String shareableResource) {
+		this.shareableResources.add(shareableResource);
 	}
 
 	/**
-	 * Add the name of a shareable JNDI resource,
+	 * Set a list of names of shareable JNDI resources,
 	 * which this factory is allowed to cache once obtained.
-	 * @param shareableResource the JNDI name
+	 * @param shareableResources the JNDI names
 	 * (typically within the "java:comp/env/" namespace)
 	 */
-	public void addShareableResource(String shareableResource) {
-		this.shareableResources.add(shareableResource);
+	public void setShareableResources(String... shareableResources) {
+		this.shareableResources.addAll(Arrays.asList(shareableResources));
 	}
 
 
@@ -131,7 +130,7 @@ public <T> T getBean(Class<T> requiredType) throws BeansException {
 	public Object getBean(String name, Object... args) throws BeansException {
 		if (args != null) {
 			throw new UnsupportedOperationException(
-					"SimpleJndiBeanFactory does not support explicit bean creation arguments)");
+					"SimpleJndiBeanFactory does not support explicit bean creation arguments");
 		}
 		return getBean(name);
 	}
@@ -157,8 +156,8 @@ public boolean isPrototype(String name) throws NoSuchBeanDefinitionException {
 		return !this.shareableResources.contains(name);
 	}
 
-	public boolean isTypeMatch(String name, Class targetType) throws NoSuchBeanDefinitionException {
-		Class type = getType(name);
+	public boolean isTypeMatch(String name, Class<?> targetType) throws NoSuchBeanDefinitionException {
+		Class<?> type = getType(name);
 		return (targetType == null || (type != null && targetType.isAssignableFrom(type)));
 	}
 
@@ -196,7 +195,7 @@ private <T> T doGetSingleton(String name, Class<T> requiredType) throws NamingEx
 		}
 	}
 
-	private Class doGetType(String name) throws NamingException {
+	private Class<?> doGetType(String name) throws NamingException {
 		if (isSingleton(name)) {
 			Object jndiObject = doGetSingleton(name, null);
 			return (jndiObject != null ? jndiObject.getClass() : null);
@@ -208,7 +207,7 @@ private Class doGetType(String name) throws NamingException {
 				}
 				else {
 					Object jndiObject = lookup(name, null);
-					Class type = (jndiObject != null ? jndiObject.getClass() : null);
+					Class<?> type = (jndiObject != null ? jndiObject.getClass() : null);
 					this.resourceTypes.put(name, type);
 					return type;
 				}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
index 57fd7b6945..987c9fd16c 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 import org.springframework.context.annotation.ImportAware;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 /**
  * Abstract base {@code Configuration} class providing common structure for enabling
@@ -38,37 +38,32 @@
 public abstract class AbstractAsyncConfiguration implements ImportAware {
 
 	protected AnnotationAttributes enableAsync;
+
 	protected Executor executor;
 
+
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		this.enableAsync = AnnotationAttributes.fromMap(
 				importMetadata.getAnnotationAttributes(EnableAsync.class.getName(), false));
-		Assert.notNull(this.enableAsync,
-				"@EnableAsync is not present on importing class " +
-				importMetadata.getClassName());
+		if (this.enableAsync == null) {
+			throw new IllegalArgumentException(
+					"@EnableAsync is not present on importing class " + importMetadata.getClassName());
+		}
 	}
 
-	/**
-	 * The component that will apply async execution advice to beans annotated with
-	 * the async annotation. Subclasses will provide either a BeanPostProcessor in
-	 * the case of proxy-based advice, or an AspectJ aspect if weaving is preferred.
-	 */
-	public abstract Object asyncAdvisor();
-
 	/**
 	 * Collect any {@link AsyncConfigurer} beans through autowiring.
 	 */
 	@Autowired(required = false)
 	void setConfigurers(Collection<AsyncConfigurer> configurers) {
-		if (configurers == null || configurers.isEmpty()) {
+		if (CollectionUtils.isEmpty(configurers)) {
 			return;
 		}
-
 		if (configurers.size() > 1) {
-			throw new IllegalStateException("only one AsyncConfigurer may exist");
+			throw new IllegalStateException("Only one AsyncConfigurer may exist");
 		}
-
 		AsyncConfigurer configurer = configurers.iterator().next();
 		this.executor = configurer.getAsyncExecutor();
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
index 35e57c59d2..946671538a 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 
 /**
  * Advisor that activates asynchronous method execution through the {@link Async}
@@ -73,9 +74,9 @@ public AsyncAnnotationAdvisor() {
 	public AsyncAnnotationAdvisor(Executor executor) {
 		Set<Class<? extends Annotation>> asyncAnnotationTypes = new LinkedHashSet<Class<? extends Annotation>>(2);
 		asyncAnnotationTypes.add(Async.class);
-		ClassLoader cl = AsyncAnnotationAdvisor.class.getClassLoader();
 		try {
-			asyncAnnotationTypes.add((Class<? extends Annotation>) cl.loadClass("javax.ejb.Asynchronous"));
+			asyncAnnotationTypes.add((Class<? extends Annotation>)
+					ClassUtils.forName("javax.ejb.Asynchronous", AsyncAnnotationAdvisor.class.getClassLoader()));
 		}
 		catch (ClassNotFoundException ex) {
 			// If EJB 3.1 API not present, simply ignore.
@@ -140,7 +141,7 @@ protected Pointcut buildPointcut(Set<Class<? extends Annotation>> asyncAnnotatio
 		ComposablePointcut result = null;
 		for (Class<? extends Annotation> asyncAnnotationType : asyncAnnotationTypes) {
 			Pointcut cpc = new AnnotationMatchingPointcut(asyncAnnotationType, true);
-			Pointcut mpc = new AnnotationMatchingPointcut(null, asyncAnnotationType);
+			Pointcut mpc = AnnotationMatchingPointcut.forMethodAnnotation(asyncAnnotationType);
 			if (result == null) {
 				result = new ComposablePointcut(cpc).union(mpc);
 			}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java
index 0ac2f757f0..fdbd520fab 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,8 +49,7 @@
  * @see #setBeforeExistingAdvisors
  */
 @SuppressWarnings("serial")
-public class AsyncAnnotationBeanPostProcessor extends AbstractAdvisingBeanPostProcessor
-		implements BeanFactoryAware {
+public class AsyncAnnotationBeanPostProcessor extends AbstractAdvisingBeanPostProcessor implements BeanFactoryAware {
 
 	private Class<? extends Annotation> asyncAnnotationType;
 
@@ -61,6 +60,7 @@ public AsyncAnnotationBeanPostProcessor() {
 		setBeforeExistingAdvisors(true);
 	}
 
+
 	/**
 	 * Set the 'async' annotation type to be detected at either class or method
 	 * level. By default, both the {@link Async} annotation and the EJB 3.1
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
index 3815016c9e..93ed4e489f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
  * @since 3.1
  * @see EnableAsync
  * @see ProxyAsyncConfiguration
- * @see AnnotationConfigUtils#ASYNC_EXECUTION_ASPECT_CONFIGURATION_CLASS_NAME
  */
 public class AsyncConfigurationSelector extends AdviceModeImportSelector<EnableAsync> {
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
index 35e2891f31..72a884a6b0 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,16 +37,18 @@
  * &#064;Configuration
  * &#064;EnableScheduling
  * public class AppConfig {
+ *
  *     // various &#064;Bean definitions
  * }</pre>
  *
  * This enables detection of @{@link Scheduled} annotations on any Spring-managed
- * bean in the container.  For example, given a class {@code MyTask}
+ * bean in the container. For example, given a class {@code MyTask}
  *
  * <pre class="code">
  * package com.myco.tasks;
  *
  * public class MyTask {
+ *
  *     &#064;Scheduled(fixedRate=1000)
  *     public void work() {
  *         // task execution logic
@@ -60,6 +62,7 @@
  * &#064;Configuration
  * &#064;EnableScheduling
  * public class AppConfig {
+ *
  *     &#064;Bean
  *     public MyTask task() {
  *         return new MyTask();
@@ -72,6 +75,7 @@
  *
  * <pre class="code">
  * &#064;Configuration
+ * &#064;EnableScheduling
  * &#064;ComponentScan(basePackages="com.myco.tasks")
  * public class AppConfig {
  * }</pre>
@@ -83,6 +87,7 @@
  * &#064;Configuration
  * &#064;EnableScheduling
  * public class AppConfig {
+ *
  *     &#064;Scheduled(fixedRate=1000)
  *     public void work() {
  *         // task execution logic
@@ -100,6 +105,7 @@
  * &#064;Configuration
  * &#064;EnableScheduling
  * public class AppConfig implements SchedulingConfigurer {
+ *
  *     &#064;Override
  *     public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
  *         taskRegistrar.setScheduler(taskExecutor());
@@ -111,11 +117,11 @@
  *     }
  * }</pre>
  *
- * Note in the example above the use of {@code @Bean(destroyMethod="shutdown")}. This
- * ensures that the task executor is properly shut down when the Spring application
- * context itself is closed.
+ * <p>Note in the example above the use of {@code @Bean(destroyMethod="shutdown")}.
+ * This ensures that the task executor is properly shut down when the Spring
+ * application context itself is closed.
  *
- * Implementing {@code SchedulingConfigurer} also allows for fine-grained
+ * <p>Implementing {@code SchedulingConfigurer} also allows for fine-grained
  * control over task registration via the {@code ScheduledTaskRegistrar}.
  * For example, the following configures the execution of a particular bean
  * method per a custom {@code Trigger} implementation:
@@ -124,6 +130,7 @@
  * &#064;Configuration
  * &#064;EnableScheduling
  * public class AppConfig implements SchedulingConfigurer {
+ *
  *     &#064;Override
  *     public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
  *         taskRegistrar.setScheduler(taskScheduler());
@@ -150,22 +157,32 @@
  *
  * <p>For reference, the example above can be compared to the following Spring XML
  * configuration:
+ *
  * <pre class="code">
  * {@code
  * <beans>
+ *
  *     <task:annotation-driven scheduler="taskScheduler"/>
+ *
  *     <task:scheduler id="taskScheduler" pool-size="42"/>
- *     <task:scheduled ref="myTask" method="work" fixed-rate="1000"/>
+ *
+ *     <task:scheduled-tasks scheduler="taskScheduler">
+ *         <task:scheduled ref="myTask" method="work" fixed-rate="1000"/>
+ *     </task:scheduled-tasks>
+ *
  *     <bean id="myTask" class="com.foo.MyTask"/>
+ *
  * </beans>
  * }</pre>
- * the examples are equivalent save that in XML a <em>fixed-rate</em> period is used
+ *
+ * The examples are equivalent save that in XML a <em>fixed-rate</em> period is used
  * instead of a custom <em>{@code Trigger}</em> implementation; this is because the
  * {@code task:} namespace {@code scheduled} cannot easily expose such support. This is
  * but one demonstration how the code-based approach allows for maximum configurability
  * through direct access to actual componentry.<p>
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  * @since 3.1
  * @see Scheduled
  * @see SchedulingConfiguration
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java
index 8ec439db2e..ce8b2c9c85 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,26 +38,20 @@
 @Configuration
 public class ProxyAsyncConfiguration extends AbstractAsyncConfiguration {
 
-	@Override
-	@Bean(name=AnnotationConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME)
+	@Bean(name = AnnotationConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public AsyncAnnotationBeanPostProcessor asyncAdvisor() {
 		Assert.notNull(this.enableAsync, "@EnableAsync annotation metadata was not injected");
-
 		AsyncAnnotationBeanPostProcessor bpp = new AsyncAnnotationBeanPostProcessor();
-
-		Class<? extends Annotation> customAsyncAnnotation = enableAsync.getClass("annotation");
+		Class<? extends Annotation> customAsyncAnnotation = this.enableAsync.getClass("annotation");
 		if (customAsyncAnnotation != AnnotationUtils.getDefaultValue(EnableAsync.class, "annotation")) {
 			bpp.setAsyncAnnotationType(customAsyncAnnotation);
 		}
-
 		if (this.executor != null) {
 			bpp.setExecutor(this.executor);
 		}
-
 		bpp.setProxyTargetClass(this.enableAsync.getBoolean("proxyTargetClass"));
 		bpp.setOrder(this.enableAsync.<Integer>getNumber("order"));
-
 		return bpp;
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
index 754afc5bd6..f6d3e9906e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,16 @@
 package org.springframework.scheduling.annotation;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
 
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -40,6 +46,7 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.ReflectionUtils.MethodCallback;
+import org.springframework.util.StringUtils;
 import org.springframework.util.StringValueResolver;
 
 /**
@@ -48,13 +55,13 @@
  * to the "fixedRate", "fixedDelay", or "cron" expression provided via the annotation.
  *
  * <p>This post-processor is automatically registered by Spring's
- * {@code <task:annotation-driven>} XML element, and also by the @{@link EnableScheduling}
- * annotation.
+ * {@code <task:annotation-driven>} XML element, and also by the
+ * @{@link EnableScheduling} annotation.
  *
- * <p>Auto-detects any {@link SchedulingConfigurer} instances in the container,
- * allowing for customization of the scheduler to be used or for fine-grained control
- * over task registration (e.g. registration of {@link Trigger} tasks.
- * See @{@link EnableScheduling} Javadoc for complete usage details.
+ * <p>Autodetects any {@link SchedulingConfigurer} instances in the container,
+ * allowing for customization of the scheduler to be used or for fine-grained
+ * control over task registration (e.g. registration of {@link Trigger} tasks.
+ * See the @{@link EnableScheduling} javadocs for complete usage details.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
@@ -78,6 +85,13 @@ public class ScheduledAnnotationBeanPostProcessor
 
 	private final ScheduledTaskRegistrar registrar = new ScheduledTaskRegistrar();
 
+	private final Map<Class<?>, Boolean> nonAnnotatedClasses = new ConcurrentHashMap<Class<?>, Boolean>(64);
+
+
+	@Override
+	public int getOrder() {
+		return LOWEST_PRECEDENCE;
+	}
 
 	/**
 	 * Set the {@link org.springframework.scheduling.TaskScheduler} that will invoke
@@ -96,151 +110,26 @@ public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 	}
 
-	public int getOrder() {
-		return LOWEST_PRECEDENCE;
-	}
-
-	public Object postProcessBeforeInitialization(Object bean, String beanName) {
-		return bean;
-	}
-
-	public Object postProcessAfterInitialization(final Object bean, String beanName) {
-		final Class<?> targetClass = AopUtils.getTargetClass(bean);
-		ReflectionUtils.doWithMethods(targetClass, new MethodCallback() {
-			public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
-				Scheduled annotation = AnnotationUtils.getAnnotation(method, Scheduled.class);
-				if (annotation != null) {
-					try {
-						Assert.isTrue(void.class.equals(method.getReturnType()),
-								"Only void-returning methods may be annotated with @Scheduled");
-						Assert.isTrue(method.getParameterTypes().length == 0,
-								"Only no-arg methods may be annotated with @Scheduled");
-						if (AopUtils.isJdkDynamicProxy(bean)) {
-							try {
-								// found a @Scheduled method on the target class for this JDK proxy -> is it
-								// also present on the proxy itself?
-								method = bean.getClass().getMethod(method.getName(), method.getParameterTypes());
-							}
-							catch (SecurityException ex) {
-								ReflectionUtils.handleReflectionException(ex);
-							}
-							catch (NoSuchMethodException ex) {
-								throw new IllegalStateException(String.format(
-										"@Scheduled method '%s' found on bean target class '%s', " +
-										"but not found in any interface(s) for bean JDK proxy. Either " +
-										"pull the method up to an interface or switch to subclass (CGLIB) " +
-										"proxies by setting proxy-target-class/proxyTargetClass " +
-										"attribute to 'true'", method.getName(), targetClass.getSimpleName()));
-							}
-						}
-						Runnable runnable = new ScheduledMethodRunnable(bean, method);
-						boolean processedSchedule = false;
-						String errorMessage = "Exactly one of the 'cron', 'fixedDelay(String)', or 'fixedRate(String)' attributes is required";
-						// Determine initial delay
-						long initialDelay = annotation.initialDelay();
-						String initialDelayString = annotation.initialDelayString();
-						if (!"".equals(initialDelayString)) {
-							Assert.isTrue(initialDelay < 0, "Specify 'initialDelay' or 'initialDelayString', not both");
-							if (embeddedValueResolver != null) {
-								initialDelayString = embeddedValueResolver.resolveStringValue(initialDelayString);
-							}
-							try {
-								initialDelay = Integer.parseInt(initialDelayString);
-							}
-							catch (NumberFormatException ex) {
-								throw new IllegalArgumentException(
-										"Invalid initialDelayString value \"" + initialDelayString + "\" - cannot parse into integer");
-							}
-						}
-						// Check cron expression
-						String cron = annotation.cron();
-						if (!"".equals(cron)) {
-							Assert.isTrue(initialDelay == -1, "'initialDelay' not supported for cron triggers");
-							processedSchedule = true;
-							if (embeddedValueResolver != null) {
-								cron = embeddedValueResolver.resolveStringValue(cron);
-							}
-							registrar.addCronTask(new CronTask(runnable, cron));
-						}
-						// At this point we don't need to differentiate between initial delay set or not anymore
-						if (initialDelay < 0) {
-							initialDelay = 0;
-						}
-						// Check fixed delay
-						long fixedDelay = annotation.fixedDelay();
-						if (fixedDelay >= 0) {
-							Assert.isTrue(!processedSchedule, errorMessage);
-							processedSchedule = true;
-							registrar.addFixedDelayTask(new IntervalTask(runnable, fixedDelay, initialDelay));
-						}
-						String fixedDelayString = annotation.fixedDelayString();
-						if (!"".equals(fixedDelayString)) {
-							Assert.isTrue(!processedSchedule, errorMessage);
-							processedSchedule = true;
-							if (embeddedValueResolver != null) {
-								fixedDelayString = embeddedValueResolver.resolveStringValue(fixedDelayString);
-							}
-							try {
-								fixedDelay = Integer.parseInt(fixedDelayString);
-							}
-							catch (NumberFormatException ex) {
-								throw new IllegalArgumentException(
-										"Invalid fixedDelayString value \"" + fixedDelayString + "\" - cannot parse into integer");
-							}
-							registrar.addFixedDelayTask(new IntervalTask(runnable, fixedDelay, initialDelay));
-						}
-						// Check fixed rate
-						long fixedRate = annotation.fixedRate();
-						if (fixedRate >= 0) {
-							Assert.isTrue(!processedSchedule, errorMessage);
-							processedSchedule = true;
-							registrar.addFixedRateTask(new IntervalTask(runnable, fixedRate, initialDelay));
-						}
-						String fixedRateString = annotation.fixedRateString();
-						if (!"".equals(fixedRateString)) {
-							Assert.isTrue(!processedSchedule, errorMessage);
-							processedSchedule = true;
-							if (embeddedValueResolver != null) {
-								fixedRateString = embeddedValueResolver.resolveStringValue(fixedRateString);
-							}
-							try {
-								fixedRate = Integer.parseInt(fixedRateString);
-							}
-							catch (NumberFormatException ex) {
-								throw new IllegalArgumentException(
-										"Invalid fixedRateString value \"" + fixedRateString + "\" - cannot parse into integer");
-							}
-							registrar.addFixedRateTask(new IntervalTask(runnable, fixedRate, initialDelay));
-						}
-						// Check whether we had any attribute set
-						Assert.isTrue(processedSchedule, errorMessage);
-					}
-					catch (IllegalArgumentException ex) {
-						throw new IllegalStateException(
-								"Encountered invalid @Scheduled method '" + method.getName() + "': " + ex.getMessage());
-					}
-				}
-			}
-		});
-		return bean;
-	}
 
 	public void onApplicationEvent(ContextRefreshedEvent event) {
 		if (event.getApplicationContext() != this.applicationContext) {
 			return;
 		}
-		Map<String, SchedulingConfigurer> configurers =
-				this.applicationContext.getBeansOfType(SchedulingConfigurer.class);
+
 		if (this.scheduler != null) {
 			this.registrar.setScheduler(this.scheduler);
 		}
+
+		Map<String, SchedulingConfigurer> configurers =
+				this.applicationContext.getBeansOfType(SchedulingConfigurer.class);
 		for (SchedulingConfigurer configurer : configurers.values()) {
 			configurer.configureTasks(this.registrar);
 		}
+
 		if (this.registrar.hasTasks() && this.registrar.getScheduler() == null) {
 			Map<String, ? super Object> schedulers = new HashMap<String, Object>();
-			schedulers.putAll(applicationContext.getBeansOfType(TaskScheduler.class));
-			schedulers.putAll(applicationContext.getBeansOfType(ScheduledExecutorService.class));
+			schedulers.putAll(this.applicationContext.getBeansOfType(TaskScheduler.class));
+			schedulers.putAll(this.applicationContext.getBeansOfType(ScheduledExecutorService.class));
 			if (schedulers.size() == 0) {
 				// do nothing -> fall back to default scheduler
 			}
@@ -248,21 +137,174 @@ else if (schedulers.size() == 1) {
 				this.registrar.setScheduler(schedulers.values().iterator().next());
 			}
 			else if (schedulers.size() >= 2){
-				throw new IllegalStateException(
-						"More than one TaskScheduler and/or ScheduledExecutorService  " +
-						"exist within the context. Remove all but one of the beans; or " +
-						"implement the SchedulingConfigurer interface and call " +
-						"ScheduledTaskRegistrar#setScheduler explicitly within the " +
-						"configureTasks() callback. Found the following beans: " + schedulers.keySet());
+				throw new IllegalStateException("More than one TaskScheduler and/or ScheduledExecutorService  " +
+						"exist within the context. Remove all but one of the beans; or implement the " +
+						"SchedulingConfigurer interface and call ScheduledTaskRegistrar#setScheduler " +
+						"explicitly within the configureTasks() callback. Found the following beans: " +
+						schedulers.keySet());
 			}
 		}
+
 		this.registrar.afterPropertiesSet();
 	}
 
-	public void destroy() throws Exception {
-		if (this.registrar != null) {
-			this.registrar.destroy();
+
+	public Object postProcessBeforeInitialization(Object bean, String beanName) {
+		return bean;
+	}
+
+	public Object postProcessAfterInitialization(final Object bean, String beanName) {
+		Class<?> targetClass = AopUtils.getTargetClass(bean);
+		if (!this.nonAnnotatedClasses.containsKey(targetClass)) {
+			final Set<Method> annotatedMethods = new LinkedHashSet<Method>(1);
+			ReflectionUtils.doWithMethods(targetClass, new MethodCallback() {
+				public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
+					Scheduled scheduled = AnnotationUtils.getAnnotation(method, Scheduled.class);
+					if (scheduled != null) {
+						processScheduled(scheduled, method, bean);
+						annotatedMethods.add(method);
+					}
+				}
+			});
+			if (annotatedMethods.isEmpty()) {
+				this.nonAnnotatedClasses.put(targetClass, Boolean.TRUE);
+			}
 		}
+		return bean;
+	}
+
+	private void processScheduled(Scheduled scheduled, Method method, Object bean) {
+		try {
+			Assert.isTrue(void.class.equals(method.getReturnType()),
+					"Only void-returning methods may be annotated with @Scheduled");
+			Assert.isTrue(method.getParameterTypes().length == 0,
+					"Only no-arg methods may be annotated with @Scheduled");
+
+			if (AopUtils.isJdkDynamicProxy(bean)) {
+				try {
+					// Found a @Scheduled method on the target class for this JDK proxy ->
+					// is it also present on the proxy itself?
+					method = bean.getClass().getMethod(method.getName(), method.getParameterTypes());
+				}
+				catch (SecurityException ex) {
+					ReflectionUtils.handleReflectionException(ex);
+				}
+				catch (NoSuchMethodException ex) {
+					throw new IllegalStateException(String.format(
+							"@Scheduled method '%s' found on bean target class '%s' but not " +
+							"found in any interface(s) for a dynamic proxy. Either pull the " +
+							"method up to a declared interface or switch to subclass (CGLIB) " +
+							"proxies by setting proxy-target-class/proxyTargetClass to 'true'",
+							method.getName(), method.getDeclaringClass().getSimpleName()));
+				}
+			}
+			else if (AopUtils.isCglibProxy(bean)) {
+				// Common problem: private methods end up in the proxy instance, not getting delegated.
+				if (Modifier.isPrivate(method.getModifiers())) {
+					LogFactory.getLog(ScheduledAnnotationBeanPostProcessor.class).warn(String.format(
+							"@Scheduled method '%s' found on CGLIB proxy for target class '%s' but cannot " +
+							"be delegated to target bean. Switch its visibility to package or protected.",
+							method.getName(), method.getDeclaringClass().getSimpleName()));
+				}
+			}
+
+			Runnable runnable = new ScheduledMethodRunnable(bean, method);
+			boolean processedSchedule = false;
+			String errorMessage =
+					"Exactly one of the 'cron', 'fixedDelay(String)', or 'fixedRate(String)' attributes is required";
+
+			// Determine initial delay
+			long initialDelay = scheduled.initialDelay();
+			String initialDelayString = scheduled.initialDelayString();
+			if (StringUtils.hasText(initialDelayString)) {
+				Assert.isTrue(initialDelay < 0, "Specify 'initialDelay' or 'initialDelayString', not both");
+				if (this.embeddedValueResolver != null) {
+					initialDelayString = this.embeddedValueResolver.resolveStringValue(initialDelayString);
+				}
+				try {
+					initialDelay = Integer.parseInt(initialDelayString);
+				}
+				catch (NumberFormatException ex) {
+					throw new IllegalArgumentException(
+							"Invalid initialDelayString value \"" + initialDelayString + "\" - cannot parse into integer");
+				}
+			}
+
+			// Check cron expression
+			String cron = scheduled.cron();
+			if (StringUtils.hasText(cron)) {
+				Assert.isTrue(initialDelay == -1, "'initialDelay' not supported for cron triggers");
+				processedSchedule = true;
+				if (this.embeddedValueResolver != null) {
+					cron = this.embeddedValueResolver.resolveStringValue(cron);
+				}
+				this.registrar.addCronTask(new CronTask(runnable, cron));
+			}
+			// At this point we don't need to differentiate between initial delay set or not anymore
+			if (initialDelay < 0) {
+				initialDelay = 0;
+			}
+
+			// Check fixed delay
+			long fixedDelay = scheduled.fixedDelay();
+			if (fixedDelay >= 0) {
+				Assert.isTrue(!processedSchedule, errorMessage);
+				processedSchedule = true;
+				this.registrar.addFixedDelayTask(new IntervalTask(runnable, fixedDelay, initialDelay));
+			}
+			String fixedDelayString = scheduled.fixedDelayString();
+			if (StringUtils.hasText(fixedDelayString)) {
+				Assert.isTrue(!processedSchedule, errorMessage);
+				processedSchedule = true;
+				if (this.embeddedValueResolver != null) {
+					fixedDelayString = this.embeddedValueResolver.resolveStringValue(fixedDelayString);
+				}
+				try {
+					fixedDelay = Integer.parseInt(fixedDelayString);
+				}
+				catch (NumberFormatException ex) {
+					throw new IllegalArgumentException(
+							"Invalid fixedDelayString value \"" + fixedDelayString + "\" - cannot parse into integer");
+				}
+				this.registrar.addFixedDelayTask(new IntervalTask(runnable, fixedDelay, initialDelay));
+			}
+
+			// Check fixed rate
+			long fixedRate = scheduled.fixedRate();
+			if (fixedRate >= 0) {
+				Assert.isTrue(!processedSchedule, errorMessage);
+				processedSchedule = true;
+				this.registrar.addFixedRateTask(new IntervalTask(runnable, fixedRate, initialDelay));
+			}
+			String fixedRateString = scheduled.fixedRateString();
+			if (StringUtils.hasText(fixedRateString)) {
+				Assert.isTrue(!processedSchedule, errorMessage);
+				processedSchedule = true;
+				if (this.embeddedValueResolver != null) {
+					fixedRateString = this.embeddedValueResolver.resolveStringValue(fixedRateString);
+				}
+				try {
+					fixedRate = Integer.parseInt(fixedRateString);
+				}
+				catch (NumberFormatException ex) {
+					throw new IllegalArgumentException(
+							"Invalid fixedRateString value \"" + fixedRateString + "\" - cannot parse into integer");
+				}
+				this.registrar.addFixedRateTask(new IntervalTask(runnable, fixedRate, initialDelay));
+			}
+
+			// Check whether we had any attribute set
+			Assert.isTrue(processedSchedule, errorMessage);
+		}
+		catch (IllegalArgumentException ex) {
+			throw new IllegalStateException(
+					"Encountered invalid @Scheduled method '" + method.getName() + "': " + ex.getMessage());
+		}
+	}
+
+
+	public void destroy() throws Exception {
+		this.registrar.destroy();
 	}
 
 }
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java
index 91764b3328..d13a2f6162 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java
@@ -63,8 +63,8 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac
 
 
 	/**
-	 * Set the ThreadFactory to use for the ThreadPoolExecutor's thread pool.
-	 * Default is the ThreadPoolExecutor's default thread factory.
+	 * Set the ThreadFactory to use for the ExecutorService's thread pool.
+	 * Default is the underlying ExecutorService's default thread factory.
 	 * @see java.util.concurrent.Executors#defaultThreadFactory()
 	 */
 	public void setThreadFactory(ThreadFactory threadFactory) {
@@ -78,8 +78,8 @@ public void setThreadNamePrefix(String threadNamePrefix) {
 	}
 
 	/**
-	 * Set the RejectedExecutionHandler to use for the ThreadPoolExecutor.
-	 * Default is the ThreadPoolExecutor's default abort policy.
+	 * Set the RejectedExecutionHandler to use for the ExecutorService.
+	 * Default is the ExecutorService's default abort policy.
 	 * @see java.util.concurrent.ThreadPoolExecutor.AbortPolicy
 	 */
 	public void setRejectedExecutionHandler(RejectedExecutionHandler rejectedExecutionHandler) {
@@ -181,7 +181,7 @@ public void destroy() {
 	}
 
 	/**
-	 * Perform a shutdown on the ThreadPoolExecutor.
+	 * Perform a shutdown on the underlying ExecutorService.
 	 * @see java.util.concurrent.ExecutorService#shutdown()
 	 * @see java.util.concurrent.ExecutorService#shutdownNow()
 	 * @see #awaitTerminationIfNecessary()
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java
index 40d48ad295..4170768020 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,9 +37,10 @@
  *
  * <p>Allows for registration of {@link ScheduledExecutorTask ScheduledExecutorTasks},
  * automatically starting the {@link ScheduledExecutorService} on initialization and
- * cancelling it on destruction of the context. In scenarios that just require static
+ * cancelling it on destruction of the context. In scenarios that only require static
  * registration of tasks at startup, there is no need to access the
- * {@link ScheduledExecutorService} instance itself in application code.
+ * {@link ScheduledExecutorService} instance itself in application code at all;
+ * ScheduledExecutorFactoryBean is then just being used for lifecycle integration.
  *
  * <p>Note that {@link java.util.concurrent.ScheduledExecutorService}
  * uses a {@link Runnable} instance that is shared between repeated executions,
@@ -92,7 +93,7 @@ public void setPoolSize(int poolSize) {
 	 * @see java.util.concurrent.ScheduledExecutorService#scheduleWithFixedDelay(java.lang.Runnable, long, long, java.util.concurrent.TimeUnit)
 	 * @see java.util.concurrent.ScheduledExecutorService#scheduleAtFixedRate(java.lang.Runnable, long, long, java.util.concurrent.TimeUnit)
 	 */
-	public void setScheduledExecutorTasks(ScheduledExecutorTask[] scheduledExecutorTasks) {
+	public void setScheduledExecutorTasks(ScheduledExecutorTask... scheduledExecutorTasks) {
 		this.scheduledExecutorTasks = scheduledExecutorTasks;
 	}
 
@@ -192,9 +193,9 @@ protected void registerTasks(ScheduledExecutorTask[] tasks, ScheduledExecutorSer
 	 * @return the actual Runnable to schedule (may be a decorator)
 	 */
 	protected Runnable getRunnableToSchedule(ScheduledExecutorTask task) {
-		return this.continueScheduledExecutionAfterException
-				? new DelegatingErrorHandlingRunnable(task.getRunnable(), TaskUtils.LOG_AND_SUPPRESS_ERROR_HANDLER)
-				: new DelegatingErrorHandlingRunnable(task.getRunnable(), TaskUtils.LOG_AND_PROPAGATE_ERROR_HANDLER);
+		return (this.continueScheduledExecutionAfterException ?
+				new DelegatingErrorHandlingRunnable(task.getRunnable(), TaskUtils.LOG_AND_SUPPRESS_ERROR_HANDLER) :
+				new DelegatingErrorHandlingRunnable(task.getRunnable(), TaskUtils.LOG_AND_PROPAGATE_ERROR_HANDLER));
 	}
 
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
index 3e04248ea8..3f912aa27f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java
@@ -71,7 +71,6 @@ public class ThreadPoolExecutorFactoryBean extends ExecutorConfigurationSupport
 	/**
 	 * Set the ThreadPoolExecutor's core pool size.
 	 * Default is 1.
-	 * <p><b>This setting can be modified at runtime, for example through JMX.</b>
 	 */
 	public void setCorePoolSize(int corePoolSize) {
 		this.corePoolSize = corePoolSize;
@@ -80,7 +79,6 @@ public void setCorePoolSize(int corePoolSize) {
 	/**
 	 * Set the ThreadPoolExecutor's maximum pool size.
 	 * Default is {@code Integer.MAX_VALUE}.
-	 * <p><b>This setting can be modified at runtime, for example through JMX.</b>
 	 */
 	public void setMaxPoolSize(int maxPoolSize) {
 		this.maxPoolSize = maxPoolSize;
@@ -89,7 +87,6 @@ public void setMaxPoolSize(int maxPoolSize) {
 	/**
 	 * Set the ThreadPoolExecutor's keep-alive seconds.
 	 * Default is 60.
-	 * <p><b>This setting can be modified at runtime, for example through JMX.</b>
 	 */
 	public void setKeepAliveSeconds(int keepAliveSeconds) {
 		this.keepAliveSeconds = keepAliveSeconds;
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
index e8961e05e3..2dea1cfc0e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -140,10 +140,11 @@ public Future<?> submit(Runnable task) {
 	public <T> Future<T> submit(Callable<T> task) {
 		ExecutorService executor = getScheduledExecutor();
 		try {
+			Callable<T> taskToUse = task;
 			if (this.errorHandler != null) {
-				task = new DelegatingErrorHandlingCallable<T>(task, this.errorHandler);
+				taskToUse = new DelegatingErrorHandlingCallable<T>(task, this.errorHandler);
 			}
-			return executor.submit(task);
+			return executor.submit(taskToUse);
 		}
 		catch (RejectedExecutionException ex) {
 			throw new TaskRejectedException("Executor [" + executor + "] did not accept task: " + task, ex);
@@ -222,6 +223,7 @@ public ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay) {
 		}
 	}
 
+
 	private Runnable errorHandlingTask(Runnable task, boolean isRepeatingTask) {
 		return TaskUtils.decorateTaskWithErrorHandler(task, this.errorHandler, isRepeatingTask);
 	}
@@ -233,14 +235,14 @@ private static class DelegatingErrorHandlingCallable<V> implements Callable<V> {
 
 		private final ErrorHandler errorHandler;
 
-		DelegatingErrorHandlingCallable(Callable<V> delegate, ErrorHandler errorHandler) {
+		public DelegatingErrorHandlingCallable(Callable<V> delegate, ErrorHandler errorHandler) {
 			this.delegate = delegate;
 			this.errorHandler = errorHandler;
 		}
 
 		public V call() throws Exception {
 			try {
-				return delegate.call();
+				return this.delegate.call();
 			}
 			catch (Throwable t) {
 				this.errorHandler.handleError(t);
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/CronTask.java b/spring-context/src/main/java/org/springframework/scheduling/config/CronTask.java
index cf859ab427..b00b48060e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/CronTask.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/CronTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.scheduling.config;
 
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.support.CronTrigger;
 
 /**
@@ -26,13 +25,13 @@
  *
  * @author Chris Beams
  * @since 3.2
- * @see Scheduled#cron()
+ * @see org.springframework.scheduling.annotation.Scheduled#cron()
  * @see ScheduledTaskRegistrar#setCronTasksList(java.util.List)
  * @see org.springframework.scheduling.TaskScheduler
  */
 public class CronTask extends TriggerTask {
 
-	private String expression;
+	private final String expression;
 
 
 	/**
@@ -54,7 +53,9 @@ public CronTask(Runnable runnable, CronTrigger cronTrigger) {
 		this.expression = cronTrigger.getExpression();
 	}
 
+
 	public String getExpression() {
-		return expression;
+		return this.expression;
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
index 2efd26cea9..150d316af2 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 /**
  * Helper bean for registering tasks with a {@link TaskScheduler}, typically using cron
@@ -268,10 +269,10 @@ public void addFixedDelayTask(IntervalTask task) {
 	 * @since 3.2
 	 */
 	public boolean hasTasks() {
-		return (this.fixedRateTasks != null && !this.fixedRateTasks.isEmpty()) ||
-				(this.fixedDelayTasks != null && !this.fixedDelayTasks.isEmpty()) ||
-				(this.cronTasks != null && !this.cronTasks.isEmpty()) ||
-				(this.triggerTasks != null && !this.triggerTasks.isEmpty());
+		return (!CollectionUtils.isEmpty(this.triggerTasks) ||
+				!CollectionUtils.isEmpty(this.cronTasks) ||
+				!CollectionUtils.isEmpty(this.fixedRateTasks) ||
+				!CollectionUtils.isEmpty(this.fixedDelayTasks));
 	}
 
 
@@ -294,19 +295,19 @@ protected void scheduleTasks() {
 			this.taskScheduler = new ConcurrentTaskScheduler(this.localExecutor);
 		}
 		if (this.triggerTasks != null) {
-			for (TriggerTask task : triggerTasks) {
+			for (TriggerTask task : this.triggerTasks) {
 				this.scheduledFutures.add(this.taskScheduler.schedule(
 						task.getRunnable(), task.getTrigger()));
 			}
 		}
 		if (this.cronTasks != null) {
-			for (CronTask task : cronTasks) {
+			for (CronTask task : this.cronTasks) {
 				this.scheduledFutures.add(this.taskScheduler.schedule(
 						task.getRunnable(), task.getTrigger()));
 			}
 		}
 		if (this.fixedRateTasks != null) {
-			for (IntervalTask task : fixedRateTasks) {
+			for (IntervalTask task : this.fixedRateTasks) {
 				if (task.getInitialDelay() > 0) {
 					Date startTime = new Date(now + task.getInitialDelay());
 					this.scheduledFutures.add(this.taskScheduler.scheduleAtFixedRate(
@@ -319,7 +320,7 @@ protected void scheduleTasks() {
 			}
 		}
 		if (this.fixedDelayTasks != null) {
-			for (IntervalTask task : fixedDelayTasks) {
+			for (IntervalTask task : this.fixedDelayTasks) {
 				if (task.getInitialDelay() > 0) {
 					Date startTime = new Date(now + task.getInitialDelay());
 					this.scheduledFutures.add(this.taskScheduler.scheduleWithFixedDelay(
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java
index 4579a9e91b..8dee1ac7a4 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/TaskExecutorFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.springframework.core.JdkVersion;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -74,7 +75,7 @@ public void setBeanName(String beanName) {
 
 	public void afterPropertiesSet() throws Exception {
 		Class<?> executorClass = (shouldUseBackport() ?
-				getClass().getClassLoader().loadClass("org.springframework.scheduling.backportconcurrent.ThreadPoolTaskExecutor") :
+				ClassUtils.forName("org.springframework.scheduling.backportconcurrent.ThreadPoolTaskExecutor", getClass().getClassLoader()) :
 				ThreadPoolTaskExecutor.class);
 		BeanWrapper bw = new BeanWrapperImpl(executorClass);
 		determinePoolSizeRange(bw);
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/TriggerTask.java b/spring-context/src/main/java/org/springframework/scheduling/config/TriggerTask.java
index 6d0aa6c813..0766d6580e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/TriggerTask.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/TriggerTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 import org.springframework.scheduling.Trigger;
 
 /**
- * {@link Task} implementation defining a {@code Runnable} to be executed according to a
- * given {@link Trigger}.
+ * {@link Task} implementation defining a {@code Runnable} to be executed
+ * according to a given {@link Trigger}.
  *
  * @author Chris Beams
  * @since 3.2
@@ -45,6 +45,7 @@ public TriggerTask(Runnable runnable, Trigger trigger) {
 
 
 	public Trigger getTrigger() {
-		return trigger;
+		return this.trigger;
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
index 68d127c72f..14d72e333a 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,8 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Date sequence generator for a <a href="http://www.manpagez.com/man/5/crontab/">Crontab pattern</a>,
+ * Date sequence generator for a
+ * <a href="http://www.manpagez.com/man/5/crontab/">Crontab pattern</a>,
  * allowing clients to specify a pattern that the sequence matches.
  *
  * <p>The pattern is a list of six single space-separated fields: representing
@@ -41,6 +42,7 @@
  * <li>"0 0 * * * *" = the top of every hour of every day.</li>
  * <li>"*&#47;10 * * * * *" = every ten seconds.</li>
  * <li>"0 0 8-10 * * *" = 8, 9 and 10 o'clock of every day.</li>
+ * <li>"0 * 6,19 * * *" = 6:00 AM and 7:00 PM every day.</li>
  * <li>"0 0/30 8-10 * * *" = 8:00, 8:30, 9:00, 9:30 and 10 o'clock every day.</li>
  * <li>"0 0 9-17 * * MON-FRI" = on the hour nine-to-five weekdays</li>
  * <li>"0 0 0 25 12 ?" = every Christmas Day at midnight</li>
@@ -53,21 +55,21 @@
  */
 public class CronSequenceGenerator {
 
-	private final BitSet seconds = new BitSet(60);
-
-	private final BitSet minutes = new BitSet(60);
+	private final String expression;
 
-	private final BitSet hours = new BitSet(24);
+	private final TimeZone timeZone;
 
-	private final BitSet daysOfWeek = new BitSet(7);
+	private final BitSet months = new BitSet(12);
 
 	private final BitSet daysOfMonth = new BitSet(31);
 
-	private final BitSet months = new BitSet(12);
+	private final BitSet daysOfWeek = new BitSet(7);
 
-	private final String expression;
+	private final BitSet hours = new BitSet(24);
 
-	private final TimeZone timeZone;
+	private final BitSet minutes = new BitSet(60);
+
+	private final BitSet seconds = new BitSet(60);
 
 
 	/**
@@ -95,6 +97,14 @@ public CronSequenceGenerator(String expression, TimeZone timeZone) {
 	}
 
 
+	/**
+	 * Return the cron pattern that this sequence generator has been built for.
+	 */
+	String getExpression() {
+		return this.expression;
+	}
+
+
 	/**
 	 * Get the next {@link Date} in the sequence matching the Cron pattern and
 	 * after the value provided. The return value will have a whole number of
@@ -106,7 +116,7 @@ public Date next(Date date) {
 		/*
 		The plan:
 
-		1 Round up to the next whole second
+		1 Start with whole second (rounding up if necessary)
 
 		2 If seconds match move on, otherwise find the next match:
 		2.1 If next match is in the next minute then roll forwards
@@ -118,8 +128,6 @@ public Date next(Date date) {
 		4 If hour matches move on, otherwise find the next match
 		4.1 If next match is in the next day then roll forwards,
 		4.2 Reset the minutes and seconds and go to 2
-
-		...
 		*/
 
 		Calendar calendar = new GregorianCalendar();
@@ -271,9 +279,9 @@ private void parse(String expression) throws IllegalArgumentException {
 	}
 
 	/**
-	 * Replace the values in the commaSeparatedList (case insensitive) with
-	 * their index in the list.
-	 * @return a new string with the values from the list replaced
+	 * Replace the values in the comma-separated list (case insensitive)
+	 * with their index in the list.
+	 * @return a new String with the values from the list replaced
 	 */
 	private String replaceOrdinals(String value, String commaSeparatedList) {
 		String[] list = StringUtils.commaDelimitedListToStringArray(commaSeparatedList);
@@ -332,6 +340,10 @@ private void setNumberHits(BitSet bits, String value, int min, int max) {
 					range[1] = max - 1;
 				}
 				int delta = Integer.valueOf(split[1]);
+				if (delta <= 0) {
+					throw new IllegalArgumentException("Incrementer delta must be 1 or higher: '" +
+							field + "' in expression \"" + this.expression + "\"");
+				}
 				for (int i = range[0]; i <= range[1]; i += delta) {
 					bits.set(i);
 				}
@@ -366,28 +378,32 @@ private int[] getRange(String field, int min, int max) {
 			throw new IllegalArgumentException("Range less than minimum (" + min + "): '" +
 					field + "' in expression \"" + this.expression + "\"");
 		}
+		if (result[0] > result[1]) {
+			throw new IllegalArgumentException("Invalid inverted range: '" + field +
+					"' in expression \"" + this.expression + "\"");
+		}
 		return result;
 	}
 
-	String getExpression() {
-		return this.expression;
-	}
 
 	@Override
-	public boolean equals(Object obj) {
-		if (!(obj instanceof CronSequenceGenerator)) {
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof CronSequenceGenerator)) {
 			return false;
 		}
-		CronSequenceGenerator cron = (CronSequenceGenerator) obj;
-		return cron.months.equals(this.months) && cron.daysOfMonth.equals(this.daysOfMonth)
-				&& cron.daysOfWeek.equals(this.daysOfWeek) && cron.hours.equals(this.hours)
-				&& cron.minutes.equals(this.minutes) && cron.seconds.equals(this.seconds);
+		CronSequenceGenerator otherCron = (CronSequenceGenerator) other;
+		return (this.months.equals(otherCron.months) && this.daysOfMonth.equals(otherCron.daysOfMonth) &&
+				this.daysOfWeek.equals(otherCron.daysOfWeek) && this.hours.equals(otherCron.hours) &&
+				this.minutes.equals(otherCron.minutes) && this.seconds.equals(otherCron.seconds));
 	}
 
 	@Override
 	public int hashCode() {
-		return 37 + 17 * this.months.hashCode() + 29 * this.daysOfMonth.hashCode() + 37 * this.daysOfWeek.hashCode()
-				+ 41 * this.hours.hashCode() + 53 * this.minutes.hashCode() + 61 * this.seconds.hashCode();
+		return (17 * this.months.hashCode() + 29 * this.daysOfMonth.hashCode() + 37 * this.daysOfWeek.hashCode() +
+				41 * this.hours.hashCode() + 53 * this.minutes.hashCode() + 61 * this.seconds.hashCode());
 	}
 
 	@Override
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java
index 94f6385a1a..0a5b323d50 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 
 package org.springframework.scheduling.support;
 
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-
 import java.util.Date;
 import java.util.TimeZone;
 
+import org.springframework.scheduling.Trigger;
+import org.springframework.scheduling.TriggerContext;
+
 /**
  * {@link Trigger} implementation for cron expressions.
  * Wraps a {@link CronSequenceGenerator}.
@@ -37,24 +37,38 @@ public class CronTrigger implements Trigger {
 
 	/**
 	 * Build a {@link CronTrigger} from the pattern provided in the default time zone.
-	 * @param cronExpression a space-separated list of time fields,
-	 * following cron expression conventions
+	 * @param expression a space-separated list of time fields, following cron
+	 * expression conventions
 	 */
-	public CronTrigger(String cronExpression) {
-		this.sequenceGenerator = new CronSequenceGenerator(cronExpression);
+	public CronTrigger(String expression) {
+		this.sequenceGenerator = new CronSequenceGenerator(expression);
 	}
 
 	/**
-	 * Build a {@link CronTrigger} from the pattern provided.
-	 * @param cronExpression a space-separated list of time fields,
-	 * following cron expression conventions
+	 * Build a {@link CronTrigger} from the pattern provided in the given time zone.
+	 * @param expression a space-separated list of time fields, following cron
+	 * expression conventions
 	 * @param timeZone a time zone in which the trigger times will be generated
 	 */
-	public CronTrigger(String cronExpression, TimeZone timeZone) {
-		this.sequenceGenerator = new CronSequenceGenerator(cronExpression, timeZone);
+	public CronTrigger(String expression, TimeZone timeZone) {
+		this.sequenceGenerator = new CronSequenceGenerator(expression, timeZone);
+	}
+
+
+	/**
+	 * Return the cron pattern that this trigger has been built with.
+	 */
+	public String getExpression() {
+		return this.sequenceGenerator.getExpression();
 	}
 
 
+	/**
+	 * Determine the next execution time according to the given trigger context.
+	 * <p>Next execution times are calculated based on the
+	 * {@linkplain TriggerContext#lastCompletionTime completion time} of the
+	 * previous execution; therefore, overlapping executions won't occur.
+	 */
 	public Date nextExecutionTime(TriggerContext triggerContext) {
 		Date date = triggerContext.lastCompletionTime();
 		if (date != null) {
@@ -72,14 +86,11 @@ public Date nextExecutionTime(TriggerContext triggerContext) {
 		return this.sequenceGenerator.next(date);
 	}
 
-	public String getExpression() {
-		return this.sequenceGenerator.getExpression();
-	}
 
 	@Override
-	public boolean equals(Object obj) {
-		return (this == obj || (obj instanceof CronTrigger &&
-				this.sequenceGenerator.equals(((CronTrigger) obj).sequenceGenerator)));
+	public boolean equals(Object other) {
+		return (this == other || (other instanceof CronTrigger &&
+				this.sequenceGenerator.equals(((CronTrigger) other).sequenceGenerator)));
 	}
 
 	@Override
diff --git a/spring-context/src/main/java/org/springframework/scripting/ScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/ScriptFactory.java
index 2e2f255ae7..dc835a60ff 100644
--- a/spring-context/src/main/java/org/springframework/scripting/ScriptFactory.java
+++ b/spring-context/src/main/java/org/springframework/scripting/ScriptFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ public interface ScriptFactory {
 	 * its Java interfaces (such as in the case of Groovy).
 	 * @return the interfaces for the script
 	 */
-	Class[] getScriptInterfaces();
+	Class<?>[] getScriptInterfaces();
 
 	/**
 	 * Return whether the script requires a config interface to be
@@ -75,7 +75,7 @@ public interface ScriptFactory {
 	 * @throws IOException if script retrieval failed
 	 * @throws ScriptCompilationException if script compilation failed
 	 */
-	Object getScriptedObject(ScriptSource scriptSource, Class[] actualInterfaces)
+	Object getScriptedObject(ScriptSource scriptSource, Class<?>... actualInterfaces)
 			throws IOException, ScriptCompilationException;
 
 	/**
@@ -91,7 +91,7 @@ Object getScriptedObject(ScriptSource scriptSource, Class[] actualInterfaces)
 	 * @throws ScriptCompilationException if script compilation failed
 	 * @since 2.0.3
 	 */
-	Class getScriptedObjectType(ScriptSource scriptSource)
+	Class<?> getScriptedObjectType(ScriptSource scriptSource)
 			throws IOException, ScriptCompilationException;
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java
index 2d94a16cb8..6cf9c0fe79 100644
--- a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java
+++ b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,11 +45,11 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 
 	private final String scriptSourceLocator;
 
-	private final Class[] scriptInterfaces;
+	private final Class<?>[] scriptInterfaces;
 
 	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
 
-	private Class scriptClass;
+	private Class<?> scriptClass;
 
 	private final Object scriptClassMonitor = new Object();
 
@@ -64,7 +64,9 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 	 * Interpreted by the post-processor that actually creates the script.
 	 */
 	public BshScriptFactory(String scriptSourceLocator) {
-		this(scriptSourceLocator, null);
+		Assert.hasText(scriptSourceLocator, "'scriptSourceLocator' must not be empty");
+		this.scriptSourceLocator = scriptSourceLocator;
+		this.scriptInterfaces = null;
 	}
 
 	/**
@@ -78,12 +80,13 @@ public BshScriptFactory(String scriptSourceLocator) {
 	 * @param scriptInterfaces the Java interfaces that the scripted object
 	 * is supposed to implement (may be {@code null})
 	 */
-	public BshScriptFactory(String scriptSourceLocator, Class[] scriptInterfaces) {
+	public BshScriptFactory(String scriptSourceLocator, Class<?>... scriptInterfaces) {
 		Assert.hasText(scriptSourceLocator, "'scriptSourceLocator' must not be empty");
 		this.scriptSourceLocator = scriptSourceLocator;
 		this.scriptInterfaces = scriptInterfaces;
 	}
 
+
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -93,7 +96,7 @@ public String getScriptSourceLocator() {
 		return this.scriptSourceLocator;
 	}
 
-	public Class[] getScriptInterfaces() {
+	public Class<?>[] getScriptInterfaces() {
 		return this.scriptInterfaces;
 	}
 
@@ -108,12 +111,12 @@ public boolean requiresConfigInterface() {
 	 * Load and parse the BeanShell script via {@link BshScriptUtils}.
 	 * @see BshScriptUtils#createBshObject(String, Class[], ClassLoader)
 	 */
-	public Object getScriptedObject(ScriptSource scriptSource, Class[] actualInterfaces)
+	public Object getScriptedObject(ScriptSource scriptSource, Class<?>... actualInterfaces)
 			throws IOException, ScriptCompilationException {
 
-		try {
-			Class clazz = null;
+		Class<?> clazz;
 
+		try {
 			synchronized (this.scriptClassMonitor) {
 				boolean requiresScriptEvaluation = (this.wasModifiedForTypeCheck && this.scriptClass == null);
 				this.wasModifiedForTypeCheck = false;
@@ -125,7 +128,7 @@ public Object getScriptedObject(ScriptSource scriptSource, Class[] actualInterfa
 					if (result instanceof Class) {
 						// A Class: We'll cache the Class here and create an instance
 						// outside of the synchronized block.
-						this.scriptClass = (Class) result;
+						this.scriptClass = (Class<?>) result;
 					}
 					else {
 						// Not a Class: OK, we'll simply create BeanShell objects
@@ -137,33 +140,39 @@ public Object getScriptedObject(ScriptSource scriptSource, Class[] actualInterfa
 				}
 				clazz = this.scriptClass;
 			}
+		}
+		catch (EvalError ex) {
+			this.scriptClass = null;
+			throw new ScriptCompilationException(scriptSource, ex);
+		}
 
-			if (clazz != null) {
-				// A Class: We need to create an instance for every call.
-				try {
-					return clazz.newInstance();
-				}
-				catch (Throwable ex) {
-					throw new ScriptCompilationException(
-							scriptSource, "Could not instantiate script class: " + clazz.getName(), ex);
-				}
+		if (clazz != null) {
+			// A Class: We need to create an instance for every call.
+			try {
+				return clazz.newInstance();
+			}
+			catch (Throwable ex) {
+				throw new ScriptCompilationException(
+						scriptSource, "Could not instantiate script class: " + clazz.getName(), ex);
 			}
-			else {
-				// Not a Class: We need to evaluate the script for every call.
+		}
+		else {
+			// Not a Class: We need to evaluate the script for every call.
+			try {
 				return BshScriptUtils.createBshObject(
 						scriptSource.getScriptAsString(), actualInterfaces, this.beanClassLoader);
 			}
-		}
-		catch (EvalError ex) {
-			throw new ScriptCompilationException(scriptSource, ex);
+			catch (EvalError ex) {
+				throw new ScriptCompilationException(scriptSource, ex);
+			}
 		}
 	}
 
-	public Class getScriptedObjectType(ScriptSource scriptSource)
+	public Class<?> getScriptedObjectType(ScriptSource scriptSource)
 			throws IOException, ScriptCompilationException {
 
-		try {
-			synchronized (this.scriptClassMonitor) {
+		synchronized (this.scriptClassMonitor) {
+			try {
 				if (scriptSource.isModified()) {
 					// New script content: Let's check whether it evaluates to a Class.
 					this.wasModifiedForTypeCheck = true;
@@ -171,9 +180,10 @@ public Class getScriptedObjectType(ScriptSource scriptSource)
 				}
 				return this.scriptClass;
 			}
-		}
-		catch (EvalError ex) {
-			throw new ScriptCompilationException(scriptSource, ex);
+			catch (EvalError ex) {
+				this.scriptClass = null;
+				throw new ScriptCompilationException(scriptSource, ex);
+			}
 		}
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java
index d71298e29c..92ec907419 100644
--- a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java
+++ b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ public static Object createBshObject(String scriptSource) throws EvalError {
 	 * @throws EvalError in case of BeanShell parsing failure
 	 * @see #createBshObject(String, Class[], ClassLoader)
 	 */
-	public static Object createBshObject(String scriptSource, Class[] scriptInterfaces) throws EvalError {
+	public static Object createBshObject(String scriptSource, Class<?>... scriptInterfaces) throws EvalError {
 		return createBshObject(scriptSource, scriptInterfaces, ClassUtils.getDefaultClassLoader());
 	}
 
@@ -80,16 +80,16 @@ public static Object createBshObject(String scriptSource, Class[] scriptInterfac
 	 * @param scriptInterfaces the interfaces that the scripted Java object is
 	 * supposed to implement (may be {@code null} or empty if the script itself
 	 * declares a full class or returns an actual instance of the scripted object)
-	 * @param classLoader the ClassLoader to create the script proxy with
+	 * @param classLoader the ClassLoader to use for evaluating the script
 	 * @return the scripted Java object
 	 * @throws EvalError in case of BeanShell parsing failure
 	 */
-	public static Object createBshObject(String scriptSource, Class[] scriptInterfaces, ClassLoader classLoader)
+	public static Object createBshObject(String scriptSource, Class<?>[] scriptInterfaces, ClassLoader classLoader)
 			throws EvalError {
 
 		Object result = evaluateBshScript(scriptSource, scriptInterfaces, classLoader);
 		if (result instanceof Class) {
-			Class clazz = (Class) result;
+			Class<?> clazz = (Class<?>) result;
 			try {
 				return clazz.newInstance();
 			}
@@ -113,12 +113,12 @@ public static Object createBshObject(String scriptSource, Class[] scriptInterfac
 	 * @return the scripted Java class, or {@code null} if none could be determined
 	 * @throws EvalError in case of BeanShell parsing failure
 	 */
-	static Class determineBshObjectType(String scriptSource) throws EvalError {
+	static Class<?> determineBshObjectType(String scriptSource) throws EvalError {
 		Assert.hasText(scriptSource, "Script source must not be empty");
 		Interpreter interpreter = new Interpreter();
 		Object result = interpreter.eval(scriptSource);
 		if (result instanceof Class) {
-			return (Class) result;
+			return (Class<?>) result;
 		}
 		else if (result != null) {
 			return result.getClass();
@@ -139,11 +139,11 @@ else if (result != null) {
 	 * @param scriptInterfaces the interfaces that the scripted Java object is
 	 * supposed to implement (may be {@code null} or empty if the script itself
 	 * declares a full class or returns an actual instance of the scripted object)
-	 * @param classLoader the ClassLoader to create the script proxy with
+	 * @param classLoader the ClassLoader to use for evaluating the script
 	 * @return the scripted Java class or Java object
 	 * @throws EvalError in case of BeanShell parsing failure
 	 */
-	static Object evaluateBshScript(String scriptSource, Class[] scriptInterfaces, ClassLoader classLoader)
+	static Object evaluateBshScript(String scriptSource, Class<?>[] scriptInterfaces, ClassLoader classLoader)
 			throws EvalError {
 
 		Assert.hasText(scriptSource, "Script source must not be empty");
diff --git a/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java
index f12e4004bf..903abfef2c 100644
--- a/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,13 +39,13 @@
  * Allows for objects written using dynamic languages to be easily exposed with
  * the {@link org.springframework.beans.factory.BeanFactory}.
  *
- * <p>The script for each object can be specified either as a reference to the Resource
- * containing it (using the '{@code script-source}' attribute) or inline in the XML configuration
- * itself (using the '{@code inline-script}' attribute.
+ * <p>The script for each object can be specified either as a reference to the
+ * resource containing it (using the '{@code script-source}' attribute) or inline
+ * in the XML configuration itself (using the '{@code inline-script}' attribute.
  *
- * <p>By default, dynamic objects created with these tags are <strong>not</strong> refreshable.
- * To enable refreshing, specify the refresh check delay for each object (in milliseconds) using the
- * '{@code refresh-check-delay}' attribute.
+ * <p>By default, dynamic objects created with these tags are <strong>not</strong>
+ * refreshable. To enable refreshing, specify the refresh check delay for each
+ * object (in milliseconds) using the '{@code refresh-check-delay}' attribute.
  *
  * @author Rob Harrop
  * @author Rod Johnson
@@ -171,14 +171,13 @@ else if (beanDefinitionDefaults.getDestroyMethodName() != null) {
 		// Attach any refresh metadata.
 		String refreshCheckDelay = element.getAttribute(REFRESH_CHECK_DELAY_ATTRIBUTE);
 		if (StringUtils.hasText(refreshCheckDelay)) {
-			bd.setAttribute(ScriptFactoryPostProcessor.REFRESH_CHECK_DELAY_ATTRIBUTE, new Long(refreshCheckDelay));
+			bd.setAttribute(ScriptFactoryPostProcessor.REFRESH_CHECK_DELAY_ATTRIBUTE, Long.valueOf(refreshCheckDelay));
 		}
 
 		// Attach any proxy target class metadata.
 		String proxyTargetClass = element.getAttribute(PROXY_TARGET_CLASS_ATTRIBUTE);
 		if (StringUtils.hasText(proxyTargetClass)) {
-			Boolean flag = new Boolean(proxyTargetClass);
-			bd.setAttribute(ScriptFactoryPostProcessor.PROXY_TARGET_CLASS_ATTRIBUTE, flag);
+			bd.setAttribute(ScriptFactoryPostProcessor.PROXY_TARGET_CLASS_ATTRIBUTE, Boolean.valueOf(proxyTargetClass));
 		}
 
 		// Add constructor arguments.
@@ -213,7 +212,7 @@ else if (beanDefinitionDefaults.getDestroyMethodName() != null) {
 	 */
 	private String resolveScriptSource(Element element, XmlReaderContext readerContext) {
 		boolean hasScriptSource = element.hasAttribute(SCRIPT_SOURCE_ATTRIBUTE);
-		List elements = DomUtils.getChildElementsByTagName(element, INLINE_SCRIPT_ELEMENT);
+		List<Element> elements = DomUtils.getChildElementsByTagName(element, INLINE_SCRIPT_ELEMENT);
 		if (hasScriptSource && !elements.isEmpty()) {
 			readerContext.error("Only one of 'script-source' and 'inline-script' should be specified.", element);
 			return null;
@@ -222,7 +221,7 @@ else if (hasScriptSource) {
 			return element.getAttribute(SCRIPT_SOURCE_ATTRIBUTE);
 		}
 		else if (!elements.isEmpty()) {
-			Element inlineElement = (Element) elements.get(0);
+			Element inlineElement = elements.get(0);
 			return "inline:" + DomUtils.getTextValue(inlineElement);
 		}
 		else {
diff --git a/spring-context/src/main/java/org/springframework/scripting/config/ScriptingDefaultsParser.java b/spring-context/src/main/java/org/springframework/scripting/config/ScriptingDefaultsParser.java
index d0766b95f4..9a758b8c5a 100644
--- a/spring-context/src/main/java/org/springframework/scripting/config/ScriptingDefaultsParser.java
+++ b/spring-context/src/main/java/org/springframework/scripting/config/ScriptingDefaultsParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 				LangNamespaceUtils.registerScriptFactoryPostProcessorIfNecessary(parserContext.getRegistry());
 		String refreshCheckDelay = element.getAttribute(REFRESH_CHECK_DELAY_ATTRIBUTE);
 		if (StringUtils.hasText(refreshCheckDelay)) {
-			bd.getPropertyValues().add("defaultRefreshCheckDelay", new Long(refreshCheckDelay));
+			bd.getPropertyValues().add("defaultRefreshCheckDelay", Long.valueOf(refreshCheckDelay));
 		}
 		String proxyTargetClass = element.getAttribute(PROXY_TARGET_CLASS_ATTRIBUTE);
 		if (StringUtils.hasText(proxyTargetClass)) {
diff --git a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java
index e40871defb..d0b958005f 100644
--- a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java
+++ b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import groovy.lang.Script;
 import org.codehaus.groovy.control.CompilationFailedException;
 
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -58,9 +57,9 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
 
 	private GroovyClassLoader groovyClassLoader;
 
-	private Class scriptClass;
+	private Class<?> scriptClass;
 
-	private Class scriptResultClass;
+	private Class<?> scriptResultClass;
 
 	private CachedResultHolder cachedResult;
 
@@ -99,7 +98,7 @@ public GroovyScriptFactory(String scriptSourceLocator, GroovyObjectCustomizer gr
 	}
 
 
-	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+	public void setBeanFactory(BeanFactory beanFactory) {
 		if (beanFactory instanceof ConfigurableListableBeanFactory) {
 			((ConfigurableListableBeanFactory) beanFactory).ignoreDependencyType(MetaClass.class);
 		}
@@ -131,7 +130,7 @@ public String getScriptSourceLocator() {
 	 * hence we don't need to explicitly expose interfaces here.
 	 * @return {@code null} always
 	 */
-	public Class[] getScriptInterfaces() {
+	public Class<?>[] getScriptInterfaces() {
 		return null;
 	}
 
@@ -148,13 +147,12 @@ public boolean requiresConfigInterface() {
 	 * Loads and parses the Groovy script via the GroovyClassLoader.
 	 * @see groovy.lang.GroovyClassLoader
 	 */
-	public Object getScriptedObject(ScriptSource scriptSource, Class[] actualInterfaces)
+	public Object getScriptedObject(ScriptSource scriptSource, Class<?>... actualInterfaces)
 			throws IOException, ScriptCompilationException {
 
-		try {
-			Class scriptClassToExecute = null;
-
-			synchronized (this.scriptClassMonitor) {
+		synchronized (this.scriptClassMonitor) {
+			try {
+				Class<?> scriptClassToExecute;
 				this.wasModifiedForTypeCheck = false;
 
 				if (this.cachedResult != null) {
@@ -179,21 +177,23 @@ public Object getScriptedObject(ScriptSource scriptSource, Class[] actualInterfa
 					}
 				}
 				scriptClassToExecute = this.scriptClass;
-			}
 
-			// Process re-execution outside of the synchronized block.
-			return executeScript(scriptSource, scriptClassToExecute);
-		}
-		catch (CompilationFailedException ex) {
-			throw new ScriptCompilationException(scriptSource, ex);
+				// Process re-execution outside of the synchronized block.
+				return executeScript(scriptSource, scriptClassToExecute);
+			}
+			catch (CompilationFailedException ex) {
+				this.scriptClass = null;
+				this.scriptResultClass = null;
+				throw new ScriptCompilationException(scriptSource, ex);
+			}
 		}
 	}
 
-	public Class getScriptedObjectType(ScriptSource scriptSource)
+	public Class<?> getScriptedObjectType(ScriptSource scriptSource)
 			throws IOException, ScriptCompilationException {
 
-		try {
-			synchronized (this.scriptClassMonitor) {
+		synchronized (this.scriptClassMonitor) {
+			try {
 				if (this.scriptClass == null || scriptSource.isModified()) {
 					// New script content...
 					this.wasModifiedForTypeCheck = true;
@@ -212,9 +212,12 @@ public Class getScriptedObjectType(ScriptSource scriptSource)
 				}
 				return this.scriptResultClass;
 			}
-		}
-		catch (CompilationFailedException ex) {
-			throw new ScriptCompilationException(scriptSource, ex);
+			catch (CompilationFailedException ex) {
+				this.scriptClass = null;
+				this.scriptResultClass = null;
+				this.cachedResult = null;
+				throw new ScriptCompilationException(scriptSource, ex);
+			}
 		}
 	}
 
@@ -233,7 +236,7 @@ public boolean requiresScriptedObjectRefresh(ScriptSource scriptSource) {
 	 * or the result of running the script instance)
 	 * @throws ScriptCompilationException in case of instantiation failure
 	 */
-	protected Object executeScript(ScriptSource scriptSource, Class scriptClass) throws ScriptCompilationException {
+	protected Object executeScript(ScriptSource scriptSource, Class<?> scriptClass) throws ScriptCompilationException {
 		try {
 			GroovyObject goo = (GroovyObject) scriptClass.newInstance();
 
diff --git a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java
index 3611f04e5c..5f468bc6c7 100644
--- a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java
+++ b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ public class JRubyScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 
 	private final String scriptSourceLocator;
 
-	private final Class[] scriptInterfaces;
+	private final Class<?>[] scriptInterfaces;
 
 	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
 
@@ -59,7 +59,7 @@ public class JRubyScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 	 * @param scriptInterfaces the Java interfaces that the scripted object
 	 * is supposed to implement
 	 */
-	public JRubyScriptFactory(String scriptSourceLocator, Class[] scriptInterfaces) {
+	public JRubyScriptFactory(String scriptSourceLocator, Class<?>... scriptInterfaces) {
 		Assert.hasText(scriptSourceLocator, "'scriptSourceLocator' must not be empty");
 		Assert.notEmpty(scriptInterfaces, "'scriptInterfaces' must not be empty");
 		this.scriptSourceLocator = scriptSourceLocator;
@@ -76,7 +76,7 @@ public String getScriptSourceLocator() {
 		return this.scriptSourceLocator;
 	}
 
-	public Class[] getScriptInterfaces() {
+	public Class<?>[] getScriptInterfaces() {
 		return this.scriptInterfaces;
 	}
 
@@ -91,7 +91,7 @@ public boolean requiresConfigInterface() {
 	 * Load and parse the JRuby script via JRubyScriptUtils.
 	 * @see JRubyScriptUtils#createJRubyObject(String, Class[], ClassLoader)
 	 */
-	public Object getScriptedObject(ScriptSource scriptSource, Class[] actualInterfaces)
+	public Object getScriptedObject(ScriptSource scriptSource, Class<?>... actualInterfaces)
 			throws IOException, ScriptCompilationException {
 		try {
 			return JRubyScriptUtils.createJRubyObject(
@@ -108,7 +108,7 @@ public Object getScriptedObject(ScriptSource scriptSource, Class[] actualInterfa
 		}
 	}
 
-	public Class getScriptedObjectType(ScriptSource scriptSource)
+	public Class<?> getScriptedObjectType(ScriptSource scriptSource)
 			throws IOException, ScriptCompilationException {
 
 		return null;
diff --git a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
index 3d019c22fe..14ef12cf35 100644
--- a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
+++ b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ public abstract class JRubyScriptUtils {
 	 * @throws JumpException in case of JRuby parsing failure
 	 * @see ClassUtils#getDefaultClassLoader()
 	 */
-	public static Object createJRubyObject(String scriptSource, Class[] interfaces) throws JumpException {
+	public static Object createJRubyObject(String scriptSource, Class<?>... interfaces) throws JumpException {
 		return createJRubyObject(scriptSource, interfaces, ClassUtils.getDefaultClassLoader());
 	}
 
@@ -76,11 +76,11 @@ public static Object createJRubyObject(String scriptSource, Class[] interfaces)
 	 * @throws JumpException in case of JRuby parsing failure
 	 */
 	@SuppressWarnings("deprecation")
-	public static Object createJRubyObject(String scriptSource, Class[] interfaces, ClassLoader classLoader) {
+	public static Object createJRubyObject(String scriptSource, Class<?>[] interfaces, ClassLoader classLoader) {
 		Ruby ruby = initializeRuntime();
 
 		Node scriptRootNode = ruby.parseEval(scriptSource, "", null, 0);
-		// keep using the deprecated runNormally variant for JRuby 1.1/1.2 compatibility...
+		// Keep using the deprecated runNormally variant for JRuby 1.1/1.2 compatibility...
         IRubyObject rubyObject = ruby.runNormally(scriptRootNode, false);
 
 		if (rubyObject instanceof RubyNil) {
@@ -118,10 +118,12 @@ private static String findClassName(Node rootNode) {
 
 	/**
 	 * Find the first {@link ClassNode} under the supplied {@link Node}.
-	 * @return the found {@code ClassNode}, or {@code null}
-	 * if no {@link ClassNode} is found
+	 * @return the corresponding {@code ClassNode}, or {@code null} if none found
 	 */
 	private static ClassNode findClassNode(Node node) {
+		if (node == null) {
+			return null;
+		}
 		if (node instanceof ClassNode) {
 			return (ClassNode) node;
 		}
@@ -132,16 +134,16 @@ private static ClassNode findClassNode(Node node) {
 			}
 			else if (child instanceof NewlineNode) {
 				NewlineNode nn = (NewlineNode) child;
-				Node found = findClassNode(nn.getNextNode());
-				if (found instanceof ClassNode) {
-					return (ClassNode) found;
+				ClassNode found = findClassNode(nn.getNextNode());
+				if (found != null) {
+					return found;
 				}
 			}
 		}
 		for (Node child : children) {
-			Node found = findClassNode(child);
-			if (found instanceof ClassNode) {
-				return (ClassNode) found;
+			ClassNode found = findClassNode(child);
+			if (found != null) {
+				return found;
 			}
 		}
 		return null;
@@ -207,7 +209,7 @@ private IRubyObject[] convertToRuby(Object[] javaArgs) {
 			return rubyArgs;
 		}
 
-		private Object convertFromRuby(IRubyObject rubyResult, Class returnType) {
+		private Object convertFromRuby(IRubyObject rubyResult, Class<?> returnType) {
 			Object result = JavaEmbedUtils.rubyToJava(this.ruby, rubyResult, returnType);
 			if (result instanceof RubyArray && returnType.isArray()) {
 				result = convertFromRubyArray(((RubyArray) result).toJavaArray(), returnType);
@@ -215,8 +217,8 @@ private Object convertFromRuby(IRubyObject rubyResult, Class returnType) {
 			return result;
 		}
 
-		private Object convertFromRubyArray(IRubyObject[] rubyArray, Class returnType) {
-			Class targetType = returnType.getComponentType();
+		private Object convertFromRubyArray(IRubyObject[] rubyArray, Class<?> returnType) {
+			Class<?> targetType = returnType.getComponentType();
 			Object javaArray = Array.newInstance(targetType, rubyArray.length);
 			for (int i = 0; i < rubyArray.length; i++) {
 				IRubyObject rubyObject = rubyArray[i];
@@ -230,8 +232,8 @@ private Object convertFromRubyArray(IRubyObject[] rubyArray, Class returnType) {
 	/**
 	 * Exception thrown in response to a JRuby {@link RaiseException}
 	 * being thrown from a JRuby method invocation.
-	 * <p>Introduced because the {@code RaiseException} class does not
-	 * have useful {@link Object#toString()}, {@link Throwable#getMessage()},
+	 * <p>Introduced because early versions of the {@code RaiseException} class did
+	 * not have useful {@link Object#toString()}, {@link Throwable#getMessage()},
 	 * and {@link Throwable#printStackTrace} implementations.
 	 */
 	@SuppressWarnings("serial")
@@ -248,7 +250,7 @@ public JRubyExecutionException(RaiseException ex) {
 
 		private static String buildMessage(RaiseException ex) {
 			RubyException rubyEx = ex.getException();
-			return (rubyEx != null && rubyEx.message != null) ? rubyEx.message.toString() : "Unexpected JRuby error";
+			return (rubyEx != null && rubyEx.message != null ? rubyEx.message.toString() : "Unexpected JRuby error");
 		}
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java
index c0de42493f..9934edc0ea 100644
--- a/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java
+++ b/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.core.io.Resource;
 import org.springframework.scripting.ScriptSource;
 import org.springframework.util.Assert;
@@ -51,11 +52,12 @@ public class ResourceScriptSource implements ScriptSource {
 
 	private final Resource resource;
 
+	private String encoding = "UTF-8";
+
 	private long lastModified = -1;
 
 	private final Object lastModifiedMonitor = new Object();
 
-	private String encoding = "UTF-8";
 
 	/**
 	 * Create a new ResourceScriptSource for the given resource.
@@ -74,15 +76,23 @@ public final Resource getResource() {
 		return this.resource;
 	}
 
+	/**
+	 * Set the encoding used for reading the script resource.
+	 * <p>The default value for regular Resources is "UTF-8".
+	 * A {@code null} value implies the platform default.
+	 */
+	public void setEncoding(String encoding) {
+		this.encoding = encoding;
+	}
+
+
 	public String getScriptAsString() throws IOException {
 		synchronized (this.lastModifiedMonitor) {
 			this.lastModified = retrieveLastModifiedTime();
 		}
-
 		InputStream stream = this.resource.getInputStream();
-		Reader reader = (StringUtils.hasText(encoding) ? new InputStreamReader(stream, encoding)
-				: new InputStreamReader(stream));
-
+		Reader reader = (StringUtils.hasText(this.encoding) ? new InputStreamReader(stream, this.encoding) :
+				new InputStreamReader(stream));
 		return FileCopyUtils.copyToString(reader);
 	}
 
@@ -99,10 +109,11 @@ public boolean isModified() {
 	protected long retrieveLastModifiedTime() {
 		try {
 			return getResource().lastModified();
-		} catch (IOException ex) {
+		}
+		catch (IOException ex) {
 			if (logger.isDebugEnabled()) {
-				logger.debug(getResource() + " could not be resolved in the file system - "
-						+ "current timestamp not available for script modification check", ex);
+				logger.debug(getResource() + " could not be resolved in the file system - " +
+						"current timestamp not available for script modification check", ex);
 			}
 			return 0;
 		}
@@ -112,18 +123,9 @@ public String suggestedClassName() {
 		return StringUtils.stripFilenameExtension(getResource().getFilename());
 	}
 
-	/**
-	 * Sets the encoding used for reading the script resource. The default value is "UTF-8".
-	 * A null value, implies the platform default.
-	 *
-	 * @param encoding charset encoding used for reading the script.
-	 */
-	public void setEncoding(String encoding) {
-		this.encoding = encoding;
-	}
-
 	@Override
 	public String toString() {
 		return this.resource.toString();
 	}
+
 }
diff --git a/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java b/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
index d46917005f..156e322e02 100644
--- a/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,15 +23,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.asm.Type;
-
-import org.springframework.cglib.core.Signature;
-import org.springframework.cglib.proxy.InterfaceMaker;
-
 import org.springframework.aop.TargetSource;
 import org.springframework.aop.framework.AopInfrastructureBean;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.DelegatingIntroductionInterceptor;
+import org.springframework.asm.Type;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.BeanClassLoaderAware;
@@ -50,6 +46,8 @@
 import org.springframework.beans.factory.support.BeanDefinitionValidationException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
+import org.springframework.cglib.core.Signature;
+import org.springframework.cglib.proxy.InterfaceMaker;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.Conventions;
 import org.springframework.core.Ordered;
@@ -96,7 +94,7 @@
  *   &lt;property name="message" value="Hello World!"/&gt;
  * &lt;/bean&gt;
  *
- * &lt;bean id="groovyMessenger" class="org.springframework.scripting.bsh.GroovyScriptFactory"&gt;
+ * &lt;bean id="groovyMessenger" class="org.springframework.scripting.groovy.GroovyScriptFactory"&gt;
  *   &lt;constructor-arg value="classpath:mypackage/Messenger.groovy"/&gt;
  *   &lt;property name="message" value="Hello World!"/&gt;
  * &lt;/bean&gt;</pre>
@@ -200,10 +198,12 @@ public void setDefaultProxyTargetClass(boolean defaultProxyTargetClass) {
 		this.defaultProxyTargetClass = defaultProxyTargetClass;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (!(beanFactory instanceof ConfigurableBeanFactory)) {
 			throw new IllegalStateException("ScriptFactoryPostProcessor doesn't work with a BeanFactory "
@@ -226,16 +226,18 @@ public void setBeanFactory(BeanFactory beanFactory) {
 		}
 	}
 
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourceLoader = resourceLoader;
 	}
 
+	@Override
 	public int getOrder() {
 		return Integer.MIN_VALUE;
 	}
 
 	@Override
-	public Class predictBeanType(Class beanClass, String beanName) {
+	public Class<?> predictBeanType(Class<?> beanClass, String beanName) {
 		// We only apply special treatment to ScriptFactory implementations here.
 		if (!ScriptFactory.class.isAssignableFrom(beanClass)) {
 			return null;
@@ -250,14 +252,16 @@ public Class predictBeanType(Class beanClass, String beanName) {
 
 			ScriptFactory scriptFactory = this.scriptBeanFactory.getBean(scriptFactoryBeanName, ScriptFactory.class);
 			ScriptSource scriptSource = getScriptSource(scriptFactoryBeanName, scriptFactory.getScriptSourceLocator());
-			Class[] interfaces = scriptFactory.getScriptInterfaces();
+			Class<?>[] interfaces = scriptFactory.getScriptInterfaces();
 
-			Class scriptedType = scriptFactory.getScriptedObjectType(scriptSource);
+			Class<?> scriptedType = scriptFactory.getScriptedObjectType(scriptSource);
 			if (scriptedType != null) {
 				return scriptedType;
-			} else if (!ObjectUtils.isEmpty(interfaces)) {
+			}
+			else if (!ObjectUtils.isEmpty(interfaces)) {
 				return (interfaces.length == 1 ? interfaces[0] : createCompositeInterface(interfaces));
-			} else {
+			}
+			else {
 				if (bd.isSingleton()) {
 					Object bean = this.scriptBeanFactory.getBean(scriptedObjectBeanName);
 					if (bean != null) {
@@ -265,14 +269,16 @@ public Class predictBeanType(Class beanClass, String beanName) {
 					}
 				}
 			}
-		} catch (Exception ex) {
+		}
+		catch (Exception ex) {
 			if (ex instanceof BeanCreationException
 					&& ((BeanCreationException) ex).getMostSpecificCause() instanceof BeanCurrentlyInCreationException) {
 				if (logger.isTraceEnabled()) {
 					logger.trace("Could not determine scripted object type for bean '" + beanName + "': "
 							+ ex.getMessage());
 				}
-			} else {
+			}
+			else {
 				if (logger.isDebugEnabled()) {
 					logger.debug("Could not determine scripted object type for bean '" + beanName + "'", ex);
 				}
@@ -283,7 +289,7 @@ public Class predictBeanType(Class beanClass, String beanName) {
 	}
 
 	@Override
-	public Object postProcessBeforeInstantiation(Class beanClass, String beanName) {
+	public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName) {
 		// We only apply special treatment to ScriptFactory implementations here.
 		if (!ScriptFactory.class.isAssignableFrom(beanClass)) {
 			return null;
@@ -298,27 +304,28 @@ public Object postProcessBeforeInstantiation(Class beanClass, String beanName) {
 		ScriptSource scriptSource = getScriptSource(scriptFactoryBeanName, scriptFactory.getScriptSourceLocator());
 		boolean isFactoryBean = false;
 		try {
-			Class scriptedObjectType = scriptFactory.getScriptedObjectType(scriptSource);
+			Class<?> scriptedObjectType = scriptFactory.getScriptedObjectType(scriptSource);
 			// Returned type may be null if the factory is unable to determine the type.
 			if (scriptedObjectType != null) {
 				isFactoryBean = FactoryBean.class.isAssignableFrom(scriptedObjectType);
 			}
-		} catch (Exception ex) {
-			throw new BeanCreationException(beanName, "Could not determine scripted object type for " + scriptFactory,
-					ex);
+		}
+		catch (Exception ex) {
+			throw new BeanCreationException(beanName,
+					"Could not determine scripted object type for " + scriptFactory, ex);
 		}
 
 		long refreshCheckDelay = resolveRefreshCheckDelay(bd);
 		if (refreshCheckDelay >= 0) {
-			Class[] interfaces = scriptFactory.getScriptInterfaces();
+			Class<?>[] interfaces = scriptFactory.getScriptInterfaces();
 			RefreshableScriptTargetSource ts = new RefreshableScriptTargetSource(this.scriptBeanFactory,
 					scriptedObjectBeanName, scriptFactory, scriptSource, isFactoryBean);
 			boolean proxyTargetClass = resolveProxyTargetClass(bd);
 			String language = (String) bd.getAttribute(LANGUAGE_ATTRIBUTE);
-			if (proxyTargetClass && (language==null || !language.equals("groovy"))) {
+			if (proxyTargetClass && (language == null || !language.equals("groovy"))) {
 				throw new BeanDefinitionValidationException(
-						"Cannot use proxyTargetClass=true with script beans where language is not groovy (found "
-								+ language + ")");
+						"Cannot use proxyTargetClass=true with script beans where language is not 'groovy': '" +
+						language + "'");
 			}
 			ts.setRefreshCheckDelay(refreshCheckDelay);
 			return createRefreshableProxy(ts, interfaces, proxyTargetClass);
@@ -339,17 +346,16 @@ public Object postProcessBeforeInstantiation(Class beanClass, String beanName) {
 	 * @param scriptedObjectBeanName the name of the internal scripted object bean
 	 */
 	protected void prepareScriptBeans(BeanDefinition bd, String scriptFactoryBeanName, String scriptedObjectBeanName) {
-
 		// Avoid recreation of the script bean definition in case of a prototype.
 		synchronized (this.scriptBeanFactory) {
 			if (!this.scriptBeanFactory.containsBeanDefinition(scriptedObjectBeanName)) {
 
-				this.scriptBeanFactory.registerBeanDefinition(scriptFactoryBeanName,
-						createScriptFactoryBeanDefinition(bd));
-				ScriptFactory scriptFactory = this.scriptBeanFactory
-						.getBean(scriptFactoryBeanName, ScriptFactory.class);
-				ScriptSource scriptSource = getScriptSource(scriptFactoryBeanName,
-						scriptFactory.getScriptSourceLocator());
+				this.scriptBeanFactory.registerBeanDefinition(
+						scriptFactoryBeanName, createScriptFactoryBeanDefinition(bd));
+				ScriptFactory scriptFactory =
+						this.scriptBeanFactory.getBean(scriptFactoryBeanName, ScriptFactory.class);
+				ScriptSource scriptSource =
+						getScriptSource(scriptFactoryBeanName, scriptFactory.getScriptSourceLocator());
 				Class<?>[] interfaces = scriptFactory.getScriptInterfaces();
 
 				Class<?>[] scriptedInterfaces = interfaces;
@@ -358,8 +364,8 @@ protected void prepareScriptBeans(BeanDefinition bd, String scriptFactoryBeanNam
 					scriptedInterfaces = ObjectUtils.addObjectToArray(interfaces, configInterface);
 				}
 
-				BeanDefinition objectBd = createScriptedObjectBeanDefinition(bd, scriptFactoryBeanName, scriptSource,
-						scriptedInterfaces);
+				BeanDefinition objectBd = createScriptedObjectBeanDefinition(
+						bd, scriptFactoryBeanName, scriptSource, scriptedInterfaces);
 				long refreshCheckDelay = resolveRefreshCheckDelay(bd);
 				if (refreshCheckDelay >= 0) {
 					objectBd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
@@ -385,12 +391,14 @@ protected long resolveRefreshCheckDelay(BeanDefinition beanDefinition) {
 		Object attributeValue = beanDefinition.getAttribute(REFRESH_CHECK_DELAY_ATTRIBUTE);
 		if (attributeValue instanceof Number) {
 			refreshCheckDelay = ((Number) attributeValue).longValue();
-		} else if (attributeValue instanceof String) {
+		}
+		else if (attributeValue instanceof String) {
 			refreshCheckDelay = Long.parseLong((String) attributeValue);
-		} else if (attributeValue != null) {
-			throw new BeanDefinitionStoreException("Invalid refresh check delay attribute ["
-					+ REFRESH_CHECK_DELAY_ATTRIBUTE + "] with value [" + attributeValue
-					+ "]: needs to be of type Number or String");
+		}
+		else if (attributeValue != null) {
+			throw new BeanDefinitionStoreException("Invalid refresh check delay attribute [" +
+					REFRESH_CHECK_DELAY_ATTRIBUTE + "] with value '" + attributeValue +
+					"': needs to be of type Number or String");
 		}
 		return refreshCheckDelay;
 	}
@@ -399,13 +407,15 @@ protected boolean resolveProxyTargetClass(BeanDefinition beanDefinition) {
 		boolean proxyTargetClass = this.defaultProxyTargetClass;
 		Object attributeValue = beanDefinition.getAttribute(PROXY_TARGET_CLASS_ATTRIBUTE);
 		if (attributeValue instanceof Boolean) {
-			proxyTargetClass = ((Boolean) attributeValue).booleanValue();
-		} else if (attributeValue instanceof String) {
-			proxyTargetClass = new Boolean((String) attributeValue);
-		} else if (attributeValue != null) {
-			throw new BeanDefinitionStoreException("Invalid refresh check delay attribute ["
-					+ REFRESH_CHECK_DELAY_ATTRIBUTE + "] with value [" + attributeValue
-					+ "]: needs to be of type Number or String");
+			proxyTargetClass = (Boolean) attributeValue;
+		}
+		else if (attributeValue instanceof String) {
+			proxyTargetClass = Boolean.valueOf((String) attributeValue);
+		}
+		else if (attributeValue != null) {
+			throw new BeanDefinitionStoreException("Invalid proxy target class attribute [" +
+					PROXY_TARGET_CLASS_ATTRIBUTE + "] with value '" + attributeValue +
+					"': needs to be of type Boolean or String");
 		}
 		return proxyTargetClass;
 	}
@@ -459,7 +469,8 @@ protected ScriptSource convertToScriptSource(String beanName, String scriptSourc
 
 		if (scriptSourceLocator.startsWith(INLINE_SCRIPT_PREFIX)) {
 			return new StaticScriptSource(scriptSourceLocator.substring(INLINE_SCRIPT_PREFIX.length()), beanName);
-		} else {
+		}
+		else {
 			return new ResourceScriptSource(resourceLoader.getResource(scriptSourceLocator));
 		}
 	}
@@ -478,14 +489,14 @@ protected ScriptSource convertToScriptSource(String beanName, String scriptSourc
 	 * @see org.springframework.cglib.proxy.InterfaceMaker
 	 * @see org.springframework.beans.BeanUtils#findPropertyType
 	 */
-	protected Class createConfigInterface(BeanDefinition bd, Class[] interfaces) {
+	protected Class<?> createConfigInterface(BeanDefinition bd, Class<?>[] interfaces) {
 		InterfaceMaker maker = new InterfaceMaker();
 		PropertyValue[] pvs = bd.getPropertyValues().getPropertyValues();
 		for (PropertyValue pv : pvs) {
 			String propertyName = pv.getName();
-			Class propertyType = BeanUtils.findPropertyType(propertyName, interfaces);
+			Class<?> propertyType = BeanUtils.findPropertyType(propertyName, interfaces);
 			String setterName = "set" + StringUtils.capitalize(propertyName);
-			Signature signature = new Signature(setterName, Type.VOID_TYPE, new Type[] { Type.getType(propertyType) });
+			Signature signature = new Signature(setterName, Type.VOID_TYPE, new Type[] {Type.getType(propertyType)});
 			maker.add(signature, new Type[0]);
 		}
 		if (bd instanceof AbstractBeanDefinition) {
@@ -511,7 +522,7 @@ protected Class createConfigInterface(BeanDefinition bd, Class[] interfaces) {
 	 * @return the merged interface as Class
 	 * @see java.lang.reflect.Proxy#getProxyClass
 	 */
-	protected Class createCompositeInterface(Class[] interfaces) {
+	protected Class<?> createCompositeInterface(Class<?>[] interfaces) {
 		return ClassUtils.createCompositeInterface(interfaces, this.beanClassLoader);
 	}
 
@@ -527,7 +538,7 @@ protected Class createCompositeInterface(Class[] interfaces) {
 	 * @see org.springframework.scripting.ScriptFactory#getScriptedObject
 	 */
 	protected BeanDefinition createScriptedObjectBeanDefinition(BeanDefinition bd, String scriptFactoryBeanName,
-			ScriptSource scriptSource, Class[] interfaces) {
+			ScriptSource scriptSource, Class<?>[] interfaces) {
 
 		GenericBeanDefinition objectBd = new GenericBeanDefinition(bd);
 		objectBd.setFactoryBeanName(scriptFactoryBeanName);
@@ -546,7 +557,7 @@ protected BeanDefinition createScriptedObjectBeanDefinition(BeanDefinition bd, S
 	 * @return the generated proxy
 	 * @see RefreshableScriptTargetSource
 	 */
-	protected Object createRefreshableProxy(TargetSource ts, Class[] interfaces, boolean proxyTargetClass) {
+	protected Object createRefreshableProxy(TargetSource ts, Class<?>[] interfaces, boolean proxyTargetClass) {
 		ProxyFactory proxyFactory = new ProxyFactory();
 		proxyFactory.setTargetSource(ts);
 		ClassLoader classLoader = this.beanClassLoader;
@@ -556,8 +567,8 @@ protected Object createRefreshableProxy(TargetSource ts, Class[] interfaces, boo
 		}
 		proxyFactory.setInterfaces(interfaces);
 		if (proxyTargetClass) {
-			classLoader = null; // Force use of Class.getClassLoader()
-			proxyFactory.setProxyTargetClass(proxyTargetClass);
+			classLoader = null;  // force use of Class.getClassLoader()
+			proxyFactory.setProxyTargetClass(true);
 		}
 
 		DelegatingIntroductionInterceptor introduction = new DelegatingIntroductionInterceptor(ts);
@@ -570,6 +581,7 @@ protected Object createRefreshableProxy(TargetSource ts, Class[] interfaces, boo
 	/**
 	 * Destroy the inner bean factory (used for scripts) on shutdown.
 	 */
+	@Override
 	public void destroy() {
 		this.scriptBeanFactory.destroySingletons();
 	}
diff --git a/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java
index 3ab515bc89..58de3be1e4 100644
--- a/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java
+++ b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
  * of {@link ObjectError ObjectErrors} and {@link FieldError FieldErrors}.
  *
  * @author Juergen Hoeller
+ * @author Rossen Stoyanchev
  * @since 2.5.3
  */
 @SuppressWarnings("serial")
@@ -192,10 +193,7 @@ public FieldError getFieldError(String field) {
 
 	public Class<?> getFieldType(String field) {
 		Object value = getFieldValue(field);
-		if (value != null) {
-			return value.getClass();
-		}
-		return null;
+		return (value != null ? value.getClass() : null);
 	}
 
 	/**
@@ -205,8 +203,13 @@ public Class<?> getFieldType(String field) {
 	 * @return whether the FieldError matches the given field
 	 */
 	protected boolean isMatchingFieldError(String field, FieldError fieldError) {
-		return (field.equals(fieldError.getField()) ||
-				(field.endsWith("*") && fieldError.getField().startsWith(field.substring(0, field.length() - 1))));
+		if (field.equals(fieldError.getField())) {
+			return true;
+		}
+		// Optimization: use charAt and regionMatches instead of endsWith and startsWith (SPR-11304)
+		int endIndex = field.length() - 1;
+		return (endIndex >= 0 && field.charAt(endIndex) == '*' &&
+				(endIndex == 0 || field.regionMatches(0, fieldError.getField(), 0, endIndex)));
 	}
 
 
diff --git a/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java b/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
index 4dc62f449f..33de433fff 100644
--- a/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
+++ b/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
@@ -243,7 +243,7 @@ public String format(String errorCode, String objectName, String field) {
 		public static String toDelimitedString(String... elements) {
 			StringBuilder rtn = new StringBuilder();
 			for (String element : elements) {
-				if(StringUtils.hasLength(element)) {
+				if (StringUtils.hasLength(element)) {
 					rtn.append(rtn.length() == 0 ? "" : CODE_SEPARATOR);
 					rtn.append(element);
 				}
diff --git a/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java b/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
index 9da8e3d26b..5db89a4c5d 100644
--- a/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
+++ b/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
  */
 public abstract class ValidationUtils {
 
-	private static Log logger = LogFactory.getLog(ValidationUtils.class);
+	private static final Log logger = LogFactory.getLog(ValidationUtils.class);
 
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
index 1cc392278f..8239d5453a 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,6 +51,15 @@
  * you will almost always use the default Validator anyway. This can also be injected directly
  * into any target dependency of type {@link org.springframework.validation.Validator}!
  *
+ * <p><b>NOTE: This class is based on Bean Validation 1.0 and (optionally) Hibernate Validator 4.x.</b>
+ * Nevertheless, its core functionality does work against Bean Validation 1.1 at runtime.
+ * However, there is no special support for Hibernate Validator 5.0 yet; as a consequence,
+ * {@link #setValidationMessageSource} won't work in that scenario. Please stick with
+ * Hibernate Validator 4.3 for the time being, or upgrade to Spring Framework 4.0.
+ *
+ * <p>This class is also being used by Spring's MVC configuration namespace, in case of the
+ * {@code javax.validation} API being present but no explicit Validator having been configured.
+ *
  * @author Juergen Hoeller
  * @since 3.0
  * @see javax.validation.ValidatorFactory
@@ -137,7 +146,7 @@ public void setConstraintValidatorFactory(ConstraintValidatorFactory constraintV
 	/**
 	 * Specify resource locations to load XML constraint mapping files from, if any.
 	 */
-	public void setMappingLocations(Resource[] mappingLocations) {
+	public void setMappingLocations(Resource... mappingLocations) {
 		this.mappingLocations = mappingLocations;
 	}
 
@@ -217,10 +226,23 @@ public void afterPropertiesSet() {
 			configuration.addProperty(entry.getKey(), entry.getValue());
 		}
 
+		// Allow for custom post-processing before we actually build the ValidatorFactory.
+		postProcessConfiguration(configuration);
+
 		this.validatorFactory = configuration.buildValidatorFactory();
 		setTargetValidator(this.validatorFactory.getValidator());
 	}
 
+	/**
+	 * Post-process the given Bean Validation configuration,
+	 * adding to or overriding any of its settings.
+	 * <p>Invoked right before building the {@link ValidatorFactory}.
+	 * @param configuration the Configuration object, pre-populated with
+	 * settings driven by LocalValidatorFactoryBean's properties
+	 */
+	protected void postProcessConfiguration(Configuration configuration) {
+	}
+
 
 	public Validator getValidator() {
 		return this.validatorFactory.getValidator();
@@ -244,7 +266,7 @@ public ConstraintValidatorFactory getConstraintValidatorFactory() {
 
 
 	/**
-	 * Inner class to avoid a hard-coded Hibernate Validator 4.1 dependency.
+	 * Inner class to avoid a hard-coded Hibernate Validator 4.1+ dependency.
 	 */
 	private static class HibernateValidatorDelegate {
 
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java
index c8d909bd42..cb7d6536b7 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,9 +48,10 @@
  * inline constraint annotations. Validation groups can be specified through {@code @Validated}
  * as well. By default, JSR-303 will validate against its default group only.
  *
- * <p>As of Spring 3.1, this functionality requires Hibernate Validator 4.2 or higher.
- * In a future version of Spring, this class will autodetect a Bean Validation 1.1 compliant
- * provider and automatically use the standard method validation support when available.
+ * <p>As of Spring 3.1, this functionality requires Hibernate Validator 4.2 or 4.3.
+ * In Spring 4.0, this class will autodetect a Bean Validation 1.1 compliant provider
+ * (such as Hibernate Validator 5.0) and automatically use the standard method
+ * validation support when available.
  *
  * @author Juergen Hoeller
  * @since 3.1
diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd
index b2132e4e1c..34dca16031 100644
--- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd
+++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/context"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:tool="http://www.springframework.org/schema/tool"
-	targetNamespace="http://www.springframework.org/schema/context"
-	elementFormDefault="qualified" attributeFormDefault="unqualified">
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		targetNamespace="http://www.springframework.org/schema/context"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.1.xsd" />
-	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.1.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.1.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -107,7 +109,7 @@
 			<xsd:appinfo>
 				<tool:annotation>
 					<tool:exports
-						type="org.springframework.context.support.PropertySourcesPlaceholderConfigurer" />
+						type="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -158,14 +160,13 @@
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports
-						type="org.springframework.beans.factory.config.PropertyOverrideConfigurer" />
+					<tool:exports type="org.springframework.beans.factory.config.PropertyOverrideConfigurer"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
-				<xsd:extension base="propertyPlaceholder" />
+				<xsd:extension base="propertyPlaceholder"/>
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
@@ -273,9 +274,8 @@
 					]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation>
-							<tool:expected-type type="java.lang.Class" />
-							<tool:assignable-to
-								type="org.springframework.beans.factory.support.BeanNameGenerator" />
+							<tool:expected-type type="java.lang.Class"/>
+							<tool:assignable-to type="org.springframework.beans.factory.support.BeanNameGenerator"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -288,9 +288,8 @@
 					]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation>
-							<tool:expected-type type="java.lang.Class" />
-							<tool:assignable-to
-								type="org.springframework.context.annotation.ScopeMetadataResolver" />
+							<tool:expected-type type="java.lang.Class"/>
+							<tool:assignable-to type="org.springframework.context.annotation.ScopeMetadataResolver"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -304,9 +303,9 @@
 				</xsd:annotation>
 				<xsd:simpleType>
 					<xsd:restriction base="xsd:string">
-						<xsd:enumeration value="no" />
-						<xsd:enumeration value="interfaces" />
-						<xsd:enumeration value="targetClass" />
+						<xsd:enumeration value="no"/>
+						<xsd:enumeration value="interfaces"/>
+						<xsd:enumeration value="targetClass"/>
 					</xsd:restriction>
 				</xsd:simpleType>
 			</xsd:attribute>
@@ -342,8 +341,7 @@
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports
-						type="org.springframework.instrument.classloading.LoadTimeWeaver" />
+					<tool:exports type="org.springframework.instrument.classloading.LoadTimeWeaver"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -355,9 +353,8 @@
 					]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation>
-							<tool:expected-type type="java.lang.Class" />
-							<tool:assignable-to
-								type="org.springframework.instrument.classloading.LoadTimeWeaver" />
+							<tool:expected-type type="java.lang.Class"/>
+							<tool:assignable-to type="org.springframework.instrument.classloading.LoadTimeWeaver"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -396,23 +393,20 @@
 
 	<xsd:element name="spring-configured">
 		<xsd:annotation>
-			<xsd:documentation
-				source="java:org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect">
-				<![CDATA[
+			<xsd:documentation source="java:org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect"><![CDATA[
 	Signals the current application context to apply dependency injection
 	to non-managed classes that are instantiated outside of the Spring bean
 	factory (typically classes annotated with the @Configurable annotation).
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:simpleType>
-			<xsd:restriction base="xsd:string" />
+			<xsd:restriction base="xsd:string"/>
 		</xsd:simpleType>
 	</xsd:element>
 
 	<xsd:element name="mbean-export">
 		<xsd:annotation>
-			<xsd:documentation
-				source="java:org.springframework.jmx.export.annotation.AnnotationMBeanExporter"><![CDATA[
+			<xsd:documentation source="java:org.springframework.jmx.export.annotation.AnnotationMBeanExporter"><![CDATA[
 	Activates default exporting of MBeans by detecting standard MBeans in the Spring
 	context as well as @ManagedResource annotations on Spring-defined beans.
 
@@ -421,8 +415,7 @@
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports
-						type="org.springframework.jmx.export.annotation.AnnotationMBeanExporter" />
+					<tool:exports type="org.springframework.jmx.export.annotation.AnnotationMBeanExporter"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -455,9 +448,9 @@
 				</xsd:annotation>
 				<xsd:simpleType>
 					<xsd:restriction base="xsd:NMTOKEN">
-						<xsd:enumeration value="failOnExisting" />
-						<xsd:enumeration value="ignoreExisting" />
-						<xsd:enumeration value="replaceExisting" />
+						<xsd:enumeration value="failOnExisting"/>
+						<xsd:enumeration value="ignoreExisting"/>
+						<xsd:enumeration value="replaceExisting"/>
 					</xsd:restriction>
 				</xsd:simpleType>
 			</xsd:attribute>
@@ -466,8 +459,7 @@
 
 	<xsd:element name="mbean-server">
 		<xsd:annotation>
-			<xsd:documentation
-				source="java:org.springframework.jmx.support.MBeanServerFactoryBean"><![CDATA[
+			<xsd:documentation source="java:org.springframework.jmx.support.MBeanServerFactoryBean"><![CDATA[
 	Exposes a default MBeanServer for the current platform.
 	Autodetects WebLogic 9+, WebSphere 6.1+ and the JDK 1.5+ platform MBeanServer.
 
@@ -476,7 +468,7 @@
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="javax.management.MBeanServer" />
+					<tool:exports type="javax.management.MBeanServer"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -503,8 +495,8 @@
 
     "annotation" indicates an annotation to be present at the type level in target components;
     "assignable" indicates a class (or interface) that the target components are assignable to (extend/implement);
-    "aspectj" indicates an AspectJ type expression to be matched by the target components;
-    "regex" indicates a regex expression to be matched by the target components' class names;
+    "aspectj" indicates an AspectJ type pattern expression to be matched by the target components;
+    "regex" indicates a regex pattern to be matched by the target components' class names;
     "custom" indicates a custom implementation of the org.springframework.core.type.TypeFilter interface.
 
     Note: This attribute will not be inherited by child bean definitions.
@@ -513,11 +505,11 @@
 			</xsd:annotation>
 			<xsd:simpleType>
 				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="annotation" />
-					<xsd:enumeration value="assignable" />
-					<xsd:enumeration value="aspectj" />
-					<xsd:enumeration value="regex" />
-					<xsd:enumeration value="custom" />
+					<xsd:enumeration value="annotation"/>
+					<xsd:enumeration value="assignable"/>
+					<xsd:enumeration value="aspectj"/>
+					<xsd:enumeration value="regex"/>
+					<xsd:enumeration value="custom"/>
 				</xsd:restriction>
 			</xsd:simpleType>
 		</xsd:attribute>
diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd
index f63ecc1aaf..6ad5298417 100644
--- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd
+++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/context"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:tool="http://www.springframework.org/schema/tool"
-	targetNamespace="http://www.springframework.org/schema/context"
-	elementFormDefault="qualified" attributeFormDefault="unqualified">
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		targetNamespace="http://www.springframework.org/schema/context"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.2.xsd" />
-	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.2.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.2.xsd"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -23,24 +25,25 @@
 				<xsd:documentation><![CDATA[
 	The location of the properties file to resolve placeholders against, as a Spring
 	resource location: a URL, a "classpath:" pseudo URL, or a relative file path.
-	Multiple locations may be specified, separated by commas. If neither location nor properties-ref is
-	specified, placeholders will be resolved against system properties.
+	Multiple locations may be specified, separated by commas. If neither location nor
+	properties-ref is specified, placeholders will be resolved against system properties.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="properties-ref" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation source="java:java.util.Properties"><![CDATA[
-	The bean name of a Java Properties object that will be used for property substitution.
-	If neither location nor properties-ref is specified, placeholders will be resolved against system properties.
+	The bean name of a Properties object that will be used for property substitution.
+	If neither location nor properties-ref is specified, placeholders will be resolved
+	against system properties.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="file-encoding" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies the encoding to use for parsing properties files.  Default is none,
-	using the java.util.Properties default encoding.  Only applies to classic
+	Specifies the encoding to use for parsing properties files. Default is none,
+	using the java.util.Properties default encoding. Only applies to classic
 	properties files, not to XML files.
 				]]></xsd:documentation>
 			</xsd:annotation>
@@ -48,39 +51,36 @@
 		<xsd:attribute name="order" type="xsd:integer">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies the order for this placeholder configurer.  If more than one is present in a context
-	the order can be important since the first one to be match a placeholder will win.  Often used
-	in conjunction with
+	Specifies the order for this placeholder configurer. If more than one is present
+	in a context, the order can be important since the first one to be match a
+	placeholder will win.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="ignore-resource-not-found" type="xsd:boolean"
-			default="false">
+		<xsd:attribute name="ignore-resource-not-found" type="xsd:boolean" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies if failure to find the property resource location should be ignored.  Default
-	is "false", meaning that if there is no file in the location specified an exception will
-	be raised at runtime.
+	Specifies if failure to find the property resource location should be ignored.
+	Default is "false", meaning that if there is no file in the location specified
+	an exception will be raised at runtime.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="ignore-unresolvable" type="xsd:boolean"
-			default="false">
+		<xsd:attribute name="ignore-unresolvable" type="xsd:boolean" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies if failure to find the property value to replace a key should be ignored.  Default
-	is "false", meaning that this placeholder configurer will raise an exception if it cannot resolve
-	a key.  Set to "true" to allow the configurer to pass on the key to any others in
-	the context that have not yet visited the key in question.
+	Specifies if failure to find the property value to replace a key should be ignored.
+	Default is "false", meaning that this placeholder configurer will raise an exception
+	if it cannot resolve a key. Set to "true" to allow the configurer to pass on the key
+	to any others in the context that have not yet visited the key in question.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="local-override" type="xsd:boolean"
-			default="false">
+		<xsd:attribute name="local-override" type="xsd:boolean" default="false">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	Specifies whether local properties override properties from files.  Default
-	is "false": Properties from files override local defaults.
+	Specifies whether local properties override properties from files.
+	Default is "false": Properties from files override local defaults.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -102,12 +102,11 @@
 	traditional PropertyPlaceholderConfigurer component will be registered instead of the
 	new PropertySourcesPlaceholderConfigurer.
 
-	See ConfigurableEnvironment Javadoc for more information on using.
+	See ConfigurableEnvironment javadoc for more information on using.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports
-						type="org.springframework.context.support.PropertySourcesPlaceholderConfigurer" />
+					<tool:exports type="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -128,7 +127,7 @@
 	newer PropertySourcesPlaceholderConfigurer variant. In this case, the Spring Environment
 	and its property sources are not interrogated when resolving placeholders. Users are
 	encouraged to consider this attribute deprecated, and to take advantage of
-	Environment/PropertySource mechanisms. See ConfigurableEnvironment Javadoc for examples.
+	Environment/PropertySource mechanisms. See ConfigurableEnvironment javadoc for examples.
 
 	"ENVIRONMENT" indicates placeholders should be resolved against the current Environment and against any local properties;
 	"NEVER" indicates placeholders should be resolved only against local properties and never against system properties;
@@ -158,14 +157,13 @@
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports
-						type="org.springframework.beans.factory.config.PropertyOverrideConfigurer" />
+					<tool:exports type="org.springframework.beans.factory.config.PropertyOverrideConfigurer"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:complexContent>
-				<xsd:extension base="propertyPlaceholder" />
+				<xsd:extension base="propertyPlaceholder"/>
 			</xsd:complexContent>
 		</xsd:complexType>
 	</xsd:element>
@@ -183,7 +181,7 @@
 	@TransactionAttribute annotation. Consider the use of the <tx:annotation-driven>
 	tag for that purpose.
 
-	See Javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext
+	See javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext
 	for information on code-based alternatives to bootstrapping annotation-driven support.
 	from XML.
 			]]></xsd:documentation>
@@ -210,7 +208,7 @@
 	definitions just like to regular bean definitions, but it won't apply to the component
 	scan settings themselves.
 
-	See Javadoc for org.springframework.context.annotation.ComponentScan for information
+	See javadoc for org.springframework.context.annotation.ComponentScan for information
 	on code-based alternatives to bootstrapping component-scanning.
 			]]></xsd:documentation>
 		</xsd:annotation>
@@ -273,9 +271,8 @@
 					]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation>
-							<tool:expected-type type="java.lang.Class" />
-							<tool:assignable-to
-								type="org.springframework.beans.factory.support.BeanNameGenerator" />
+							<tool:expected-type type="java.lang.Class"/>
+							<tool:assignable-to type="org.springframework.beans.factory.support.BeanNameGenerator"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -288,9 +285,8 @@
 					]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation>
-							<tool:expected-type type="java.lang.Class" />
-							<tool:assignable-to
-								type="org.springframework.context.annotation.ScopeMetadataResolver" />
+							<tool:expected-type type="java.lang.Class"/>
+							<tool:assignable-to type="org.springframework.context.annotation.ScopeMetadataResolver"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -304,9 +300,9 @@
 				</xsd:annotation>
 				<xsd:simpleType>
 					<xsd:restriction base="xsd:string">
-						<xsd:enumeration value="no" />
-						<xsd:enumeration value="interfaces" />
-						<xsd:enumeration value="targetClass" />
+						<xsd:enumeration value="no"/>
+						<xsd:enumeration value="interfaces"/>
+						<xsd:enumeration value="targetClass"/>
 					</xsd:restriction>
 				</xsd:simpleType>
 			</xsd:attribute>
@@ -337,13 +333,12 @@
 	This will only happen if the AnnotationBeanConfigurerAspect is on the classpath
 	(i.e. spring-aspects.jar), effectively activating "spring-configured" by default.
 
-	See Javadoc for org.springframework.context.annotation.EnableLoadTimeWeaving
+	See javadoc for org.springframework.context.annotation.EnableLoadTimeWeaving
 	for information on code-based alternatives to bootstrapping load-time weaving support.
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports
-						type="org.springframework.instrument.classloading.LoadTimeWeaver" />
+					<tool:exports type="org.springframework.instrument.classloading.LoadTimeWeaver"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -355,9 +350,8 @@
 					]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation>
-							<tool:expected-type type="java.lang.Class" />
-							<tool:assignable-to
-								type="org.springframework.instrument.classloading.LoadTimeWeaver" />
+							<tool:expected-type type="java.lang.Class"/>
+							<tool:assignable-to type="org.springframework.instrument.classloading.LoadTimeWeaver"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -396,23 +390,20 @@
 
 	<xsd:element name="spring-configured">
 		<xsd:annotation>
-			<xsd:documentation
-				source="java:org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect">
-				<![CDATA[
+			<xsd:documentation source="java:org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect"><![CDATA[
 	Signals the current application context to apply dependency injection
 	to non-managed classes that are instantiated outside of the Spring bean
 	factory (typically classes annotated with the @Configurable annotation).
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:simpleType>
-			<xsd:restriction base="xsd:string" />
+			<xsd:restriction base="xsd:string"/>
 		</xsd:simpleType>
 	</xsd:element>
 
 	<xsd:element name="mbean-export">
 		<xsd:annotation>
-			<xsd:documentation
-				source="java:org.springframework.jmx.export.annotation.AnnotationMBeanExporter"><![CDATA[
+			<xsd:documentation source="java:org.springframework.jmx.export.annotation.AnnotationMBeanExporter"><![CDATA[
 	Activates default exporting of MBeans by detecting standard MBeans in the Spring
 	context as well as @ManagedResource annotations on Spring-defined beans.
 
@@ -421,8 +412,7 @@
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports
-						type="org.springframework.jmx.export.annotation.AnnotationMBeanExporter" />
+					<tool:exports type="org.springframework.jmx.export.annotation.AnnotationMBeanExporter"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -455,9 +445,9 @@
 				</xsd:annotation>
 				<xsd:simpleType>
 					<xsd:restriction base="xsd:NMTOKEN">
-						<xsd:enumeration value="failOnExisting" />
-						<xsd:enumeration value="ignoreExisting" />
-						<xsd:enumeration value="replaceExisting" />
+						<xsd:enumeration value="failOnExisting"/>
+						<xsd:enumeration value="ignoreExisting"/>
+						<xsd:enumeration value="replaceExisting"/>
 					</xsd:restriction>
 				</xsd:simpleType>
 			</xsd:attribute>
@@ -466,8 +456,7 @@
 
 	<xsd:element name="mbean-server">
 		<xsd:annotation>
-			<xsd:documentation
-				source="java:org.springframework.jmx.support.MBeanServerFactoryBean"><![CDATA[
+			<xsd:documentation source="java:org.springframework.jmx.support.MBeanServerFactoryBean"><![CDATA[
 	Exposes a default MBeanServer for the current platform.
 	Autodetects WebLogic 9+, WebSphere 6.1+ and the JDK 1.5+ platform MBeanServer.
 
@@ -476,7 +465,7 @@
 			]]></xsd:documentation>
 			<xsd:appinfo>
 				<tool:annotation>
-					<tool:exports type="javax.management.MBeanServer" />
+					<tool:exports type="javax.management.MBeanServer"/>
 				</tool:annotation>
 			</xsd:appinfo>
 		</xsd:annotation>
@@ -503,8 +492,8 @@
 
     "annotation" indicates an annotation to be present at the type level in target components;
     "assignable" indicates a class (or interface) that the target components are assignable to (extend/implement);
-    "aspectj" indicates an AspectJ type expression to be matched by the target components;
-    "regex" indicates a regex expression to be matched by the target components' class names;
+    "aspectj" indicates an AspectJ type pattern expression to be matched by the target components;
+    "regex" indicates a regex pattern to be matched by the target components' class names;
     "custom" indicates a custom implementation of the org.springframework.core.type.TypeFilter interface.
 
     Note: This attribute will not be inherited by child bean definitions.
@@ -513,11 +502,11 @@
 			</xsd:annotation>
 			<xsd:simpleType>
 				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="annotation" />
-					<xsd:enumeration value="assignable" />
-					<xsd:enumeration value="aspectj" />
-					<xsd:enumeration value="regex" />
-					<xsd:enumeration value="custom" />
+					<xsd:enumeration value="annotation"/>
+					<xsd:enumeration value="assignable"/>
+					<xsd:enumeration value="aspectj"/>
+					<xsd:enumeration value="regex"/>
+					<xsd:enumeration value="custom"/>
 				</xsd:restriction>
 			</xsd:simpleType>
 		</xsd:attribute>
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java b/spring-context/src/test/java/example/scannable/CustomAnnotations.java
similarity index 58%
rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java
rename to spring-context/src/test/java/example/scannable/CustomAnnotations.java
index 7b32ec733c..dde136bc0f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java
+++ b/spring-context/src/test/java/example/scannable/CustomAnnotations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.springframework.web.servlet.view.jasperreports;
+package example.scannable;
 
-/**
- * @author Rob Harrop
- */
-public class JasperReportsCsvViewTests extends AbstractJasperReportsViewTests {
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+public class CustomAnnotations {
 
-	@Override
-	protected AbstractJasperReportsView getViewImplementation() {
-		return new JasperReportsCsvView();
+	@Retention(RetentionPolicy.RUNTIME)
+	private @interface PrivateAnnotation {
+		String value();
 	}
 
-	@Override
-	protected String getDesiredContentType() {
-		return "text/csv";
+	@Retention(RetentionPolicy.RUNTIME)
+	@PrivateAnnotation("special")
+	public @interface SpecialAnnotation {
 	}
 
 }
diff --git a/spring-context/src/test/java/example/scannable/CustomComponent.java b/spring-context/src/test/java/example/scannable/CustomComponent.java
index 2f6ef7f42a..0b26b32c18 100644
--- a/spring-context/src/test/java/example/scannable/CustomComponent.java
+++ b/spring-context/src/test/java/example/scannable/CustomComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
+@CustomAnnotations.SpecialAnnotation
 public @interface CustomComponent {
 
 }
diff --git a/spring-context/src/test/java/example/scannable/MessageBean.java b/spring-context/src/test/java/example/scannable/MessageBean.java
index a4fc2d2614..66d9054126 100644
--- a/spring-context/src/test/java/example/scannable/MessageBean.java
+++ b/spring-context/src/test/java/example/scannable/MessageBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
  * @author Mark Fisher
  */
 @CustomComponent
+@CustomAnnotations.SpecialAnnotation
 public class MessageBean {
 
 	private String message;
@@ -32,6 +33,7 @@ public MessageBean(String message) {
 		this.message = message;
 	}
 
+	@CustomAnnotations.SpecialAnnotation
 	public String getMessage() {
 		return this.message;
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java
index 4ab6a83064..1c8573390a 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,17 @@
 
 package org.springframework.aop.aspectj;
 
-import static org.junit.Assert.*;
-
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.junit.Test;
+
 import org.springframework.aop.aspectj.annotation.AspectJProxyFactory;
 import org.springframework.aop.framework.Advised;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import static org.junit.Assert.*;
 
 /**
  * Test for correct application of the bean() PCD for &#64;AspectJ-based aspects.
@@ -34,39 +35,40 @@
  * @author Juergen Hoeller
  * @author Chris Beams
  */
-public final class BeanNamePointcutAtAspectTests {
+public class BeanNamePointcutAtAspectTests {
 
 	private ITestBean testBean1;
 
-	private ITestBean testBean2;
-
 	private ITestBean testBean3;
 
 	private CounterAspect counterAspect;
 
 
 	@org.junit.Before
+	@SuppressWarnings("resource")
 	public void setUp() {
 		ClassPathXmlApplicationContext ctx =
-			new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
+				new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
+
 		counterAspect = (CounterAspect) ctx.getBean("counterAspect");
 		testBean1 = (ITestBean) ctx.getBean("testBean1");
-		testBean2 = (ITestBean) ctx.getBean("testBean2");
 		testBean3 = (ITestBean) ctx.getBean("testBean3");
 	}
 
 	@Test
 	public void testMatchingBeanName() {
 		assertTrue("Expected a proxy", testBean1 instanceof Advised);
+
 		// Call two methods to test for SPR-3953-like condition
 		testBean1.setAge(20);
 		testBean1.setName("");
-		assertEquals(2 /*TODO: make this 3 when upgrading to AspectJ 1.6.0 and advice in CounterAspect are uncommented*/, counterAspect.count);
+		assertEquals(2, counterAspect.count);
 	}
 
 	@Test
 	public void testNonMatchingBeanName() {
 		assertFalse("Didn't expect a proxy", testBean3 instanceof Advised);
+
 		testBean3.setAge(20);
 		assertEquals(0, counterAspect.count);
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java
index f01bf14a47..5e71d7d154 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,16 +34,21 @@
 public final class TargetPointcutSelectionTests {
 
 	public TestInterface testImpl1;
+
 	public TestInterface testImpl2;
+
 	public TestAspect testAspectForTestImpl1;
+
 	public TestAspect testAspectForAbstractTestImpl;
+
 	public TestInterceptor testInterceptor;
 
 
 	@Before
 	public void setUp() {
 		ClassPathXmlApplicationContext ctx =
-			new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
+				new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
+
 		testImpl1 = (TestInterface) ctx.getBean("testImpl1");
 		testImpl2 = (TestInterface) ctx.getBean("testImpl2");
 		testAspectForTestImpl1 = (TestAspect) ctx.getBean("testAspectForTestImpl1");
@@ -55,6 +60,7 @@ public void setUp() {
 		testInterceptor.count = 0;
 	}
 
+
 	@Test
 	public void testTargetSelectionForMatchedType() {
 		testImpl1.interfaceMethod();
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
index 2330909eec..08f14a28b9 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,13 @@
 
 package org.springframework.aop.framework;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.Serializable;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
+import test.mixin.LockMixinAdvisor;
+
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
@@ -42,10 +37,11 @@
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 
-import test.mixin.LockMixinAdvisor;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 /**
- * Additional and overridden tests for the CGLIB proxy.
+ * Additional and overridden tests for CGLIB proxies.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -56,7 +52,8 @@
 @SuppressWarnings("serial")
 public final class CglibProxyTests extends AbstractAopProxyTests implements Serializable {
 
-	private static final String DEPENDENCY_CHECK_CONTEXT =  CglibProxyTests.class.getSimpleName() + "-with-dependency-checking.xml";
+	private static final String DEPENDENCY_CHECK_CONTEXT =
+			CglibProxyTests.class.getSimpleName() + "-with-dependency-checking.xml";
 
 
 	@Override
@@ -155,8 +152,8 @@ void hidden() {
 			assertTrue(ex.getCause() instanceof CodeGenerationException ||
 					ex.getCause() instanceof IllegalArgumentException);
 			// Check that error message is helpful
-			assertTrue(ex.getMessage().indexOf("final") != -1);
-			assertTrue(ex.getMessage().indexOf("visible") != -1);
+			assertTrue(ex.getMessage().contains("final"));
+			assertTrue(ex.getMessage().contains("visible"));
 		}
 	}
 
@@ -171,9 +168,7 @@ public void testMethodInvocationDuringConstructor() {
 		AopProxy aop = new CglibAopProxy(as);
 
 		CglibTestBean proxy = (CglibTestBean) aop.getProxy();
-
-		assertEquals("The name property has been overwritten by the constructor",
-				"Rob Harrop", proxy.getName());
+		assertEquals("The name property has been overwritten by the constructor", "Rob Harrop", proxy.getName());
 	}
 
 	@Test
@@ -186,9 +181,7 @@ public void testUnadvisedProxyCreationWithCallDuringConstructor() throws Excepti
 		pc.setTarget(target);
 
 		CglibAopProxy aop = new CglibAopProxy(pc);
-
 		CglibTestBean proxy = (CglibTestBean) aop.getProxy();
-
 		assertNotNull("Proxy should not be null", proxy);
 		assertEquals("Constructor overrode the value of name", "Rob Harrop", proxy.getName());
 
@@ -218,15 +211,18 @@ private ITestBean getAdvisedProxy(TestBean target) {
 			public ClassFilter getClassFilter() {
 				return ClassFilter.TRUE;
 			}
-
 			@Override
 			public MethodMatcher getMethodMatcher() {
 				return MethodMatcher.TRUE;
 			}
-
+			@Override
 			public boolean equals(Object obj) {
 				return true;
 			}
+			@Override
+			public int hashCode() {
+				return 0;
+			}
 		};
 		pf.addAdvisor(new DefaultPointcutAdvisor(pointcut, advice));
 
@@ -250,7 +246,7 @@ public void testMultipleProxiesForIntroductionAdvisor() {
 	}
 
 	private ITestBean getIntroductionAdvisorProxy(TestBean target) {
-		ProxyFactory pf = new ProxyFactory(new Class<?>[]{ITestBean.class});
+		ProxyFactory pf = new ProxyFactory(new Class<?>[] {ITestBean.class});
 		pf.setProxyTargetClass(true);
 
 		pf.addAdvisor(new LockMixinAdvisor());
@@ -270,8 +266,7 @@ public void testWithNoArgConstructor() {
 		AdvisedSupport pc = new AdvisedSupport(new Class<?>[]{});
 		pc.setTargetSource(mockTargetSource);
 		CglibAopProxy aop = new CglibAopProxy(pc);
-		aop.setConstructorArguments(new Object[] {"Rob Harrop", new Integer(22)},
-				new Class<?>[] {String.class, int.class});
+		aop.setConstructorArguments(new Object[] {"Rob Harrop", 22}, new Class<?>[] {String.class, int.class});
 
 		NoArgCtorTestBean proxy = (NoArgCtorTestBean) aop.getProxy();
 		proxy = (NoArgCtorTestBean) aop.getProxy();
@@ -347,16 +342,15 @@ public void testExceptionHandling() {
 	}
 
 	@Test
+	@SuppressWarnings("resource")
 	public void testWithDependencyChecking() {
-		ApplicationContext ctx =
-				new ClassPathXmlApplicationContext(DEPENDENCY_CHECK_CONTEXT, getClass());
+		ApplicationContext ctx = new ClassPathXmlApplicationContext(DEPENDENCY_CHECK_CONTEXT, getClass());
 		ctx.getBean("testBean");
 	}
 
 	@Test
 	public void testAddAdviceAtRuntime() {
 		TestBean bean = new TestBean();
-
 		CountingBeforeAdvice cba = new CountingBeforeAdvice();
 
 		ProxyFactory pf = new ProxyFactory();
@@ -366,17 +360,13 @@ public void testAddAdviceAtRuntime() {
 		pf.setProxyTargetClass(true);
 
 		TestBean proxy = (TestBean) pf.getProxy();
-
 		assertTrue(AopUtils.isCglibProxy(proxy));
 
 		proxy.getAge();
-
 		assertEquals(0, cba.getCalls());
 
 		((Advised) proxy).addAdvice(cba);
-
 		proxy.getAge();
-
 		assertEquals(1, cba.getCalls());
 	}
 
@@ -388,7 +378,6 @@ public void testProxyProtectedMethod() throws Exception {
 		proxyFactory.setProxyTargetClass(true);
 
 		MyBean proxy = (MyBean) proxyFactory.getProxy();
-
 		assertEquals(4, proxy.add(1, 3));
 		assertEquals(1, advice.getCalls("add"));
 	}
@@ -446,7 +435,6 @@ public static class HasFinalMethod {
 		public final void foo() {
 		}
 	}
-
 }
 
 
@@ -483,7 +471,6 @@ public boolean wasCalled() {
 	public void reset() {
 		called = false;
 	}
-
 }
 
 
@@ -492,15 +479,11 @@ class ProtectedMethodTestBean {
 	protected String getString() {
 		return "foo";
 	}
-
 }
 
 
 class UnsupportedInterceptor implements MethodInterceptor {
 
-	/**
-	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
-	 */
 	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		throw new UnsupportedOperationException(mi.getMethod().getName());
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java
index c69ab5658b..381c76d970 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,47 +16,51 @@
 
 package org.springframework.beans.factory.annotation;
 
-import static org.junit.Assert.assertNotNull;
-
 import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.junit.Test;
+
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.stereotype.Component;
 
+import static org.junit.Assert.*;
+
 public class BridgeMethodAutowiringTests {
 
 	@Test
-	public void SPR_8434() {
+	public void SPR8434() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(UserServiceImpl.class, Foo.class);
 		ctx.refresh();
 		assertNotNull(ctx.getBean(UserServiceImpl.class).object);
 	}
 
-}
 
+	static abstract class GenericServiceImpl<D> {
 
-abstract class GenericServiceImpl<D extends Object> {
+		public abstract void setObject(D object);
+	}
 
-	public abstract void setObject(D object);
 
-}
+	public static class UserServiceImpl extends GenericServiceImpl<Foo> {
 
+		protected Foo object;
 
-class UserServiceImpl extends GenericServiceImpl<Foo> {
+		@Override
+		@Inject
+		@Named("userObject")
+		public void setObject(Foo object) {
+			if (this.object != null) {
+				throw new IllegalStateException("Already called");
+			}
+			this.object = object;
+		}
+	}
 
-	protected Foo object;
 
-	@Override
-	@Inject
-	@Named("userObject")
-	public void setObject(Foo object) {
-		this.object = object;
+	@Component("userObject")
+	public static class Foo {
 	}
-}
-
-@Component("userObject")
-class Foo { }
 
+}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java b/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java
index 3544595d9d..fcceb3fb3b 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import javax.inject.Named;
 import javax.inject.Qualifier;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
 import org.springframework.aop.scope.ScopedProxyUtils;
@@ -36,6 +35,8 @@
 import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.support.GenericApplicationContext;
 
+import static org.junit.Assert.*;
+
 /**
  * Integration tests for handling JSR-303 {@link javax.inject.Qualifier} annotations.
  *
@@ -666,27 +667,27 @@ public QualifiedPerson(String name) {
 	@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE})
 	@Retention(RetentionPolicy.RUNTIME)
 	@Qualifier
-	public static @interface TestQualifier {
+	public @interface TestQualifier {
 	}
 
 
 	@Target(ElementType.FIELD)
 	@Retention(RetentionPolicy.RUNTIME)
 	@Qualifier
-	public static @interface TestQualifierWithDefaultValue {
+	public @interface TestQualifierWithDefaultValue {
 
-		public abstract String value() default "default";
+		String value() default "default";
 	}
 
 
 	@Target(ElementType.FIELD)
 	@Retention(RetentionPolicy.RUNTIME)
 	@Qualifier
-	public static @interface TestQualifierWithMultipleAttributes {
+	public @interface TestQualifierWithMultipleAttributes {
 
-		public abstract String value() default "default";
+		String value() default "default";
 
-		public abstract int number();
+		int number();
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml
index bdc524aa8b..2f7db21056 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml
@@ -7,11 +7,19 @@
 
 	<context:annotation-config/>
 
+	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="properties">
+			<props>
+				<prop key="myProp">larry</prop>
+			</props>
+		</property>
+	</bean>
+
 	<bean id="larryBean" class="org.springframework.beans.factory.xml.QualifierAnnotationTests$Person">
 		<property name="name" value="LarryBean"/>
 	</bean>
 
-	<alias name="larryBean" alias="someAlias"/>
+	<alias name="${myProp}Bean" alias="someAlias"/>
 
 	<alias name="someAlias" alias="stooge"/>
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java
index a5bc212ced..242cb21f7b 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,24 +27,26 @@
 import javax.sql.DataSource;
 
 import org.springframework.beans.BeansException;
-import org.springframework.tests.sample.beans.ITestBean;
-import org.springframework.tests.sample.beans.IndexedTestBean;
-import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.DisposableBean;
-import org.springframework.tests.sample.beans.factory.DummyFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.support.MethodReplacer;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.tests.sample.beans.factory.DummyFactory;
 
 /**
  * Types used by {@link XmlBeanFactoryTests} and its attendant XML config files.
  *
  * @author Chris Beams
  */
-final class XmlBeanFactoryTestTypes { }
+final class XmlBeanFactoryTestTypes {
+}
+
 
 /**
  * Simple bean used to check constructor dependency checking.
@@ -174,18 +176,12 @@ public ITestBean getTestBean() {
 		return this.tb;
 	}
 
-
 	protected abstract FactoryMethods createFactoryMethods();
 
-	/**
-	 * @return Returns the setterString.
-	 */
 	public String getSetterString() {
 		return setterString;
 	}
-	/**
-	 * @param setterString The setterString to set.
-	 */
+
 	public void setSetterString(String setterString) {
 		this.setterString = setterString;
 	}
@@ -229,7 +225,6 @@ private void init() {
 	private void destroy() {
 		this.destroyed = true;
 	}
-
 }
 
 
@@ -240,7 +235,6 @@ private void destroy() {
 interface DummyBo {
 
 	void something();
-
 }
 
 
@@ -258,9 +252,7 @@ public DummyBoImpl(DummyDao dao) {
 
 	@Override
 	public void something() {
-
 	}
-
 }
 
 
@@ -274,7 +266,6 @@ class DummyDao {
 	public DummyDao(DataSource ds) {
 		this.ds = ds;
 	}
-
 }
 
 
@@ -290,7 +281,6 @@ class DummyReferencer {
 
 	private DummyFactory dummyFactory;
 
-
 	public DummyReferencer() {
 	}
 
@@ -321,7 +311,6 @@ public void setTestBean2(TestBean testBean2) {
 	public TestBean getTestBean2() {
 		return testBean2;
 	}
-
 }
 
 
@@ -370,13 +359,11 @@ private static List<?> listInstance() {
 		return Collections.EMPTY_LIST;
 	}
 
-
 	private int num = 0;
 	private String name = "default";
 	private TestBean tb;
 	private String stringValue;
 
-
 	/**
 	 * Constructor is private: not for use outside this class,
 	 * even by IoC container.
@@ -421,7 +408,6 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-
 }
 
 /**
@@ -436,7 +422,6 @@ class FixedMethodReplacer implements MethodReplacer {
 	public Object reimplement(Object obj, Method method, Object[] args) throws Throwable {
 		return VALUE;
 	}
-
 }
 
 
@@ -469,22 +454,17 @@ class MethodReplaceCandidate {
 	public String replaceMe(String echo) {
 		return echo;
 	}
-
 }
 
 
 /**
  * Bean that exposes a simple property that can be set
  * to a mix of references and individual values.
- *
- * @author Rod Johnson
- * @since 27.05.2003
  */
 class MixedCollectionBean {
 
 	private Collection<?> jumble;
 
-
 	public void setJumble(Collection<?> jumble) {
 		this.jumble = jumble;
 	}
@@ -492,7 +472,6 @@ public void setJumble(Collection<?> jumble) {
 	public Collection<?> getJumble() {
 		return jumble;
 	}
-
 }
 
 
@@ -504,7 +483,6 @@ interface OverrideInterface {
 	TestBean getPrototypeDependency();
 
 	TestBean getPrototypeDependency(Object someParam);
-
 }
 
 
@@ -521,7 +499,7 @@ public TestBean getPrototypeDependency(Object someParam) {
 		return new TestBean();
 	}
 
-	public TestBean invokesOverridenMethodOnSelf() {
+	public TestBean invokesOverriddenMethodOnSelf() {
 		return getPrototypeDependency();
 	}
 
@@ -563,7 +541,6 @@ protected void doSomething(String arg) {
 		// This implementation does nothing!
 		// It's not overloaded
 	}
-
 }
 
 
@@ -591,7 +568,6 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 
 	protected boolean destroyed;
 
-
 	public void setInitMethodDeclared(boolean initMethodDeclared) {
 		this.initMethodDeclared = initMethodDeclared;
 	}
@@ -707,7 +683,6 @@ public Object postProcessAfterInitialization(Object bean, String name) throws Be
 			return bean;
 		}
 	}
-
 }
 
 
@@ -722,7 +697,6 @@ public Object reimplement(Object obj, Method method, Object[] args) throws Throw
 		String s = (String) args[0];
 		return new StringBuffer(s).reverse().toString();
 	}
-
 }
 
 
@@ -733,7 +707,6 @@ public Object reimplement(Object obj, Method method, Object[] args) throws Throw
 abstract class SerializableMethodReplacerCandidate extends MethodReplaceCandidate implements Serializable {
 
 	//public abstract Point getPoint();
-
 }
 
 
@@ -769,5 +742,4 @@ public boolean isSecondBoolean() {
 	public String getTestString() {
 		return testString;
 	}
-
 }
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml
index f8e3280906..2f369564bf 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml
@@ -129,6 +129,15 @@
 		</constructor-arg>
 	</bean>
 
+	<bean id="hasInnerBeansAsPrototype" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
+		<constructor-arg>
+			<bean id="innerBean" class="org.springframework.tests.sample.beans.TestBean" destroy-method="destroy">
+				<constructor-arg><value>inner1</value></constructor-arg>
+				<constructor-arg type="int"><value>6</value></constructor-arg>
+			</bean>
+		</constructor-arg>
+	</bean>
+
 	<bean id="hasInnerBeansWithoutDestroy" class="org.springframework.tests.sample.beans.TestBean">
 		<constructor-arg><value>hasInner</value></constructor-arg>
 		<constructor-arg index="1" type="int"><value>5</value></constructor-arg>
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
index 6115b4979e..b1dafd1fb8 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,6 @@
 
 package org.springframework.beans.factory.xml;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -39,6 +28,8 @@
 
 import org.apache.commons.logging.LogFactory;
 import org.junit.Test;
+import org.xml.sax.InputSource;
+
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.BeansException;
@@ -70,10 +61,13 @@
 import org.springframework.tests.sample.beans.ResourceTestBean;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.tests.sample.beans.factory.DummyFactory;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.SerializationTestUtils;
 import org.springframework.util.StopWatch;
-import org.xml.sax.InputSource;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 /**
  * Miscellaneous tests for XML bean definitions.
@@ -82,6 +76,7 @@
  * @author Rod Johnson
  * @author Rick Evans
  * @author Chris Beams
+ * @author Sam Brannen
  */
 public final class XmlBeanFactoryTests {
 
@@ -233,6 +228,20 @@ public void testInnerBeans() throws IOException {
 		assertEquals("inner1", innerForConstructor.getName());
 		assertEquals(6, innerForConstructor.getAge());
 
+		hasInnerBeansForConstructor = (TestBean) xbf.getBean("hasInnerBeansAsPrototype");
+		innerForConstructor = (TestBean) hasInnerBeansForConstructor.getSpouse();
+		assertNotNull(innerForConstructor);
+		assertEquals("innerBean", innerForConstructor.getBeanName());
+		assertEquals("inner1", innerForConstructor.getName());
+		assertEquals(6, innerForConstructor.getAge());
+
+		hasInnerBeansForConstructor = (TestBean) xbf.getBean("hasInnerBeansAsPrototype");
+		innerForConstructor = (TestBean) hasInnerBeansForConstructor.getSpouse();
+		assertNotNull(innerForConstructor);
+		assertEquals("innerBean", innerForConstructor.getBeanName());
+		assertEquals("inner1", innerForConstructor.getName());
+		assertEquals(6, innerForConstructor.getAge());
+
 		xbf.destroySingletons();
 		assertTrue(inner1.wasDestroyed());
 		assertTrue(inner2.wasDestroyed());
@@ -256,7 +265,7 @@ public void testInnerBeansWithoutDestroy() {
 		assertEquals(5, hasInnerBeans.getAge());
 		TestBean inner1 = (TestBean) hasInnerBeans.getSpouse();
 		assertNotNull(inner1);
-		assertEquals("innerBean", inner1.getBeanName());
+		assertTrue(inner1.getBeanName().startsWith("innerBean"));
 		assertEquals("inner1", inner1.getName());
 		assertEquals(6, inner1.getAge());
 
@@ -271,7 +280,7 @@ public void testInnerBeansWithoutDestroy() {
 		TestBean innerFactory = (TestBean) friends[1];
 		assertEquals(DummyFactory.SINGLETON_NAME, innerFactory.getName());
 		TestBean inner5 = (TestBean) friends[2];
-		assertEquals("innerBean", inner5.getBeanName());
+		assertTrue(inner5.getBeanName().startsWith("innerBean"));
 	}
 
 	@Test
@@ -393,11 +402,11 @@ public void testAutowireModeNotInherited() {
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf);
 		reader.loadBeanDefinitions(OVERRIDES_CONTEXT);
 
-		TestBean david = (TestBean)xbf.getBean("magicDavid");
+		TestBean david = (TestBean) xbf.getBean("magicDavid");
 		// the parent bean is autowiring
 		assertNotNull(david.getSpouse());
 
-		TestBean derivedDavid = (TestBean)xbf.getBean("magicDavidDerived");
+		TestBean derivedDavid = (TestBean) xbf.getBean("magicDavidDerived");
 		// this fails while it inherits from the child bean
 		assertNull("autowiring not propagated along child relationships", derivedDavid.getSpouse());
 	}
@@ -495,7 +504,7 @@ public void testSingletonInheritsFromParentFactoryPrototype() throws Exception {
 		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
 		new XmlBeanDefinitionReader(child).loadBeanDefinitions(CHILD_CONTEXT);
 		TestBean inherits = (TestBean) child.getBean("singletonInheritsFromParentFactoryPrototype");
-		// Name property value is overriden
+		// Name property value is overridden
 		assertTrue(inherits.getName().equals("prototype-override"));
 		// Age property is inherited from bean in parent factory
 		assertTrue(inherits.getAge() == 2);
@@ -1290,6 +1299,31 @@ public void testRecursiveImport() {
 		}
 	}
 
+	/**
+	 * @since 3.2.8 and 4.0.2
+	 * @see <a href="https://jira.springsource.org/browse/SPR-10785">SPR-10785</a> and <a
+	 *      href="https://jira.springsource.org/browse/SPR-11420">SPR-11420</a>
+	 */
+	@Test
+	public void methodInjectedBeanMustBeOfSameEnhancedCglibSubclassTypeAcrossBeanFactories() {
+		Class<?> firstClass = null;
+
+		for (int i = 1; i <= 10; i++) {
+			DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+			new XmlBeanDefinitionReader(bf).loadBeanDefinitions(OVERRIDES_CONTEXT);
+
+			final Class<?> currentClass = bf.getBean("overrideOneMethod").getClass();
+			assertTrue("Method injected bean class [" + currentClass + "] must be a CGLIB enhanced subclass.",
+				ClassUtils.isCglibProxyClass(currentClass));
+
+			if (firstClass == null) {
+				firstClass = currentClass;
+			}
+			else {
+				assertEquals(firstClass, currentClass);
+			}
+		}
+	}
 
 	@Test
 	public void testLookupOverrideMethodsWithSetterInjection() {
@@ -1345,7 +1379,7 @@ private void testLookupOverrideMethodsWithSetterInjection(BeanFactory xbf, Strin
 		// This differs from Spring's AOP support, which has a distinct notion
 		// of a "target" object, meaning that the target needs explicit knowledge
 		// of AOP proxying to invoke an advised method on itself.
-		TestBean jenny3 = oom.invokesOverridenMethodOnSelf();
+		TestBean jenny3 = oom.invokesOverriddenMethodOnSelf();
 		assertEquals("Jenny", jenny3.getName());
 		assertNotSame(jenny1, jenny3);
 
@@ -1922,6 +1956,7 @@ public LenientDependencyTestBean(DerivedTestBean tb) {
 			this.tb = tb;
 		}
 
+		@SuppressWarnings("rawtypes")
 		public LenientDependencyTestBean(Map[] m) {
 			throw new IllegalStateException("Don't pick this constructor");
 		}
diff --git a/spring-context/src/test/java/org/springframework/cache/CacheReproTests.java b/spring-context/src/test/java/org/springframework/cache/CacheReproTests.java
new file mode 100644
index 0000000000..d60c14c170
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/cache/CacheReproTests.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cache;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.annotation.Caching;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.concurrent.ConcurrentMapCache;
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
+import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+/**
+ * Tests to reproduce raised caching issues.
+ *
+ * @author Phillip Webb
+ * @author Juergen Hoeller
+ * @author Stephane Nicoll
+ */
+public class CacheReproTests {
+
+	@Test
+	public void spr11124() throws Exception {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Spr11124Config.class);
+		Spr11124Service bean = context.getBean(Spr11124Service.class);
+		bean.single(2);
+		bean.single(2);
+		bean.multiple(2);
+		bean.multiple(2);
+		context.close();
+	}
+
+	@Test
+	public void spr11249() throws Exception {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Spr11249Config.class);
+		Spr11249Service bean = context.getBean(Spr11249Service.class);
+		Object result = bean.doSomething("op", 2, 3);
+		assertSame(result, bean.doSomething("op", 2, 3));
+		context.close();
+	}
+
+	@Test
+	public void spr11592GetSimple() {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Spr11592Config.class);
+		Spr11592Service bean = context.getBean(Spr11592Service.class);
+		Cache cache = context.getBean("cache", Cache.class);
+
+		String key = "1";
+		Object result = bean.getSimple("1");
+		verify(cache, times(1)).get(key); // first call: cache miss
+
+		Object cachedResult = bean.getSimple("1");
+		assertSame(result, cachedResult);
+		verify(cache, times(2)).get(key); // second call: cache hit
+
+		context.close();
+	}
+
+	@Test
+	public void spr11592GetNeverCache(){
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Spr11592Config.class);
+		Spr11592Service bean = context.getBean(Spr11592Service.class);
+		Cache cache = context.getBean("cache", Cache.class);
+
+		String key = "1";
+		Object result = bean.getNeverCache("1");
+		verify(cache, times(0)).get(key); // no cache hit at all, caching disabled
+
+		Object cachedResult = bean.getNeverCache("1");
+		assertNotSame(result, cachedResult);
+		verify(cache, times(0)).get(key); // caching disabled
+
+		context.close();
+	}
+
+
+	@Configuration
+	@EnableCaching
+	public static class Spr11124Config {
+
+		@Bean
+		public CacheManager cacheManager() {
+			return new ConcurrentMapCacheManager();
+		}
+
+		@Bean
+		public Spr11124Service service() {
+			return new Spr11124ServiceImpl();
+		}
+	}
+
+
+	public interface Spr11124Service {
+
+		public List<String> single(int id);
+
+		public List<String> multiple(int id);
+	}
+
+
+	public static class Spr11124ServiceImpl implements Spr11124Service {
+
+		private int multipleCount = 0;
+
+		@Override
+		@Cacheable("smallCache")
+		public List<String> single(int id) {
+			if (this.multipleCount > 0) {
+				fail("Called too many times");
+			}
+			this.multipleCount++;
+			return Collections.emptyList();
+		}
+
+		@Override
+		@Caching(cacheable = {
+				@Cacheable(value = "bigCache", unless = "#result.size() < 4"),
+				@Cacheable(value = "smallCache", unless = "#result.size() > 3") })
+		public List<String> multiple(int id) {
+			if (this.multipleCount > 0) {
+				fail("Called too many times");
+			}
+			this.multipleCount++;
+			return Collections.emptyList();
+		}
+	}
+
+
+	@Configuration
+	@EnableCaching
+	public static class Spr11249Config {
+
+		@Bean
+		public CacheManager cacheManager() {
+			return new ConcurrentMapCacheManager();
+		}
+
+		@Bean
+		public Spr11249Service service() {
+			return new Spr11249Service();
+		}
+	}
+
+
+	public static class Spr11249Service {
+
+		@Cacheable("smallCache")
+		public Object doSomething(String name, int... values) {
+			return new Object();
+		}
+	}
+
+
+	@Configuration
+	@EnableCaching
+	public static class Spr11592Config {
+
+		@Bean
+		public CacheManager cacheManager() {
+			SimpleCacheManager cacheManager = new SimpleCacheManager();
+			cacheManager.setCaches(Arrays.asList(cache()));
+			return cacheManager;
+		}
+
+		@Bean
+		public Cache cache() {
+			Cache cache = new ConcurrentMapCache("cache");
+			return Mockito.spy(cache);
+		}
+
+		@Bean
+		public Spr11592Service service() {
+			return new Spr11592Service();
+		}
+	}
+
+
+	public static class Spr11592Service {
+
+		@Cacheable("cache")
+		public Object getSimple(String key) {
+			return new Object();
+		}
+
+		@Cacheable(value = "cache", condition = "false")
+		public Object getNeverCache(String key) {
+			return new Object();
+		}
+	}
+
+}
diff --git a/spring-context/src/test/java/org/springframework/cache/annotation/AnnotationCacheOperationSourceTests.java b/spring-context/src/test/java/org/springframework/cache/annotation/AnnotationCacheOperationSourceTests.java
index 4c1632aacd..996e110362 100644
--- a/spring-context/src/test/java/org/springframework/cache/annotation/AnnotationCacheOperationSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/annotation/AnnotationCacheOperationSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.cache.annotation;
 
-import static org.junit.Assert.*;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -27,22 +25,20 @@
 import java.util.Iterator;
 
 import org.junit.Test;
+
 import org.springframework.cache.interceptor.CacheEvictOperation;
 import org.springframework.cache.interceptor.CacheOperation;
 import org.springframework.cache.interceptor.CacheableOperation;
-import org.springframework.util.ReflectionUtils;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Costin Leau
  */
 public class AnnotationCacheOperationSourceTests {
 
-	private AnnotationCacheOperationSource source = new AnnotationCacheOperationSource();
+	private final AnnotationCacheOperationSource source = new AnnotationCacheOperationSource();
 
-	private Collection<CacheOperation> getOps(String name) {
-		Method method = ReflectionUtils.findMethod(AnnotatedClass.class, name);
-		return source.getCacheOperations(method, AnnotatedClass.class);
-	}
 
 	@Test
 	public void testSingularAnnotation() throws Exception {
@@ -69,6 +65,12 @@ public void testCaching() throws Exception {
 		assertTrue(it.next() instanceof CacheEvictOperation);
 	}
 
+	@Test
+	public void testEmptyCaching() throws Exception {
+		Collection<CacheOperation> ops = getOps("emptyCaching");
+		assertTrue(ops.isEmpty());
+	}
+
 	@Test
 	public void testSingularStereotype() throws Exception {
 		Collection<CacheOperation> ops = getOps("singleStereotype");
@@ -90,7 +92,15 @@ public void testMultipleStereotypes() throws Exception {
 		assertTrue(next.getCacheNames().contains("bar"));
 	}
 
+
+	private Collection<CacheOperation> getOps(String name) throws Exception {
+		Method method = AnnotatedClass.class.getMethod(name);
+		return source.getCacheOperations(method, AnnotatedClass.class);
+	}
+
+
 	private static class AnnotatedClass {
+
 		@Cacheable("test")
 		public void singular() {
 		}
@@ -100,13 +110,16 @@ public void singular() {
 		public void multiple() {
 		}
 
-		@Caching(cacheable = { @Cacheable("test") }, evict = { @CacheEvict("test") })
+		@Caching(cacheable = @Cacheable("test"), evict = @CacheEvict("test"))
 		public void caching() {
 		}
 
+		@Caching
+		public void emptyCaching() {
+		}
+
 		@EvictFoo
 		public void singleStereotype() {
-
 		}
 
 		@EvictFoo
@@ -120,21 +133,25 @@ public void multipleCaching() {
 		}
 	}
 
+
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target(ElementType.METHOD)
 	@Cacheable("foo")
 	public @interface CacheableFoo {
 	}
 
+
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target(ElementType.METHOD)
-	@CacheEvict(value = "foo")
+	@CacheEvict("foo")
 	public @interface EvictFoo {
 	}
 
+
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target(ElementType.METHOD)
-	@CacheEvict(value = "bar")
+	@CacheEvict("bar")
 	public @interface EvictBar {
 	}
-}
\ No newline at end of file
+
+}
diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/DefaultKeyGeneratorTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/DefaultKeyGeneratorTests.java
new file mode 100644
index 0000000000..3376a617dc
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/cache/interceptor/DefaultKeyGeneratorTests.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cache.interceptor;
+
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+/**
+ * Tests for {@link DefaultKeyGenerator}.
+ *
+ * @author Juergen Hoeller
+ * @author Stephane Nicoll
+ */
+public class DefaultKeyGeneratorTests {
+
+	private final DefaultKeyGenerator generator = new DefaultKeyGenerator();
+
+
+	@Test
+	public void noValues() {
+		Object k1 = generateKey(new Object[] {});
+		Object k2 = generateKey(new Object[] {});
+		Object k3 = generateKey(new Object[] { "different" });
+		assertThat(k1.hashCode(), equalTo(k2.hashCode()));
+		assertThat(k1.hashCode(), not(equalTo(k3.hashCode())));
+		assertThat(k1, equalTo(k2));
+		assertThat(k1, not(equalTo(k3)));
+	}
+
+	@Test
+	public void singleValue(){
+		Object k1 = generateKey(new Object[] { "a" });
+		Object k2 = generateKey(new Object[] { "a" });
+		Object k3 = generateKey(new Object[] { "different" });
+		assertThat(k1.hashCode(), equalTo(k2.hashCode()));
+		assertThat(k1.hashCode(), not(equalTo(k3.hashCode())));
+		assertThat(k1, equalTo(k2));
+		assertThat(k1, not(equalTo(k3)));
+		assertThat(k1, equalTo((Object) "a"));
+	}
+
+	@Test
+	public void multipleValues()  {
+		Object k1 = generateKey(new Object[] { "a", 1, "b" });
+		Object k2 = generateKey(new Object[] { "a", 1, "b" });
+		Object k3 = generateKey(new Object[] { "b", 1, "a" });
+		assertThat(k1.hashCode(), equalTo(k2.hashCode()));
+		assertThat(k1.hashCode(), not(equalTo(k3.hashCode())));
+		assertThat(k1, equalTo(k2));
+		assertThat(k1, not(equalTo(k3)));
+	}
+
+	@Test
+	public void singleNullValue() {
+		Object k1 = generateKey(new Object[] { null });
+		Object k2 = generateKey(new Object[] { null });
+		Object k3 = generateKey(new Object[] { "different" });
+		assertThat(k1.hashCode(), equalTo(k2.hashCode()));
+		assertThat(k1.hashCode(), not(equalTo(k3.hashCode())));
+		assertThat(k1, equalTo(k2));
+		assertThat(k1, not(equalTo(k3)));
+		assertThat(k1, instanceOf(Integer.class));
+	}
+
+	@Test
+	public void multipleNullValues() {
+		Object k1 = generateKey(new Object[] { "a", null, "b", null });
+		Object k2 = generateKey(new Object[] { "a", null, "b", null });
+		Object k3 = generateKey(new Object[] { "a", null, "b" });
+		assertThat(k1.hashCode(), equalTo(k2.hashCode()));
+		assertThat(k1.hashCode(), not(equalTo(k3.hashCode())));
+		assertThat(k1, equalTo(k2));
+		assertThat(k1, not(equalTo(k3)));
+	}
+
+	@Test
+	public void plainArray() {
+		Object k1 = generateKey(new Object[] { new String[]{"a", "b"} });
+		Object k2 = generateKey(new Object[] { new String[]{"a", "b"} });
+		Object k3 = generateKey(new Object[] { new String[]{"b", "a"} });
+		assertThat(k1.hashCode(), equalTo(k2.hashCode()));
+		assertThat(k1.hashCode(), not(equalTo(k3.hashCode())));
+		assertThat(k1, equalTo(k2));
+		assertThat(k1, not(equalTo(k3)));
+	}
+
+	@Test
+	public void arrayWithExtraParameter() {
+		Object k1 = generateKey(new Object[] { new String[]{"a", "b"}, "c" });
+		Object k2 = generateKey(new Object[] { new String[]{"a", "b"}, "c" });
+		Object k3 = generateKey(new Object[] { new String[]{"b", "a"}, "c" });
+		assertThat(k1.hashCode(), equalTo(k2.hashCode()));
+		assertThat(k1.hashCode(), not(equalTo(k3.hashCode())));
+		assertThat(k1, equalTo(k2));
+		assertThat(k1, not(equalTo(k3)));
+	}
+
+
+	private Object generateKey(Object[] arguments) {
+		return this.generator.generate(null, null, arguments);
+	}
+
+}
diff --git a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
index 6f407fb24e..d92309186e 100644
--- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
@@ -16,8 +16,13 @@
 
 package org.springframework.context;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.util.Locale;
 
+import org.junit.Test;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.xml.AbstractListableBeanFactoryTests;
 import org.springframework.tests.sample.beans.LifecycleBean;
@@ -129,11 +134,29 @@ public void testMessageSource() throws NoSuchMessageException {
 	}
 
 	public void testEvents() throws Exception {
+		doTestEvents(this.listener, this.parentListener, new MyEvent(this));
+	}
+
+	@Test
+	public void testEventsWithNoSource() throws Exception {
+		// See SPR-10945 Serialized events result in a null source
+		MyEvent event = new MyEvent(this);
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		ObjectOutputStream oos = new ObjectOutputStream(bos);
+		oos.writeObject(event);
+		oos.close();
+		event = (MyEvent) new ObjectInputStream(new ByteArrayInputStream(
+				bos.toByteArray())).readObject();
+		doTestEvents(this.listener, this.parentListener, event);
+	}
+
+	protected void doTestEvents(TestListener listener, TestListener parentListener,
+			MyEvent event) {
 		listener.zeroCounter();
 		parentListener.zeroCounter();
 		assertTrue("0 events before publication", listener.getEventCount() == 0);
 		assertTrue("0 parent events before publication", parentListener.getEventCount() == 0);
-		this.applicationContext.publishEvent(new MyEvent(this));
+		this.applicationContext.publishEvent(event);
 		assertTrue("1 events after publication, not " + listener.getEventCount(), listener.getEventCount() == 1);
 		assertTrue("1 parent events after publication", parentListener.getEventCount() == 1);
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java
index e3ed03301f..10aa8ee950 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java
@@ -13,22 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.context.annotation;
 
-import static org.junit.Assert.*;
+package org.springframework.context.annotation;
 
 import org.junit.Test;
-import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ConfigurationClassParser;
-import org.springframework.context.annotation.Import;
 
+import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
 
 /**
- * TCK-style unit tests for handling circular use of the {@link Import} annotation. Explore
- * subclass hierarchy for specific concrete implementations.
+ * TCK-style unit tests for handling circular use of the {@link Import} annotation.
+ * Explore the subclass hierarchy for specific concrete implementations.
  *
  * @author Chris Beams
  */
@@ -38,23 +35,23 @@ public abstract class AbstractCircularImportDetectionTests {
 
 	protected abstract String loadAsConfigurationSource(Class<?> clazz) throws Exception;
 
+
 	@Test
 	public void simpleCircularImportIsDetected() throws Exception {
 		boolean threw = false;
 		try {
 			newParser().parse(loadAsConfigurationSource(A.class), "A");
-		} catch (BeanDefinitionParsingException ex) {
+		}
+		catch (BeanDefinitionParsingException ex) {
 			assertTrue("Wrong message. Got: " + ex.getMessage(),
 					ex.getMessage().contains(
 						"Illegal attempt by @Configuration class 'AbstractCircularImportDetectionTests.B' " +
 						"to import class 'AbstractCircularImportDetectionTests.A'"));
 			threw = true;
 		}
-
 		assertTrue(threw);
 	}
 
-
 	@Test
 	public void complexCircularImportIsDetected() throws Exception {
 		boolean threw = false;
@@ -68,10 +65,10 @@ public void complexCircularImportIsDetected() throws Exception {
 						"to import class 'AbstractCircularImportDetectionTests.Z'"));
 			threw = true;
 		}
-
 		assertTrue(threw);
 	}
 
+
 	@Configuration
 	@Import(B.class)
 	static class A {
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java
index e225839893..e2ca64e599 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,21 @@
 
 package org.springframework.context.annotation;
 
-import example.scannable.DefaultNamedComponent;
-import org.junit.Test;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
+import org.junit.Test;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import example.scannable.DefaultNamedComponent;
 import static org.junit.Assert.*;
 
 /**
@@ -81,6 +86,22 @@ public void testGenerateBeanNameWithAnonymousComponentYieldsGeneratedBeanName()
 		assertEquals(expectedGeneratedBeanName, beanName);
 	}
 
+	@Test
+	public void testGenerateBeanNameFromMetaComponentWithStringValue() {
+		BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
+		AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentFromStringMeta.class);
+		String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
+		assertEquals("henry", beanName);
+	}
+
+	@Test
+	public void testGenerateBeanNameFromMetaComponentWithNonStringValue() {
+		BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
+		AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(ComponentFromNonStringMeta.class);
+		String beanName = this.beanNameGenerator.generateBeanName(bd, registry);
+		assertEquals("annotationBeanNameGeneratorTests.ComponentFromNonStringMeta", beanName);
+	}
+
 
 	@Component("walden")
 	private static class ComponentWithName {
@@ -96,4 +117,19 @@ private static class ComponentWithBlankName {
 	private static class AnonymousComponent {
 	}
 
+	@Service("henry")
+	private static class ComponentFromStringMeta {
+	}
+
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target(ElementType.TYPE)
+	@Component
+	public @interface NonStringMetaComponent {
+		long value();
+	}
+
+	@NonStringMetaComponent(123)
+	private static class ComponentFromNonStringMeta {
+	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java
index 61b2612d29..cf0c37023c 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.context.annotation;
 
 import org.springframework.beans.factory.parsing.FailFastProblemReporter;
@@ -22,12 +23,12 @@
 import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
 
 /**
- * Unit test proving that ASM-based {@link ConfigurationClassParser} correctly detects circular use of
- * the {@link Import @Import} annotation.
+ * Unit test proving that ASM-based {@link ConfigurationClassParser} correctly detects circular
+ * use of the {@link Import @Import} annotation.
  *
- * <p>While this test is the only subclass of {@link AbstractCircularImportDetectionTests}, the
- * hierarchy remains in place in case a JDT-based ConfigurationParser implementation needs to be
- * developed.
+ * <p>While this test is the only subclass of {@link AbstractCircularImportDetectionTests},
+ * the hierarchy remains in place in case a JDT-based ConfigurationParser implementation
+ * needs to be developed.
  *
  * @author Chris Beams
  */
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java b/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
index 1d573540f8..767895a356 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,61 +16,117 @@
 
 package org.springframework.context.annotation;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.lang.annotation.Inherited;
+import java.util.List;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Tests regarding overloading and overriding of bean methods.
  * Related to SPR-6618.
  *
- * Bean-annotated methods should be able to be overridden, just as any regular
- * method. This is straightforward.
- *
- * Bean-annotated methods should be able to be overloaded, though supporting this
- * is more subtle. Essentially, it must be unambiguous to the container which bean
- * method to call.  A simple way to think about this is that no one Configuration
- * class may declare two bean methods with the same name.  In the case of inheritance,
- * the most specific subclass bean method will always be the one that is invoked.
- *
  * @author Chris Beams
+ * @author Phillip Webb
+ * @author Juergen Hoeller
  */
 public class BeanMethodPolymorphismTests {
 
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+
+	@Test
+	public void beanMethodDetectedOnSuperClass() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(Config.class);
+		ctx.getBean("testBean", TestBean.class);
+	}
+
+	@Test
+	public void beanMethodOverriding() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(OverridingConfig.class);
+		ctx.setAllowBeanDefinitionOverriding(false);
+		ctx.refresh();
+		assertFalse(ctx.getDefaultListableBeanFactory().containsSingleton("testBean"));
+		assertEquals("overridden", ctx.getBean("testBean", TestBean.class).toString());
+		assertTrue(ctx.getDefaultListableBeanFactory().containsSingleton("testBean"));
+	}
+
+	@Test
+	public void beanMethodOverridingOnASM() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.registerBeanDefinition("config", new RootBeanDefinition(OverridingConfig.class.getName()));
+		ctx.setAllowBeanDefinitionOverriding(false);
+		ctx.refresh();
+		assertFalse(ctx.getDefaultListableBeanFactory().containsSingleton("testBean"));
+		assertEquals("overridden", ctx.getBean("testBean", TestBean.class).toString());
+		assertTrue(ctx.getDefaultListableBeanFactory().containsSingleton("testBean"));
+	}
+
+	@Test
+	public void beanMethodOverridingWithNarrowedReturnType() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(NarrowedOverridingConfig.class);
+		ctx.setAllowBeanDefinitionOverriding(false);
+		ctx.refresh();
+		assertFalse(ctx.getDefaultListableBeanFactory().containsSingleton("testBean"));
+		assertEquals("overridden", ctx.getBean("testBean", TestBean.class).toString());
+		assertTrue(ctx.getDefaultListableBeanFactory().containsSingleton("testBean"));
+	}
+
+	@Test
+	public void beanMethodOverridingWithNarrowedReturnTypeOnASM() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.registerBeanDefinition("config", new RootBeanDefinition(NarrowedOverridingConfig.class.getName()));
+		ctx.setAllowBeanDefinitionOverriding(false);
+		ctx.refresh();
+		assertFalse(ctx.getDefaultListableBeanFactory().containsSingleton("testBean"));
+		assertEquals("overridden", ctx.getBean("testBean", TestBean.class).toString());
+		assertTrue(ctx.getDefaultListableBeanFactory().containsSingleton("testBean"));
+	}
+
 	@Test
 	public void beanMethodOverloadingWithoutInheritance() {
+
 		@SuppressWarnings({ "hiding" })
 		@Configuration class Config {
 			@Bean String aString() { return "na"; }
 			@Bean String aString(Integer dependency) { return "na"; }
 		}
-		try {
-			new AnnotationConfigApplicationContext(Config.class);
-			fail("expected bean method overloading exception");
-		} catch (BeanDefinitionParsingException ex) {
-			assertTrue(ex.getMessage(), ex.getMessage().contains("2 overloaded @Bean methods named 'aString'"));
-		}
+
+		this.thrown.expect(BeanDefinitionParsingException.class);
+		this.thrown.expectMessage("overloaded @Bean methods named 'aString'");
+		new AnnotationConfigApplicationContext(Config.class);
 	}
 
 	@Test
 	public void beanMethodOverloadingWithInheritance() {
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SubConfig.class);
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(SubConfig.class);
+		ctx.setAllowBeanDefinitionOverriding(false);
+		ctx.refresh();
+		assertFalse(ctx.getDefaultListableBeanFactory().containsSingleton("aString"));
 		assertThat(ctx.getBean(String.class), equalTo("overloaded5"));
+		assertTrue(ctx.getDefaultListableBeanFactory().containsSingleton("aString"));
 	}
-	static @Configuration class SuperConfig {
-		@Bean String aString() { return "super"; }
-	}
-	static @Configuration class SubConfig {
-		@Bean Integer anInt() { return 5; }
-		@Bean String aString(Integer dependency) { return "overloaded"+dependency; }
+
+	// SPR-11025
+	@Test
+	public void beanMethodOverloadingWithInheritanceAndList() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(SubConfigWithList.class);
+		ctx.setAllowBeanDefinitionOverriding(false);
+		ctx.refresh();
+		assertFalse(ctx.getDefaultListableBeanFactory().containsSingleton("aString"));
+		assertThat(ctx.getBean(String.class), equalTo("overloaded5"));
+		assertTrue(ctx.getDefaultListableBeanFactory().containsSingleton("aString"));
 	}
 
 	/**
@@ -83,24 +139,6 @@ public void beanMethodShadowing() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ShadowConfig.class);
 		assertThat(ctx.getBean(String.class), equalTo("shadow"));
 	}
-	@Import(SubConfig.class)
-	static @Configuration class ShadowConfig {
-		@Bean String aString() { return "shadow"; }
-	}
-
-	/**
-	 * Tests that polymorphic Configuration classes need not explicitly redeclare the
-	 * {@link Configuration} annotation. This respects the {@link Inherited} nature
-	 * of the Configuration annotation, even though it's being detected via ASM.
-	 */
-	@Test
-	public void beanMethodsDetectedOnSuperClass() {
-		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
-		beanFactory.registerBeanDefinition("config", new RootBeanDefinition(Config.class));
-		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
-		pp.postProcessBeanFactory(beanFactory);
-		beanFactory.getBean("testBean", TestBean.class);
-	}
 
 
 	@Configuration
@@ -117,4 +155,91 @@ public TestBean testBean() {
 	static class Config extends BaseConfig {
 	}
 
+
+	@Configuration
+	static class OverridingConfig extends BaseConfig {
+
+		@Bean @Lazy
+		@Override
+		public TestBean testBean() {
+			return new TestBean() {
+				@Override
+				public String toString() {
+					return "overridden";
+				}
+			};
+		}
+	}
+
+
+	static class ExtendedTestBean extends TestBean {
+	}
+
+
+	@Configuration
+	static class NarrowedOverridingConfig extends BaseConfig {
+
+		@Bean @Lazy
+		@Override
+		public ExtendedTestBean testBean() {
+			return new ExtendedTestBean() {
+				@Override
+				public String toString() {
+					return "overridden";
+				}
+			};
+		}
+	}
+
+
+	@Configuration
+	static class SuperConfig {
+
+		@Bean
+		String aString() {
+			return "super";
+		}
+	}
+
+
+	@Configuration
+	static class SubConfig extends SuperConfig {
+
+		@Bean
+		Integer anInt() {
+			return 5;
+		}
+
+		@Bean @Lazy
+		String aString(Integer dependency) {
+			return "overloaded" + dependency;
+		}
+	}
+
+
+	@Configuration
+	static class SubConfigWithList extends SuperConfig {
+
+		@Bean
+		Integer anInt() {
+			return 5;
+		}
+
+		@Bean @Lazy
+		String aString(List<Integer> dependency) {
+			return "overloaded" + dependency.get(0);
+		}
+	}
+
+
+	@Configuration
+	@Import(SubConfig.class)
+	static class ShadowConfig {
+
+		@Bean
+		String aString() {
+			return "shadow";
+		}
+	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
index e2c1cc3b57..c44662b418 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,11 +25,6 @@
 import org.junit.Test;
 
 import org.springframework.beans.BeansException;
-import org.springframework.tests.mock.jndi.ExpectedLookupTemplate;
-import org.springframework.tests.sample.beans.INestedTestBean;
-import org.springframework.tests.sample.beans.ITestBean;
-import org.springframework.tests.sample.beans.NestedTestBean;
-import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -42,6 +37,11 @@
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.jndi.support.SimpleJndiBeanFactory;
+import org.springframework.tests.mock.jndi.ExpectedLookupTemplate;
+import org.springframework.tests.sample.beans.INestedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.NestedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 
 import static org.junit.Assert.*;
@@ -566,20 +566,20 @@ public TestBean getTestBean2() {
 	}
 
 
-	public static class ExtendedResourceInjectionBean extends ResourceInjectionBean {
+	static class NonPublicResourceInjectionBean<B> extends ResourceInjectionBean {
 
 		@Resource(name="testBean4", type=TestBean.class)
 		protected ITestBean testBean3;
 
-		private ITestBean testBean4;
+		private B testBean4;
 
 		@Resource
-		private INestedTestBean testBean5;
+		INestedTestBean testBean5;
 
-		private INestedTestBean testBean6;
+		INestedTestBean testBean6;
 
 		@Resource
-		private BeanFactory beanFactory;
+		BeanFactory beanFactory;
 
 		@Override
 		@Resource
@@ -588,12 +588,18 @@ public void setTestBean2(TestBean testBean2) {
 		}
 
 		@Resource(name="${tb}", type=ITestBean.class)
-		private void setTestBean4(ITestBean testBean4) {
+		private void setTestBean4(B testBean4) {
+			if (this.testBean4 != null) {
+				throw new IllegalStateException("Already called");
+			}
 			this.testBean4 = testBean4;
 		}
 
 		@Resource
 		public void setTestBean6(INestedTestBean testBean6) {
+			if (this.testBean6 != null) {
+				throw new IllegalStateException("Already called");
+			}
 			this.testBean6 = testBean6;
 		}
 
@@ -601,7 +607,7 @@ public ITestBean getTestBean3() {
 			return testBean3;
 		}
 
-		public ITestBean getTestBean4() {
+		public B getTestBean4() {
 			return testBean4;
 		}
 
@@ -630,6 +636,10 @@ protected void destroy2() {
 	}
 
 
+	public static class ExtendedResourceInjectionBean extends NonPublicResourceInjectionBean<ITestBean> {
+	}
+
+
 	public static class ExtendedEjbInjectionBean extends ResourceInjectionBean {
 
 		@EJB(name="testBean4", beanInterface=TestBean.class)
@@ -653,11 +663,17 @@ public void setTestBean2(TestBean testBean2) {
 
 		@EJB(beanName="testBean3", beanInterface=ITestBean.class)
 		private void setTestBean4(ITestBean testBean4) {
+			if (this.testBean4 != null) {
+				throw new IllegalStateException("Already called");
+			}
 			this.testBean4 = testBean4;
 		}
 
 		@EJB
 		public void setTestBean6(INestedTestBean testBean6) {
+			if (this.testBean6 != null) {
+				throw new IllegalStateException("Already called");
+			}
 			this.testBean6 = testBean6;
 		}
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
index d8c5125eb5..d70b26a59d 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAndImportAnnotationInteractionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 package org.springframework.context.annotation;
 
 import org.junit.Test;
+
+import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.annotation.componentscan.simple.SimpleComponent;
 
 /**
@@ -36,17 +38,61 @@ public void componentScanOverlapsWithImport() {
 		ctx.getBean(SimpleComponent.class); // succeeds -> there is only one bean of type SimpleComponent
 	}
 
+	@Test
+	public void componentScanOverlapsWithImportUsingAsm() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.registerBeanDefinition("config1", new RootBeanDefinition(Config1.class.getName()));
+		ctx.registerBeanDefinition("config2", new RootBeanDefinition(Config2.class.getName()));
+		ctx.refresh(); // no conflicts found trying to register SimpleComponent
+		ctx.getBean(SimpleComponent.class); // succeeds -> there is only one bean of type SimpleComponent
+	}
+
+	@Test
+	public void componentScanViaImport() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(Config3.class);
+		ctx.refresh();
+		ctx.getBean(SimpleComponent.class);
+	}
+
+	@Test
+	public void componentScanViaImportUsingAsm() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.registerBeanDefinition("config4", new RootBeanDefinition(Config3.class.getName()));
+		ctx.refresh();
+		ctx.getBean(SimpleComponent.class);
+	}
+
+	@Test
+	public void componentScanViaImportUsingScan() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.scan("org.springframework.context.annotation.componentscan.importing");
+		ctx.refresh();
+		ctx.getBean(SimpleComponent.class);
+	}
+
 
 	@Configuration
 	@ComponentScan("org.springframework.context.annotation.componentscan.simple")
 	static class Config1 {
-
 	}
 
 
 	@Configuration
 	@Import(org.springframework.context.annotation.componentscan.simple.SimpleComponent.class)
 	static class Config2 {
+	}
+
 
+	@Configuration
+	@Import(ImportedConfig.class)
+	static class Config3 {
 	}
+
+
+	@Configuration
+	@ComponentScan("org.springframework.context.annotation.componentscan.simple")
+	public static class ImportedConfig {
+	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
index 6972adada9..732d080fe1 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,6 +101,7 @@ public TestBean beanMethod() {
 
 	@Configuration
 	static class Config2 {
+
 		TestBean testBean;
 
 		@Autowired
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
index 815c487294..8714166855 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 
 /**
  * @author Chris Beams
+ * @author Juergen Hoeller
  */
 public class ConfigurationClassPostProcessorTests {
 
@@ -49,6 +50,17 @@ public void testEnhancementIsPresentBecauseSingletonSemanticsAreRespected() {
 		assertSame(foo, bar.foo);
 	}
 
+	@Test
+	public void configurationIntrospectionOfInnerClassesWorksWithDotNameSyntax() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerBeanDefinition("config", new RootBeanDefinition(getClass().getName() + ".SingletonBeanConfig"));
+		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
+		pp.postProcessBeanFactory(beanFactory);
+		Foo foo = beanFactory.getBean("foo", Foo.class);
+		Bar bar = beanFactory.getBean("bar", Bar.class);
+		assertSame(foo, bar.foo);
+	}
+
 	/**
 	 * Tests the fix for SPR-5655, a special workaround that prefers reflection
 	 * over ASM if a bean class is already loaded.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java
index 81e7b1af66..6f4602bd45 100755
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,9 @@
 package org.springframework.context.annotation;
 
 import org.junit.Test;
-import org.springframework.beans.factory.BeanCreationException;
+
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.util.Assert;
 
 /**
@@ -35,8 +32,7 @@ public class ConfigurationWithFactoryBeanAndAutowiringTests {
 
 	@Test
 	public void withConcreteFactoryBeanImplementationAsReturnType() {
-		AnnotationConfigApplicationContext ctx =
-			new AnnotationConfigApplicationContext();
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(AppConfig.class);
 		ctx.register(ConcreteFactoryBeanImplementationConfig.class);
 		ctx.refresh();
@@ -44,8 +40,7 @@ public void withConcreteFactoryBeanImplementationAsReturnType() {
 
 	@Test
 	public void withParameterizedFactoryBeanImplementationAsReturnType() {
-		AnnotationConfigApplicationContext ctx =
-			new AnnotationConfigApplicationContext();
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(AppConfig.class);
 		ctx.register(ParameterizedFactoryBeanImplementationConfig.class);
 		ctx.refresh();
@@ -53,8 +48,7 @@ public void withParameterizedFactoryBeanImplementationAsReturnType() {
 
 	@Test
 	public void withParameterizedFactoryBeanInterfaceAsReturnType() {
-		AnnotationConfigApplicationContext ctx =
-			new AnnotationConfigApplicationContext();
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(AppConfig.class);
 		ctx.register(ParameterizedFactoryBeanInterfaceConfig.class);
 		ctx.refresh();
@@ -62,31 +56,27 @@ public void withParameterizedFactoryBeanInterfaceAsReturnType() {
 
 	@Test
 	public void withNonPublicParameterizedFactoryBeanInterfaceAsReturnType() {
-		AnnotationConfigApplicationContext ctx =
-			new AnnotationConfigApplicationContext();
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(AppConfig.class);
 		ctx.register(NonPublicParameterizedFactoryBeanInterfaceConfig.class);
 		ctx.refresh();
 	}
 
-	@Test(expected=BeanCreationException.class)
+	@Test
 	public void withRawFactoryBeanInterfaceAsReturnType() {
-		AnnotationConfigApplicationContext ctx =
-			new AnnotationConfigApplicationContext();
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(AppConfig.class);
 		ctx.register(RawFactoryBeanInterfaceConfig.class);
 		ctx.refresh();
 	}
 
-	@Test(expected=BeanCreationException.class)
+	@Test
 	public void withWildcardParameterizedFactoryBeanInterfaceAsReturnType() {
-		AnnotationConfigApplicationContext ctx =
-			new AnnotationConfigApplicationContext();
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(AppConfig.class);
 		ctx.register(WildcardParameterizedFactoryBeanInterfaceConfig.class);
 		ctx.refresh();
 	}
-
 }
 
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/EnableAspectJAutoProxyTests.java b/spring-context/src/test/java/org/springframework/context/annotation/EnableAspectJAutoProxyTests.java
index 11e2a0f843..9995fc5a02 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/EnableAspectJAutoProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/EnableAspectJAutoProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,21 @@
 
 package org.springframework.context.annotation;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
+import example.scannable.FooService;
+import example.scannable.ServiceInvocationCounter;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
 import org.junit.Test;
+
 import org.springframework.aop.support.AopUtils;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
 
-import example.scannable.FooService;
-import example.scannable.ServiceInvocationCounter;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 /**
  * @author Juergen Hoeller
@@ -34,38 +38,23 @@
  */
 public class EnableAspectJAutoProxyTests {
 
-	@Configuration
-	@ComponentScan("example.scannable")
-	@EnableAspectJAutoProxy
-	static class Config_WithJDKProxy {
-	}
-
-	@Configuration
-	@ComponentScan("example.scannable")
-	@EnableAspectJAutoProxy(proxyTargetClass=true)
-	static class Config_WithCGLIBProxy {
-	}
-
 	@Test
-	public void withJDKProxy() throws Exception {
-		ApplicationContext ctx =
-				new AnnotationConfigApplicationContext(Config_WithJDKProxy.class);
+	public void withJdkProxy() {
+		ApplicationContext ctx = new AnnotationConfigApplicationContext(ConfigWithJdkProxy.class);
 
 		aspectIsApplied(ctx);
 		assertThat(AopUtils.isJdkDynamicProxy(ctx.getBean(FooService.class)), is(true));
 	}
 
 	@Test
-	public void withCGLIBProxy() throws Exception {
-		ApplicationContext ctx =
-				new AnnotationConfigApplicationContext(Config_WithCGLIBProxy.class);
+	public void withCglibProxy() {
+		ApplicationContext ctx = new AnnotationConfigApplicationContext(ConfigWithCglibProxy.class);
 
 		aspectIsApplied(ctx);
 		assertThat(AopUtils.isCglibProxy(ctx.getBean(FooService.class)), is(true));
 	}
 
-
-	private void aspectIsApplied(ApplicationContext ctx) throws Exception {
+	private void aspectIsApplied(ApplicationContext ctx) {
 		FooService fooService = ctx.getBean(FooService.class);
 		ServiceInvocationCounter counter = ctx.getBean(ServiceInvocationCounter.class);
 
@@ -81,4 +70,73 @@ private void aspectIsApplied(ApplicationContext ctx) throws Exception {
 		fooService.foo(1);
 		assertEquals(3, counter.getCount());
 	}
-}
\ No newline at end of file
+
+	@Test
+	public void withAnnotationOnArgumentAndJdkProxy() {
+		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(
+				ConfigWithJdkProxy.class, SampleService.class, LoggingAspect.class);
+
+		SampleService sampleService = ctx.getBean(SampleService.class);
+		sampleService.execute(new SampleDto());
+		sampleService.execute(new SampleInputBean());
+		sampleService.execute((SampleDto) null);
+		sampleService.execute((SampleInputBean) null);
+	}
+
+	@Test
+	public void withAnnotationOnArgumentAndCglibProxy() {
+		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(
+				ConfigWithCglibProxy.class, SampleService.class, LoggingAspect.class);
+
+		SampleService sampleService = ctx.getBean(SampleService.class);
+		sampleService.execute(new SampleDto());
+		sampleService.execute(new SampleInputBean());
+		sampleService.execute((SampleDto) null);
+		sampleService.execute((SampleInputBean) null);
+	}
+
+
+	@Configuration
+	@ComponentScan("example.scannable")
+	@EnableAspectJAutoProxy
+	static class ConfigWithJdkProxy {
+	}
+
+	@Configuration
+	@ComponentScan("example.scannable")
+	@EnableAspectJAutoProxy(proxyTargetClass = true)
+	static class ConfigWithCglibProxy {
+	}
+
+
+	@Retention(RetentionPolicy.RUNTIME)
+	public @interface Loggable {
+	}
+
+	@Loggable
+	public static class SampleDto {
+	}
+
+	public static class SampleInputBean {
+	}
+
+	public static class SampleService {
+
+		// Not matched method on {@link LoggingAspect}.
+		public void execute(SampleInputBean inputBean) {
+		}
+
+		// Matched method on {@link LoggingAspect}
+		public void execute(SampleDto dto) {
+		}
+	}
+
+	@Aspect
+	public static class LoggingAspect {
+
+		@Before("@args(org.springframework.context.annotation.EnableAspectJAutoProxyTests.Loggable))")
+		public void loggingBeginByAtArgs() {
+		}
+	}
+
+}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ImportBeanDefinitionRegistrarTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ImportBeanDefinitionRegistrarTests.java
index 6f55b1f669..9275598df8 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ImportBeanDefinitionRegistrarTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ImportBeanDefinitionRegistrarTests.java
@@ -46,7 +46,6 @@ public class ImportBeanDefinitionRegistrarTests {
 
 	@Test
 	public void shouldInvokeAwareMethodsInImportBeanDefinitionRegistrar() {
-
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
 		context.getBean(MessageSource.class);
 
@@ -55,19 +54,20 @@ public void shouldInvokeAwareMethodsInImportBeanDefinitionRegistrar() {
 		assertThat(SampleRegistrar.resourceLoader, is(notNullValue()));
 	}
 
+
 	@Sample
 	@Configuration
 	static class Config {
-
 	}
 
+
 	@Target(ElementType.TYPE)
 	@Retention(RetentionPolicy.RUNTIME)
 	@Import(SampleRegistrar.class)
 	public static @interface Sample {
-
 	}
 
+
 	static class SampleRegistrar implements ImportBeanDefinitionRegistrar, BeanClassLoaderAware, ResourceLoaderAware,
 			BeanFactoryAware {
 
@@ -94,4 +94,5 @@ public void setResourceLoader(ResourceLoader resourceLoader) {
 		public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
 		}
 	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java b/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java
index f4957319d5..f56510d2eb 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,19 +16,20 @@
 
 package org.springframework.context.annotation;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-
 import org.junit.Test;
 
+import org.springframework.stereotype.Component;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Tests ensuring that nested static @Configuration classes are automatically detected
  * and registered without the need for explicit registration or @Import. See SPR-8186.
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  * @since 3.1
  */
 public class NestedConfigurationClassTests {
@@ -89,9 +90,40 @@ public void twoLevelsDeepWithInheritance() {
 		assertThat(ctx.getBean("overrideBean", TestBean.class).getName(), is("override-s1"));
 	}
 
+	@Test
+	public void twoLevelsInLiteMode() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(L0ConfigLight.class);
+		ctx.refresh();
+
+		ctx.getBean(L0ConfigLight.class);
+		ctx.getBean("l0Bean");
+
+		ctx.getBean(L0ConfigLight.L1ConfigLight.class);
+		ctx.getBean("l1Bean");
+
+		ctx.getBean(L0ConfigLight.L1ConfigLight.L2ConfigLight.class);
+		ctx.getBean("l2Bean");
+
+		// ensure that override order is correct
+		assertThat(ctx.getBean("overrideBean", TestBean.class).getName(), is("override-l0"));
+	}
+
+	@Test
+	public void twoLevelsWithNoBeanMethods() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(L0ConfigEmpty.class);
+		ctx.refresh();
+
+		ctx.getBean(L0ConfigEmpty.class);
+		ctx.getBean(L0ConfigEmpty.L1ConfigEmpty.class);
+		ctx.getBean(L0ConfigEmpty.L1ConfigEmpty.L2ConfigEmpty.class);
+	}
+
 
 	@Configuration
 	static class L0Config {
+
 		@Bean
 		public TestBean l0Bean() {
 			return new TestBean("l0");
@@ -104,6 +136,7 @@ public TestBean overrideBean() {
 
 		@Configuration
 		static class L1Config {
+
 			@Bean
 			public TestBean l1Bean() {
 				return new TestBean("l1");
@@ -116,6 +149,50 @@ public TestBean overrideBean() {
 
 			@Configuration
 			protected static class L2Config {
+
+				@Bean
+				public TestBean l2Bean() {
+					return new TestBean("l2");
+				}
+
+				@Bean
+				public TestBean overrideBean() {
+					return new TestBean("override-l2");
+				}
+			}
+		}
+	}
+
+
+	@Component
+	static class L0ConfigLight {
+
+		@Bean
+		public TestBean l0Bean() {
+			return new TestBean("l0");
+		}
+
+		@Bean
+		public TestBean overrideBean() {
+			return new TestBean("override-l0");
+		}
+
+		@Component
+		static class L1ConfigLight {
+
+			@Bean
+			public TestBean l1Bean() {
+				return new TestBean("l1");
+			}
+
+			@Bean
+			public TestBean overrideBean() {
+				return new TestBean("override-l1");
+			}
+
+			@Component
+			protected static class L2ConfigLight {
+
 				@Bean
 				public TestBean l2Bean() {
 					return new TestBean("l2");
@@ -130,8 +207,22 @@ public TestBean overrideBean() {
 	}
 
 
+	@Component
+	static class L0ConfigEmpty {
+
+		@Component
+		static class L1ConfigEmpty {
+
+			@Component
+			protected static class L2ConfigEmpty {
+			}
+		}
+	}
+
+
 	@Configuration
 	static class S1Config extends L0Config {
+
 		@Override
 		@Bean
 		public TestBean overrideBean() {
@@ -139,4 +230,4 @@ public TestBean overrideBean() {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
index aaf2a82c18..2a82c94b96 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,29 +16,36 @@
 
 package org.springframework.context.annotation;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
+import java.io.FileNotFoundException;
 import java.util.Iterator;
-
 import javax.inject.Inject;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.FactoryBean;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MutablePropertySources;
-
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Tests the processing of @PropertySource annotations on @Configuration classes.
  *
  * @author Chris Beams
+ * @author Phillip Webb
  * @since 3.1
  */
 public class PropertySourceAnnotationTests {
 
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+
 	@Test
 	public void withExplicitName() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
@@ -93,7 +100,7 @@ public void orderingIsLifo() {
 		}
 	}
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void withUnresolvablePlaceholder() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(ConfigWithUnresolvablePlaceholder.class);
@@ -118,25 +125,51 @@ public void withResolvablePlaceholder() {
 		System.clearProperty("path.to.properties");
 	}
 
-	/**
-	 * Corner bug reported in SPR-9127.
-	 */
 	@Test
-	public void withNameAndMultipleResourceLocations() {
+	public void withResolvablePlaceholderAndFactoryBean() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		ctx.register(ConfigWithNameAndMultipleResourceLocations.class);
+		ctx.register(ConfigWithResolvablePlaceholderAndFactoryBean.class);
+		System.setProperty("path.to.properties", "org/springframework/context/annotation");
 		ctx.refresh();
-		assertThat(ctx.getEnvironment().containsProperty("from.p1"), is(true));
-		assertThat(ctx.getEnvironment().containsProperty("from.p2"), is(true));
+		assertThat(ctx.getBean(TestBean.class).getName(), equalTo("p1TestBean"));
+		System.clearProperty("path.to.properties");
 	}
 
-	@Test(expected=IllegalArgumentException.class)
+	@Test(expected = IllegalArgumentException.class)
 	public void withEmptyResourceLocations() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(ConfigWithEmptyResourceLocations.class);
 		ctx.refresh();
 	}
 
+	// SPR-10820
+	@Test
+	public void orderingWithAndWithoutNameAndMultipleResourceLocations() {
+		// p2 should 'win' as it was registered last
+		AnnotationConfigApplicationContext ctxWithName = new AnnotationConfigApplicationContext(ConfigWithNameAndMultipleResourceLocations.class);
+		AnnotationConfigApplicationContext ctxWithoutName = new AnnotationConfigApplicationContext(ConfigWithMultipleResourceLocations.class);
+		assertThat(ctxWithoutName.getEnvironment().getProperty("testbean.name"), equalTo("p2TestBean"));
+		assertThat(ctxWithName.getEnvironment().getProperty("testbean.name"), equalTo("p2TestBean"));
+	}
+
+	@Test
+	public void withNameAndMultipleResourceLocations() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ConfigWithNameAndMultipleResourceLocations.class);
+		assertThat(ctx.getEnvironment().containsProperty("from.p1"), is(true));
+		assertThat(ctx.getEnvironment().containsProperty("from.p2"), is(true));
+		// p2 should 'win' as it was registered last
+		assertThat(ctx.getEnvironment().getProperty("testbean.name"), equalTo("p2TestBean"));
+	}
+
+	@Test
+	public void withMultipleResourceLocations() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ConfigWithMultipleResourceLocations.class);
+		assertThat(ctx.getEnvironment().containsProperty("from.p1"), is(true));
+		assertThat(ctx.getEnvironment().containsProperty("from.p2"), is(true));
+		// p2 should 'win' as it was registered last
+		assertThat(ctx.getEnvironment().getProperty("testbean.name"), equalTo("p2TestBean"));
+	}
+
 
 	@Configuration
 	@PropertySource(value="classpath:${unresolvable}/p1.properties")
@@ -147,6 +180,7 @@ static class ConfigWithUnresolvablePlaceholder {
 	@Configuration
 	@PropertySource(value="classpath:${unresolvable:org/springframework/context/annotation}/p1.properties")
 	static class ConfigWithUnresolvablePlaceholderAndDefault {
+
 		@Inject Environment env;
 
 		@Bean
@@ -159,6 +193,7 @@ public TestBean testBean() {
 	@Configuration
 	@PropertySource(value="classpath:${path.to.properties}/p1.properties")
 	static class ConfigWithResolvablePlaceholder {
+
 		@Inject Environment env;
 
 		@Bean
@@ -168,10 +203,37 @@ public TestBean testBean() {
 	}
 
 
+	@Configuration
+	@PropertySource(value="classpath:${path.to.properties}/p1.properties")
+	static class ConfigWithResolvablePlaceholderAndFactoryBean {
+
+		@Inject Environment env;
+
+		@Bean
+		public FactoryBean testBean() {
+			final String name = env.getProperty("testbean.name");
+			return new FactoryBean() {
+				@Override
+				public Object getObject() {
+					return new TestBean(name);
+				}
+				@Override
+				public Class<?> getObjectType() {
+					return TestBean.class;
+				}
+				@Override
+				public boolean isSingleton() {
+					return false;
+				}
+			};
+		}
+	}
+
 
 	@Configuration
 	@PropertySource(name="p1", value="classpath:org/springframework/context/annotation/p1.properties")
 	static class ConfigWithExplicitName {
+
 		@Inject Environment env;
 
 		@Bean
@@ -184,6 +246,7 @@ public TestBean testBean() {
 	@Configuration
 	@PropertySource("classpath:org/springframework/context/annotation/p1.properties")
 	static class ConfigWithImplicitName {
+
 		@Inject Environment env;
 
 		@Bean
@@ -210,8 +273,19 @@ static class ConfigWithNameAndMultipleResourceLocations {
 	}
 
 
+	@Configuration
+	@PropertySource(
+			value = {
+					"classpath:org/springframework/context/annotation/p1.properties",
+					"classpath:org/springframework/context/annotation/p2.properties"
+			})
+	static class ConfigWithMultipleResourceLocations {
+	}
+
+
 	@Configuration
 	@PropertySource(value = {})
 	static class ConfigWithEmptyResourceLocations {
 	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/importing/ImportingConfig.java
similarity index 55%
rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/componentscan/importing/ImportingConfig.java
index 0ab3e04aaf..708b2ca2cd 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/componentscan/importing/ImportingConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,21 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.web.servlet.view.jasperreports;
+package org.springframework.context.annotation.componentscan.importing;
 
-/**
- * @author Rob Harrop
- */
-public class JasperReportsPdfViewTests extends AbstractJasperReportsViewTests {
-
-	@Override
-	protected AbstractJasperReportsView getViewImplementation() {
-		return new JasperReportsPdfView();
-	}
-
-	@Override
-	protected String getDesiredContentType() {
-		return "application/pdf";
-	}
+import org.springframework.context.annotation.ComponentScanAndImportAnnotationInteractionTests;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
+@Configuration
+@Import(ComponentScanAndImportAnnotationInteractionTests.ImportedConfig.class)
+public class ImportingConfig {
 }
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
index 45bea62180..91a9d488c2 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,24 +16,29 @@
 
 package org.springframework.context.annotation.configuration;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import javax.inject.Provider;
+
 import org.junit.Test;
-import org.springframework.tests.sample.beans.Colour;
-import org.springframework.tests.sample.beans.TestBean;
 
 import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.Colour;
+import org.springframework.tests.sample.beans.TestBean;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 /**
  * System tests covering use of {@link Autowired} and {@link Value} within
@@ -53,32 +58,11 @@ public void testAutowiredConfigurationDependencies() {
 		assertThat(factory.getBean("testBean", TestBean.class).getName(), equalTo(Colour.RED.toString()));
 	}
 
-	@Configuration
-	static class AutowiredConfig {
-		@Autowired
-		private Colour colour;
-
-		@Bean
-		public TestBean testBean() {
-			return new TestBean(colour.toString());
-		}
-	}
-
-	@Configuration
-	static class ColorConfig {
-
-		@Bean
-		public Colour colour() {
-			return Colour.RED;
-		}
-	}
-
-
 	/**
 	 * {@link Autowired} constructors are not supported on {@link Configuration} classes
 	 * due to CGLIB constraints
 	 */
-	@Test(expected=BeanCreationException.class)
+	@Test(expected = BeanCreationException.class)
 	public void testAutowiredConfigurationConstructorsAreNotSupported() {
 		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(
@@ -89,22 +73,35 @@ public void testAutowiredConfigurationConstructorsAreNotSupported() {
 		ctx.refresh(); // should throw
 	}
 
-	@Configuration
-	static class AutowiredConstructorConfig {
-		Colour colour;
+	@Test
+	public void testValueInjection() {
+		ClassPathXmlApplicationContext factory = new ClassPathXmlApplicationContext(
+				"ValueInjectionTests.xml", AutowiredConfigurationTests.class);
+		doTestValueInjection(factory);
+	}
 
-		@Autowired
-		AutowiredConstructorConfig(Colour colour) {
-			this.colour = colour;
-		}
+	@Test
+	public void testValueInjectionWithProviderFields() {
+		AnnotationConfigApplicationContext factory =
+				new AnnotationConfigApplicationContext(ValueConfigWithProviderFields.class);
+		doTestValueInjection(factory);
 	}
 
+	@Test
+	public void testValueInjectionWithProviderConstructorArguments() {
+		AnnotationConfigApplicationContext factory =
+				new AnnotationConfigApplicationContext(ValueConfigWithProviderConstructorArguments.class);
+		doTestValueInjection(factory);
+	}
 
 	@Test
-	public void testValueInjection() {
-		ClassPathXmlApplicationContext factory = new ClassPathXmlApplicationContext(
-				"ValueInjectionTests.xml", AutowiredConfigurationTests.class);
+	public void testValueInjectionWithProviderMethodArguments() {
+		AnnotationConfigApplicationContext factory =
+				new AnnotationConfigApplicationContext(ValueConfigWithProviderMethodArguments.class);
+		doTestValueInjection(factory);
+	}
 
+	private void doTestValueInjection(BeanFactory factory) {
 		System.clearProperty("myProp");
 
 		TestBean testBean = factory.getBean("testBean", TestBean.class);
@@ -130,6 +127,51 @@ public void testValueInjection() {
 		assertNull(testBean.getName());
 	}
 
+	@Test
+	public void testCustomProperties() {
+		ClassPathXmlApplicationContext factory = new ClassPathXmlApplicationContext(
+				"AutowiredConfigurationTests-custom.xml", AutowiredConfigurationTests.class);
+
+		TestBean testBean = factory.getBean("testBean", TestBean.class);
+		assertThat(testBean.getName(), equalTo("localhost"));
+	}
+
+
+	@Configuration
+	static class AutowiredConfig {
+
+		@Autowired
+		private Colour colour;
+
+		@Bean
+		public TestBean testBean() {
+			return new TestBean(colour.toString());
+		}
+	}
+
+
+	@Configuration
+	static class ColorConfig {
+
+		@Bean
+		public Colour colour() {
+			return Colour.RED;
+		}
+	}
+
+
+	@Configuration
+	static class AutowiredConstructorConfig {
+
+		Colour colour;
+
+		@Autowired
+		AutowiredConstructorConfig(Colour colour) {
+			this.colour = colour;
+		}
+	}
+
+
 	@Configuration
 	static class ValueConfig {
 
@@ -155,15 +197,71 @@ public TestBean testBean2() {
 	}
 
 
-	@Test
-	public void testCustomProperties() {
-		ClassPathXmlApplicationContext factory = new ClassPathXmlApplicationContext(
-				"AutowiredConfigurationTests-custom.xml", AutowiredConfigurationTests.class);
+	@Configuration
+	static class ValueConfigWithProviderFields {
 
-		TestBean testBean = factory.getBean("testBean", TestBean.class);
-		assertThat(testBean.getName(), equalTo("localhost"));
+		@Value("#{systemProperties[myProp]}")
+		private Provider<String> name;
+
+		private Provider<String> name2;
+
+		@Value("#{systemProperties[myProp]}")
+		public void setName2(Provider<String> name) {
+			this.name2 = name;
+		}
+
+		@Bean @Scope("prototype")
+		public TestBean testBean() {
+			return new TestBean(name.get());
+		}
+
+		@Bean @Scope("prototype")
+		public TestBean testBean2() {
+			return new TestBean(name2.get());
+		}
 	}
 
+
+	static class ValueConfigWithProviderConstructorArguments {
+
+		private final Provider<String> name;
+
+		private final Provider<String> name2;
+
+		@Autowired
+		public ValueConfigWithProviderConstructorArguments(@Value("#{systemProperties[myProp]}") Provider<String> name,
+				@Value("#{systemProperties[myProp]}") Provider<String> name2) {
+			this.name = name;
+			this.name2 = name2;
+		}
+
+		@Bean @Scope("prototype")
+		public TestBean testBean() {
+			return new TestBean(name.get());
+		}
+
+		@Bean @Scope("prototype")
+		public TestBean testBean2() {
+			return new TestBean(name2.get());
+		}
+	}
+
+
+	@Configuration
+	static class ValueConfigWithProviderMethodArguments {
+
+		@Bean @Scope("prototype")
+		public TestBean testBean(@Value("#{systemProperties[myProp]}") Provider<String> name) {
+			return new TestBean(name.get());
+		}
+
+		@Bean @Scope("prototype")
+		public TestBean testBean2(@Value("#{systemProperties[myProp]}") Provider<String> name2) {
+			return new TestBean(name2.get());
+		}
+	}
+
+
 	@Configuration
 	static class PropertiesConfig {
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanMethodQualificationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanMethodQualificationTests.java
index ba336cdb8f..748281ddbf 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanMethodQualificationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanMethodQualificationTests.java
@@ -20,15 +20,18 @@
 import java.lang.annotation.RetentionPolicy;
 
 import org.junit.Test;
-import org.springframework.tests.sample.beans.TestBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.stereotype.Component;
+import org.springframework.tests.sample.beans.TestBean;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -49,6 +52,27 @@ public void testStandard() {
 		assertFalse(ctx.getBeanFactory().containsSingleton("testBean1"));
 		StandardPojo pojo = ctx.getBean(StandardPojo.class);
 		assertThat(pojo.testBean.getName(), equalTo("interesting"));
+		assertThat(pojo.testBean2.getName(), equalTo("boring"));
+	}
+
+	@Test
+	public void testScoped() {
+		AnnotationConfigApplicationContext ctx =
+				new AnnotationConfigApplicationContext(ScopedConfig.class, StandardPojo.class);
+		assertFalse(ctx.getBeanFactory().containsSingleton("testBean1"));
+		StandardPojo pojo = ctx.getBean(StandardPojo.class);
+		assertThat(pojo.testBean.getName(), equalTo("interesting"));
+		assertThat(pojo.testBean2.getName(), equalTo("boring"));
+	}
+
+	@Test
+	public void testScopedProxy() {
+		AnnotationConfigApplicationContext ctx =
+				new AnnotationConfigApplicationContext(ScopedProxyConfig.class, StandardPojo.class);
+		assertTrue(ctx.getBeanFactory().containsSingleton("testBean1"));  // a shared scoped proxy
+		StandardPojo pojo = ctx.getBean(StandardPojo.class);
+		assertThat(pojo.testBean.getName(), equalTo("interesting"));
+		assertThat(pojo.testBean2.getName(), equalTo("boring"));
 	}
 
 	@Test
@@ -60,15 +84,57 @@ public void testCustom() {
 		assertThat(pojo.testBean.getName(), equalTo("interesting"));
 	}
 
+	@Test
+	public void testCustomWithAsm() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.registerBeanDefinition("customConfig", new RootBeanDefinition(CustomConfig.class.getName()));
+		RootBeanDefinition customPojo = new RootBeanDefinition(CustomPojo.class.getName());
+		customPojo.setLazyInit(true);
+		ctx.registerBeanDefinition("customPojo", customPojo);
+		ctx.refresh();
+		assertFalse(ctx.getBeanFactory().containsSingleton("testBean1"));
+		CustomPojo pojo = ctx.getBean(CustomPojo.class);
+		assertThat(pojo.testBean.getName(), equalTo("interesting"));
+	}
+
 
 	@Configuration
 	static class StandardConfig {
-		@Bean @Lazy @Qualifier("interesting")
+
+		@Bean @Qualifier("interesting") @Lazy
 		public TestBean testBean1() {
 			return new TestBean("interesting");
 		}
 
-		@Bean @Qualifier("boring")
+		@Bean @Boring
+		public TestBean testBean2() {
+			return new TestBean("boring");
+		}
+	}
+
+	@Configuration
+	static class ScopedConfig {
+
+		@Bean @Qualifier("interesting") @Scope("prototype")
+		public TestBean testBean1() {
+			return new TestBean("interesting");
+		}
+
+		@Bean @Boring @Scope("prototype")
+		public TestBean testBean2() {
+			return new TestBean("boring");
+		}
+	}
+
+	@Configuration
+	static class ScopedProxyConfig {
+
+		@Bean @Qualifier("interesting") @Scope(value="prototype", proxyMode=ScopedProxyMode.TARGET_CLASS)
+		public TestBean testBean1() {
+			return new TestBean("interesting");
+		}
+
+		@Bean @Boring @Scope(value="prototype", proxyMode=ScopedProxyMode.TARGET_CLASS)
 		public TestBean testBean2() {
 			return new TestBean("boring");
 		}
@@ -76,11 +142,20 @@ public TestBean testBean2() {
 
 	@Component @Lazy
 	static class StandardPojo {
+
 		@Autowired @Qualifier("interesting") TestBean testBean;
+
+		@Autowired @Boring TestBean testBean2;
+	}
+
+	@Qualifier
+	@Retention(RetentionPolicy.RUNTIME)
+	public @interface Boring {
 	}
 
 	@Configuration
 	static class CustomConfig {
+
 		@InterestingBean
 		public TestBean testBean1() {
 			return new TestBean("interesting");
@@ -94,6 +169,7 @@ public TestBean testBean2() {
 
 	@InterestingPojo
 	static class CustomPojo {
+
 		@InterestingNeed TestBean testBean;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java
index 6bb97b2a95..304c37ab16 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java
@@ -16,14 +16,17 @@
 
 package org.springframework.context.annotation.configuration;
 
+import java.util.Collections;
+
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
+
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
+
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.tests.sample.beans.TestBean;
-
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -34,6 +37,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.PropertySource;
 
 /**
  * Integration tests for {@link ImportResource} support.
@@ -178,4 +183,22 @@ public void testImportDifferentResourceTypes() {
 			reader=XmlBeanDefinitionReader.class)
 	static class SubResourceConfig extends ImportNonXmlResourceConfig {
 	}
+	
+	@Test
+	public void importWithPlaceHolder() throws Exception {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		PropertySource<?> propertySource = new MapPropertySource("test", 
+				Collections.<String, Object> singletonMap("test", "springframework"));
+		ctx.getEnvironment().getPropertySources().addFirst(propertySource);
+		ctx.register(ImportXmlConfig.class);
+		ctx.refresh();
+		assertTrue("did not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean"));
+	}
+
+	@Configuration
+	@ImportResource("classpath:org/${test}/context/annotation/configuration/ImportXmlConfig-context.xml")
+	static class ImportWithPlaceHolder {
+	}
+	
+	
 }
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
index e895a207c3..2bc75f1754 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
@@ -79,7 +79,7 @@ private void autowiredConfigClassBeanMethodsRespectScoping(Class<?>... configCla
 
 
 	@Test(expected=BeanDefinitionParsingException.class)
-	public void importingAnNonConfigurationClassCausesIllegalArgumentException() {
+	public void importingNonConfigurationClassCausesBeanDefinitionParsingException() {
 		new AnnotationConfigApplicationContext(ConfigThatImportsNonConfigClass.class);
 	}
 }
@@ -103,5 +103,5 @@ class ConfigThatDoesImport extends Config { }
 class ConfigThatDoesNotImport extends Config { }
 
 @Configuration
-@Import(Void.class)
+@Import(TestBean.class)
 class ConfigThatImportsNonConfigClass { }
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java
new file mode 100644
index 0000000000..ae8a6ce00f
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.configuration;
+
+import org.junit.Test;
+
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.ScopedProxyMode;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+/**
+ * @author Phillip Webb
+ */
+public class Spr10744Tests {
+
+	private static int createCount = 0;
+
+	private static int scopeCount = 0;
+
+
+	@Test
+	public void testSpr10744() throws Exception {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+		context.getBeanFactory().registerScope("myTestScope", new MyTestScope());
+		context.register(MyTestConfiguration.class);
+		context.refresh();
+
+		Foo bean1 = context.getBean("foo", Foo.class);
+		Foo bean2 = context.getBean("foo", Foo.class);
+		assertThat(bean1, sameInstance(bean2));
+
+		// Should have created a single instance for the proxy
+		assertThat(createCount, equalTo(1));
+		assertThat(scopeCount, equalTo(0));
+
+		// Proxy mode should create new scoped object on each method call
+		bean1.getMessage();
+		assertThat(createCount, equalTo(2));
+		assertThat(scopeCount, equalTo(1));
+		bean1.getMessage();
+		assertThat(createCount, equalTo(3));
+		assertThat(scopeCount, equalTo(2));
+
+		context.close();
+	}
+
+
+	private static class MyTestScope implements org.springframework.beans.factory.config.Scope {
+
+		@Override
+		public Object get(String name, ObjectFactory<?> objectFactory) {
+			scopeCount++;
+			return objectFactory.getObject();
+		}
+
+		@Override
+		public Object remove(String name) {
+			return null;
+		}
+
+		@Override
+		public void registerDestructionCallback(String name, Runnable callback) {
+		}
+
+		@Override
+		public Object resolveContextualObject(String key) {
+			return null;
+		}
+
+		@Override
+		public String getConversationId() {
+			return null;
+		}
+	}
+
+
+	static class Foo {
+
+		public Foo() {
+			createCount++;
+		}
+
+		public String getMessage() {
+			return "Hello";
+		}
+	}
+
+
+	@Configuration
+	static class MyConfiguration {
+
+		@Bean
+		public Foo foo() {
+			return new Foo();
+		}
+	}
+
+
+	@Configuration
+	static class MyTestConfiguration extends MyConfiguration {
+
+		@Bean
+		@Scope(value = "myTestScope",  proxyMode = ScopedProxyMode.TARGET_CLASS)
+		@Override
+		public Foo foo() {
+			return new Foo();
+		}
+	}
+
+}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr12526Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr12526Tests.java
new file mode 100644
index 0000000000..7c4982032a
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr12526Tests.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.configuration;
+
+import javax.annotation.Resource;
+
+import org.junit.Test;
+
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+
+import static org.junit.Assert.*;
+import static org.springframework.beans.factory.config.BeanDefinition.*;
+
+/**
+ * @author Marcin Piela
+ * @author Juergen Hoeller
+ */
+public class Spr12526Tests {
+
+	@Test
+	public void testInjection() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(TestContext.class);
+		CustomCondition condition = ctx.getBean(CustomCondition.class);
+
+		condition.setCondition(true);
+		FirstService firstService = (FirstService) ctx.getBean(Service.class);
+		assertNotNull("FirstService.dependency is null", firstService.getDependency());
+
+		condition.setCondition(false);
+		SecondService secondService = (SecondService) ctx.getBean(Service.class);
+		assertNotNull("SecondService.dependency is null", secondService.getDependency());
+	}
+
+
+	@Configuration
+	public static class TestContext {
+
+		@Bean
+		@Scope(SCOPE_SINGLETON)
+		public CustomCondition condition() {
+			return new CustomCondition();
+		}
+
+
+		@Bean
+		@Scope(SCOPE_PROTOTYPE)
+		public Service service(CustomCondition condition) {
+			return (condition.check() ? new FirstService() : new SecondService());
+		}
+
+		@Bean
+		public DependencyOne dependencyOne() {
+			return new DependencyOne();
+		}
+
+
+		@Bean
+		public DependencyTwo dependencyTwo() {
+			return new DependencyTwo();
+		}
+	}
+
+
+	public static class CustomCondition {
+
+		private boolean condition;
+
+		public boolean check() {
+			return condition;
+		}
+
+		public void setCondition(boolean value) {
+			this.condition = value;
+		}
+	}
+
+
+	public interface Service {
+
+		void doStuff();
+	}
+
+
+	public static class FirstService implements Service {
+
+		private DependencyOne dependency;
+
+
+		@Override
+		public void doStuff() {
+			if (dependency == null) {
+				throw new IllegalStateException("FirstService: dependency is null");
+			}
+		}
+
+		@Resource(name = "dependencyOne")
+		public void setDependency(DependencyOne dependency) {
+			this.dependency = dependency;
+		}
+
+
+		public DependencyOne getDependency() {
+			return dependency;
+		}
+	}
+
+
+	public static class SecondService implements Service {
+
+		private DependencyTwo dependency;
+
+		@Override
+		public void doStuff() {
+			if (dependency == null) {
+				throw new IllegalStateException("SecondService: dependency is null");
+			}
+		}
+
+		@Resource(name = "dependencyTwo")
+		public void setDependency(DependencyTwo dependency) {
+			this.dependency = dependency;
+		}
+
+
+		public DependencyTwo getDependency() {
+			return dependency;
+		}
+	}
+
+
+	public static class DependencyOne {
+	}
+
+
+	public static class DependencyTwo {
+	}
+
+}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ImportedConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ImportedConfig.java
new file mode 100644
index 0000000000..f20e79eb7e
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ImportedConfig.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.spr10546;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+/**
+ *
+ * @author Rob Winch
+ */
+@Configuration
+public class ImportedConfig {
+	@Bean
+	public String myBean() {
+		return "myBean";
+	}
+}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentConfig.java
similarity index 52%
rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java
rename to spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentConfig.java
index 4b3b6f0cd6..884622e22d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentConfig.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.springframework.web.servlet.view.jasperreports;
+package org.springframework.context.annotation.spr10546;
 
-/**
- * @author Rob Harrop
- */
-public class JasperReportsXlsViewTests extends AbstractJasperReportsViewTests {
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
-	@Override
-	protected AbstractJasperReportsView getViewImplementation() {
-		return new JasperReportsXlsView();
-	}
 
-	@Override
-	protected String getDesiredContentType() {
-		return "application/vnd.ms-excel";
+/**
+ *
+ * @author Rob Winch
+ */
+@Configuration
+public class ParentConfig {
+	@Bean
+	public String myBean() {
+		return "myBean";
 	}
-
 }
+
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithComponentScanConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithComponentScanConfig.java
new file mode 100644
index 0000000000..bd6c7b4977
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithComponentScanConfig.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.spr10546;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.spr10546.scanpackage.AEnclosingConfig;
+
+
+/**
+ *
+ * @author Rob Winch
+ */
+@Configuration
+@ComponentScan(basePackageClasses=AEnclosingConfig.class)
+public class ParentWithComponentScanConfig {
+
+}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportConfig.java
new file mode 100644
index 0000000000..450d13fbad
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportConfig.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.spr10546;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+
+/**
+ *
+ * @author Rob Winch
+ */
+@Configuration
+@Import(ImportedConfig.class)
+public class ParentWithImportConfig {
+
+}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportResourceConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportResourceConfig.java
new file mode 100644
index 0000000000..e05f4134ec
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithImportResourceConfig.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.spr10546;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+
+
+/**
+ *
+ * @author Rob Winch
+ */
+@Configuration
+@ImportResource("classpath:org/springframework/context/annotation/spr10546/importedResource.xml")
+public class ParentWithImportResourceConfig {
+
+}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithParentConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithParentConfig.java
new file mode 100644
index 0000000000..dcaaa3b5b2
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/ParentWithParentConfig.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.spr10546;
+
+import org.springframework.context.annotation.Configuration;
+
+
+/**
+ *
+ * @author Rob Winch
+ */
+@Configuration
+public class ParentWithParentConfig extends ParentConfig {
+
+}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/Spr10546Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/Spr10546Tests.java
new file mode 100644
index 0000000000..59dac470a2
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/Spr10546Tests.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.spr10546;
+
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.spr10546.scanpackage.AEnclosingConfig;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+
+/**
+ *
+ * @author Rob Winch
+ */
+public class Spr10546Tests {
+	private ConfigurableApplicationContext context;
+
+	@After
+	public void closeContext() {
+		if(context != null) {
+			context.close();
+		}
+	}
+
+	// These fail prior to fixing SPR-10546
+
+	@Test
+	public void enclosingConfigFirstParentDefinesBean() {
+		assertLoadsMyBean(AEnclosingConfig.class,AEnclosingConfig.ChildConfig.class);
+	}
+
+	/**
+	 * Prior to fixing SPR-10546 this might have succeeded depending on the ordering the
+	 * classes were picked up. If they are picked up in the same order as
+	 * {@link #enclosingConfigFirstParentDefinesBean()} then it would fail. This test is
+	 * mostly for illustration purposes, but doesn't hurt to continue using it.
+	 *
+	 * <p>We purposely use the {@link AEnclosingConfig} to make it alphabetically prior to the
+	 * {@link AEnclosingConfig.ChildConfig} which encourages this to occur with the
+	 * classpath scanning implementation being used by the author of this test.
+	 */
+	@Test
+	public void enclosingConfigFirstParentDefinesBeanWithScanning() {
+		AnnotationConfigApplicationContext ctx= new AnnotationConfigApplicationContext();
+		context = ctx;
+		ctx.scan(AEnclosingConfig.class.getPackage().getName());
+		ctx.refresh();
+		assertThat(context.getBean("myBean",String.class), equalTo("myBean"));
+	}
+
+	@Test
+	public void enclosingConfigFirstParentDefinesBeanWithImportResource() {
+		assertLoadsMyBean(AEnclosingWithImportResourceConfig.class,AEnclosingWithImportResourceConfig.ChildConfig.class);
+	}
+
+	@Configuration
+	static class AEnclosingWithImportResourceConfig {
+		@Configuration
+		public static class ChildConfig extends ParentWithImportResourceConfig {}
+	}
+
+	@Test
+	public void enclosingConfigFirstParentDefinesBeanWithComponentScan() {
+		assertLoadsMyBean(AEnclosingWithComponentScanConfig.class,AEnclosingWithComponentScanConfig.ChildConfig.class);
+	}
+
+	@Configuration
+	static class AEnclosingWithComponentScanConfig {
+		@Configuration
+		public static class ChildConfig extends ParentWithComponentScanConfig {}
+	}
+
+	@Test
+	public void enclosingConfigFirstParentWithParentDefinesBean() {
+		assertLoadsMyBean(AEnclosingWithGrandparentConfig.class,AEnclosingWithGrandparentConfig.ChildConfig.class);
+	}
+
+	@Configuration
+	static class AEnclosingWithGrandparentConfig {
+		@Configuration
+		public static class ChildConfig extends ParentWithParentConfig {}
+	}
+
+	@Test
+	public void importChildConfigThenChildConfig() {
+		assertLoadsMyBean(ImportChildConfig.class,ChildConfig.class);
+	}
+
+	@Configuration
+	static class ChildConfig extends ParentConfig {}
+
+	@Configuration
+	@Import(ChildConfig.class)
+	static class ImportChildConfig {}
+
+
+	// These worked prior, but validating they continue to work
+
+	@Test
+	public void enclosingConfigFirstParentDefinesBeanWithImport() {
+		assertLoadsMyBean(AEnclosingWithImportConfig.class,AEnclosingWithImportConfig.ChildConfig.class);
+	}
+
+	@Configuration
+	static class AEnclosingWithImportConfig {
+		@Configuration
+		public static class ChildConfig extends ParentWithImportConfig {}
+	}
+
+	@Test
+	public void childConfigFirst() {
+		assertLoadsMyBean(AEnclosingConfig.ChildConfig.class, AEnclosingConfig.class);
+	}
+
+	@Test
+	public void enclosingConfigOnly() {
+		assertLoadsMyBean(AEnclosingConfig.class);
+	}
+
+	@Test
+	public void childConfigOnly() {
+		assertLoadsMyBean(AEnclosingConfig.ChildConfig.class);
+	}
+
+	private void assertLoadsMyBean(Class<?>... annotatedClasses) {
+		context = new AnnotationConfigApplicationContext(annotatedClasses);
+		assertThat(context.getBean("myBean",String.class), equalTo("myBean"));
+	}
+}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/importedResource.xml b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/importedResource.xml
new file mode 100644
index 0000000000..6ce3074b51
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/importedResource.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:c="http://www.springframework.org/schema/c"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<bean id="myBean" class="java.lang.String" c:_0="myBean"/>
+</beans>
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/scanpackage/AEnclosingConfig.java b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/scanpackage/AEnclosingConfig.java
new file mode 100644
index 0000000000..3c8c091222
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr10546/scanpackage/AEnclosingConfig.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.spr10546.scanpackage;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.spr10546.ParentConfig;
+
+
+/**
+ * Note the name of {@link AEnclosingConfig} is chosen to help ensure scanning picks up
+ * the enclosing configuration prior to {@link ChildConfig} to demonstrate this can happen
+ * with classpath scanning.
+ *
+ * @author Rob Winch
+ */
+@Configuration
+public class AEnclosingConfig {
+	@Configuration
+	public static class ChildConfig extends ParentConfig {}
+}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr12334/Spr12334Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/spr12334/Spr12334Tests.java
new file mode 100644
index 0000000000..c98fc07738
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr12334/Spr12334Tests.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation.spr12334;
+
+import org.junit.Test;
+
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.core.type.AnnotationMetadata;
+
+/**
+ * @author Juergen Hoeller
+ * @author Alex Pogrebnyak
+ */
+public class Spr12334Tests {
+
+	@Test
+	public void shouldNotScanTwice() {
+		TestImport.scanned = false;
+
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+		context.scan(TestImport.class.getPackage().getName());
+		context.refresh();
+		context.getBean(TestConfiguration.class);
+	}
+
+
+	@Import(TestImport.class)
+	public @interface AnotherImport {
+	}
+
+
+	@Configuration
+	@AnotherImport
+	public static class TestConfiguration {
+	}
+
+
+	public static class TestImport implements ImportBeanDefinitionRegistrar {
+
+		private static boolean scanned = false;
+
+		@Override
+		public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry)  {
+			if (scanned) {
+				throw new IllegalStateException("Already scanned");
+			}
+			scanned = true;
+		}
+	}
+
+}
diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
index 17176f9dcd..377a6909ae 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.junit.Assert.*;
 import org.junit.Test;
 
-import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -38,13 +36,16 @@
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.tests.Assume;
-import org.springframework.tests.TestGroup;
 import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 import org.springframework.util.StopWatch;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Juergen Hoeller
  * @since 3.0
@@ -150,6 +151,7 @@ public String getConversationId() {
 			ValueTestBean tb3 = ac.getBean("tb3", ValueTestBean.class);
 			assertEquals("XXXmyNameYYY42ZZZ", tb3.name);
 			assertEquals(42, tb3.age);
+			assertEquals(42, tb3.ageFactory.getObject().intValue());
 			assertEquals("123 UK", tb3.country);
 			assertEquals("123 UK", tb3.countryFactory.getObject());
 			System.getProperties().put("country", "US");
@@ -310,6 +312,9 @@ public static class ValueTestBean implements Serializable {
 		@Autowired @Value("#{mySpecialAttr}")
 		public int age;
 
+		@Value("#{mySpecialAttr}")
+		public ObjectFactory<Integer> ageFactory;
+
 		@Value("${code} #{systemProperties.country}")
 		public String country;
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java
index 4264739283..7f202aa473 100644
--- a/spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,6 @@
 
 package org.springframework.context.support;
 
-import static java.lang.String.format;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
 import java.security.AccessControlException;
 import java.security.Permission;
 import java.util.Map;
@@ -35,6 +31,9 @@
 import org.springframework.core.env.StandardEnvironmentTests;
 import org.springframework.stereotype.Component;
 
+import static java.lang.String.format;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 /**
  * Tests integration between Environment and SecurityManagers. See SPR-9970.
@@ -44,8 +43,10 @@
 public class EnvironmentSecurityManagerIntegrationTests {
 
 	private SecurityManager originalSecurityManager;
+
 	private Map<String, String> env;
 
+
 	@Before
 	public void setUp() {
 		originalSecurityManager = System.getSecurityManager();
@@ -59,16 +60,16 @@ public void tearDown() {
 		System.setSecurityManager(originalSecurityManager);
 	}
 
+
 	@Test
 	public void securityManagerDisallowsAccessToSystemEnvironmentButAllowsAccessToIndividualKeys() {
 		SecurityManager securityManager = new SecurityManager() {
 			@Override
 			public void checkPermission(Permission perm) {
-				// disallowing access to System#getenv means that our
+				// Disallowing access to System#getenv means that our
 				// ReadOnlySystemAttributesMap will come into play.
 				if ("getenv.*".equals(perm.getName())) {
-					throw new AccessControlException(
-							"Accessing the system environment is disallowed");
+					throw new AccessControlException("Accessing the system environment is disallowed");
 				}
 			}
 		};
@@ -85,18 +86,17 @@ public void securityManagerDisallowsAccessToSystemEnvironmentAndDisallowsAccessT
 		SecurityManager securityManager = new SecurityManager() {
 			@Override
 			public void checkPermission(Permission perm) {
-				// disallowing access to System#getenv means that our
+				// Disallowing access to System#getenv means that our
 				// ReadOnlySystemAttributesMap will come into play.
 				if ("getenv.*".equals(perm.getName())) {
-					throw new AccessControlException(
-							"Accessing the system environment is disallowed");
+					throw new AccessControlException("Accessing the system environment is disallowed");
 				}
-				// disallowing access to the spring.profiles.active property means that
+				// Disallowing access to the spring.profiles.active property means that
 				// the BeanDefinitionReader won't be able to determine which profiles are
 				// active. We should see an INFO-level message in the console about this
 				// and as a result, any components marked with a non-default profile will
 				// be ignored.
-				if (("getenv."+AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME).equals(perm.getName())) {
+				if (("getenv." + AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME).equals(perm.getName())) {
 					throw new AccessControlException(
 							format("Accessing system environment variable [%s] is disallowed",
 									AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME));
@@ -111,8 +111,10 @@ public void checkPermission(Permission perm) {
 		assertThat(bf.containsBean("c1"), is(false));
 	}
 
+
 	@Component("c1")
 	@Profile("p1")
 	static class C1 {
 	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
index 8587ff38ce..abfd80b9bb 100644
--- a/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,11 @@
 
 import org.junit.Test;
 
+import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Juergen Hoeller
@@ -28,9 +32,27 @@ public class GenericApplicationContextTests {
 
 	@Test
 	public void nullBeanRegistration() {
-			DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
-			bf.registerSingleton("nullBean", null);
-			new GenericApplicationContext(bf).refresh();
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.registerSingleton("nullBean", null);
+		new GenericApplicationContext(bf).refresh();
+	}
+
+	@Test
+	public void getBeanForClass() {
+		GenericApplicationContext ac = new GenericApplicationContext();
+		ac.registerBeanDefinition("testBean", new RootBeanDefinition(String.class));
+		ac.refresh();
+
+		assertSame(ac.getBean("testBean"), ac.getBean(String.class));
+		assertSame(ac.getBean("testBean"), ac.getBean(CharSequence.class));
+
+		try {
+			assertSame(ac.getBean("testBean"), ac.getBean(Object.class));
+			fail("Should have thrown NoUniqueBeanDefinitionException");
+		}
+		catch (NoUniqueBeanDefinitionException ex) {
+			// expected
+		}
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
index 24185526d6..cb85d50d51 100644
--- a/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
@@ -153,6 +153,25 @@ public void testPropertyPlaceholderConfigurerWithNestedCircularReference() {
 		}
 	}
 
+	@Test
+	public void testPropertyPlaceholderConfigurerWithNestedUnresolvableReference() {
+		StaticApplicationContext ac = new StaticApplicationContext();
+		MutablePropertyValues pvs = new MutablePropertyValues();
+		pvs.add("name", "name${var}");
+		ac.registerSingleton("tb1", TestBean.class, pvs);
+		pvs = new MutablePropertyValues();
+		pvs.add("properties", "var=${m}var\nm=${var2}\nvar2=${m2}");
+		ac.registerSingleton("configurer1", PropertyPlaceholderConfigurer.class, pvs);
+		try {
+			ac.refresh();
+			fail("Should have thrown BeanDefinitionStoreException");
+		}
+		catch (BeanDefinitionStoreException ex) {
+			// expected
+			ex.printStackTrace();
+		}
+	}
+
 	@Ignore // this test was breaking after the 3.0 repackaging
 	@Test
 	public void testPropertyPlaceholderConfigurerWithAutowireByType() {
diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
index 078b116979..cd13a38e16 100644
--- a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
@@ -39,8 +39,6 @@
 import org.springframework.tests.sample.beans.TestBean;
 
 /**
- * Unit tests for {@link PropertySourcesPlaceholderConfigurer}.
- *
  * @author Chris Beams
  * @since 3.1
  */
@@ -139,7 +137,9 @@ public void explicitPropertySourcesExcludesLocalProperties() {
 
 		PropertySourcesPlaceholderConfigurer pc = new PropertySourcesPlaceholderConfigurer();
 		pc.setPropertySources(propertySources);
-		pc.setProperties(new Properties() {{ put("my.name", "local"); }});
+		pc.setProperties(new Properties() {{
+			put("my.name", "local");
+		}});
 		pc.setIgnoreUnresolvablePlaceholders(true);
 		pc.postProcessBeanFactory(bf);
 		assertThat(bf.getBean(TestBean.class).getName(), equalTo("${my.name}"));
@@ -172,6 +172,38 @@ public void ignoreUnresolvablePlaceholders_true() {
 		assertThat(bf.getBean(TestBean.class).getName(), equalTo("${my.name}"));
 	}
 
+	@Test(expected=BeanDefinitionStoreException.class)
+	public void nestedUnresolvablePlaceholder() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.registerBeanDefinition("testBean",
+				genericBeanDefinition(TestBean.class)
+						.addPropertyValue("name", "${my.name}")
+						.getBeanDefinition());
+
+		PropertySourcesPlaceholderConfigurer pc = new PropertySourcesPlaceholderConfigurer();
+		pc.setProperties(new Properties() {{
+			put("my.name", "${bogus}");
+		}});
+		pc.postProcessBeanFactory(bf); // should throw
+	}
+
+	@Test
+	public void ignoredNestedUnresolvablePlaceholder() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.registerBeanDefinition("testBean",
+				genericBeanDefinition(TestBean.class)
+						.addPropertyValue("name", "${my.name}")
+						.getBeanDefinition());
+
+		PropertySourcesPlaceholderConfigurer pc = new PropertySourcesPlaceholderConfigurer();
+		pc.setProperties(new Properties() {{
+			put("my.name", "${bogus}");
+		}});
+		pc.setIgnoreUnresolvablePlaceholders(true);
+		pc.postProcessBeanFactory(bf);
+		assertThat(bf.getBean(TestBean.class).getName(), equalTo("${bogus}"));
+	}
+
 	@Test
 	public void withNonEnumerablePropertySource() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
@@ -213,7 +245,8 @@ private void localPropertiesOverride(boolean override) {
 		ppc.postProcessBeanFactory(bf);
 		if (override) {
 			assertThat(bf.getBean(TestBean.class).getName(), equalTo("local"));
-		} else {
+		}
+		else {
 			assertThat(bf.getBean(TestBean.class).getName(), equalTo("enclosing"));
 		}
 	}
diff --git a/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java
index 54be0f128f..232de5bb76 100644
--- a/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java
@@ -26,8 +26,6 @@
 import org.junit.Test;
 
 /**
- * Tests for {@link DateTimeFormatterFactoryBean}.
- *
  * @author Phillip Webb
  * @author Sam Brannen
  */
@@ -60,4 +58,5 @@ public void getObjectIsAlwaysSingleton() throws Exception {
 		factory.setStyle("LL");
 		assertThat(factory.getObject(), is(sameInstance(formatter)));
 	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java b/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java
index 4ac9421cf9..0e960cb5d3 100644
--- a/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java
@@ -30,8 +30,6 @@
 import org.springframework.format.annotation.DateTimeFormat.ISO;
 
 /**
- * Tests for {@link DateTimeFormatterFactory}.
- *
  * @author Phillip Webb
  * @author Sam Brannen
  */
@@ -100,4 +98,5 @@ public void createDateTimeFormatterWithTimeZone() throws Exception {
 	private DateTimeFormatter applyLocale(DateTimeFormatter dateTimeFormatter) {
 		return dateTimeFormatter.withLocale(Locale.US);
 	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java b/spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
index c2aaf8d36a..6cfbd538e4 100644
--- a/spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
+++ b/spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
@@ -16,11 +16,6 @@
 
 package org.springframework.format.datetime.joda;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -37,6 +32,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.core.convert.TypeDescriptor;
@@ -46,6 +42,9 @@
 import org.springframework.format.support.FormattingConversionService;
 import org.springframework.validation.DataBinder;
 
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
 /**
  * @author Keith Donald
  * @author Juergen Hoeller
@@ -116,7 +115,7 @@ public void testBindLocalDateWithSpecificStyle() throws Exception {
 	}
 
 	@Test
-	public void testBindLocalDateWithSpecifcFormatter() throws Exception {
+	public void testBindLocalDateWithSpecificFormatter() throws Exception {
 		JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar();
 		registrar.setDateFormatter(org.joda.time.format.DateTimeFormat.forPattern("yyyyMMdd"));
 		setUp(registrar);
@@ -236,21 +235,10 @@ public void testBindLocalDateTime() {
 	@Test
 	public void testBindLocalDateTimeAnnotated() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDateTimeAnnotated", "Saturday, October 31, 2009 12:00:00 PM ");
+		propertyValues.add("localDateTimeAnnotated", "Oct 31, 2009 12:00 PM");
 		binder.bind(propertyValues);
 		assertEquals(0, binder.getBindingResult().getErrorCount());
-		assertEquals("Saturday, October 31, 2009 12:00:00 PM ", binder.getBindingResult().getFieldValue(
-				"localDateTimeAnnotated"));
-	}
-
-	@Test
-	public void testBindLocalDateTimeAnnotatedLong() {
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDateTimeAnnotatedLong", "October 31, 2009 12:00:00 PM ");
-		binder.bind(propertyValues);
-		assertEquals(0, binder.getBindingResult().getErrorCount());
-		assertEquals("October 31, 2009 12:00:00 PM ", binder.getBindingResult().getFieldValue(
-				"localDateTimeAnnotatedLong"));
+		assertEquals("Oct 31, 2009 12:00 PM", binder.getBindingResult().getFieldValue("localDateTimeAnnotated"));
 	}
 
 	@Test
@@ -510,12 +498,9 @@ private static class JodaTimeBean {
 
 		private LocalDateTime localDateTime;
 
-		@DateTimeFormat(style="FF")
+		@DateTimeFormat(style="MS")
 		private LocalDateTime localDateTimeAnnotated;
 
-		@DateTimeFormat(style="LL")
-		private LocalDateTime localDateTimeAnnotatedLong;
-
 		private DateTime dateTime;
 
 		@DateTimeFormat(style="MS")
@@ -612,14 +597,6 @@ public void setLocalDateTimeAnnotated(LocalDateTime localDateTimeAnnotated) {
 			this.localDateTimeAnnotated = localDateTimeAnnotated;
 		}
 
-		public LocalDateTime getLocalDateTimeAnnotatedLong() {
-			return localDateTimeAnnotatedLong;
-		}
-
-		public void setLocalDateTimeAnnotatedLong(LocalDateTime localDateTimeAnnotatedLong) {
-			this.localDateTimeAnnotatedLong = localDateTimeAnnotatedLong;
-		}
-
 		public DateTime getDateTime() {
 			return dateTime;
 		}
diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
index 417ded1a45..a2930e3e7e 100644
--- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
+++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -306,6 +306,28 @@ public Date convert(MyDate source) {
 				TypeDescriptor.valueOf(String.class));
 	}
 
+	@Test
+	public void testRegisterDefaultValueViaFormatter() {
+		registerDefaultValue(Date.class, new Date());
+	}
+
+	private <T> void registerDefaultValue(Class<T> clazz, final T defaultValue) {
+		formattingService.addFormatterForFieldType(clazz, new Formatter<T>() {
+			@Override
+			public T parse(String text, Locale locale) throws ParseException {
+				return defaultValue;
+			}
+			@Override
+			public String print(T t, Locale locale) {
+				return defaultValue.toString();
+			}
+			@Override
+			public String toString() {
+				return defaultValue.toString();
+			}
+		});
+	}
+
 
 	public static class ValueBean {
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
index ab05a3ea6e..eabd8c0524 100644
--- a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
@@ -51,12 +52,14 @@ public abstract class AbstractMBeanServerTests {
 
 	protected MBeanServer server;
 
+
 	@Before
 	public final void setUp() throws Exception {
 		this.server = MBeanServerFactory.createMBeanServer();
 		try {
 			onSetUp();
-		} catch (Exception ex) {
+		}
+		catch (Exception ex) {
 			releaseServer();
 			throw ex;
 		}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java
index f2bee32668..64981ffa38 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
 import javax.management.modelmbean.ModelMBeanInfo;
 import javax.management.modelmbean.ModelMBeanInfoSupport;
 
+import org.junit.Test;
+
 import org.springframework.jmx.AbstractMBeanServerTests;
 import org.springframework.jmx.JmxTestBean;
 import org.springframework.jmx.export.naming.ObjectNamingStrategy;
@@ -36,6 +38,7 @@
  */
 public class MBeanExporterOperationsTests extends AbstractMBeanServerTests {
 
+	@Test
 	public void testRegisterManagedResourceWithUserSuppliedObjectName() throws Exception {
 		ObjectName objectName = ObjectNameManager.getInstance("spring:name=Foo");
 
@@ -50,6 +53,7 @@ public void testRegisterManagedResourceWithUserSuppliedObjectName() throws Excep
 		assertEquals("Incorrect name on MBean", name, bean.getName());
 	}
 
+	@Test
 	public void testRegisterExistingMBeanWithUserSuppliedObjectName() throws Exception {
 		ObjectName objectName = ObjectNameManager.getInstance("spring:name=Foo");
 		ModelMBeanInfo info = new ModelMBeanInfoSupport("myClass", "myDescription", null, null, null, null);
@@ -63,6 +67,7 @@ public void testRegisterExistingMBeanWithUserSuppliedObjectName() throws Excepti
 		assertEquals(info, infoFromServer);
 	}
 
+	@Test
 	public void testRegisterManagedResourceWithGeneratedObjectName() throws Exception {
 		final ObjectName objectNameTemplate = ObjectNameManager.getInstance("spring:type=Test");
 
@@ -88,6 +93,7 @@ public ObjectName getObjectName(Object managedBean, String beanKey) {
 		assertObjectNameMatchesTemplate(objectNameTemplate, reg2);
 	}
 
+	@Test
 	public void testRegisterManagedResourceWithGeneratedObjectNameWithoutUniqueness() throws Exception {
 		final ObjectName objectNameTemplate = ObjectNameManager.getInstance("spring:type=Test");
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
index c08a9f73b2..f7ac16cf8e 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.management.Attribute;
 import javax.management.InstanceNotFoundException;
 import javax.management.JMException;
@@ -34,9 +33,12 @@
 import javax.management.modelmbean.ModelMBeanInfo;
 
 import org.junit.Test;
+
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.jmx.AbstractMBeanServerTests;
@@ -68,25 +70,10 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 
 	private static final String OBJECT_NAME = "spring:test=jmxMBeanAdaptor";
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Test
-	public void testRegisterNonNotificationListenerType() throws Exception {
-		Map listeners = new HashMap();
-		// put a non-NotificationListener instance in as a value...
-		listeners.put("*", this);
-		MBeanExporter exporter = new MBeanExporter();
-		try {
-			exporter.setNotificationListenerMappings(listeners);
-			fail("Must have thrown a ClassCastException when registering a non-NotificationListener instance as a NotificationListener.");
-		}
-		catch (ClassCastException expected) {
-		}
-	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Test
 	public void testRegisterNullNotificationListenerType() throws Exception {
-		Map listeners = new HashMap();
+		Map<String, NotificationListener> listeners = new HashMap<String, NotificationListener>();
 		// put null in as a value...
 		listeners.put("*", null);
 		MBeanExporter exporter = new MBeanExporter();
@@ -98,10 +85,9 @@ public void testRegisterNullNotificationListenerType() throws Exception {
 		}
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Test
 	public void testRegisterNotificationListenerForNonExistentMBean() throws Exception {
-		Map listeners = new HashMap();
+		Map<String, NotificationListener> listeners = new HashMap<String, NotificationListener>();
 		NotificationListener dummyListener = new NotificationListener() {
 			@Override
 			public void handleNotification(Notification notification, Object handback) {
@@ -175,7 +161,8 @@ public void testAutodetectMBeans() throws Exception {
 			assertNotNull(instance);
 			instance = server.getObjectInstance(ObjectNameManager.getInstance("spring:mbean3=true"));
 			assertNotNull(instance);
-		} finally {
+		}
+		finally {
 			bf.destroySingletons();
 		}
 	}
@@ -193,9 +180,11 @@ public void testAutodetectWithExclude() throws Exception {
 			try {
 				server.getObjectInstance(ObjectNameManager.getInstance("spring:mbean=false"));
 				fail("MBean with name spring:mbean=false should have been excluded");
-			} catch (InstanceNotFoundException expected) {
 			}
-		} finally {
+			catch (InstanceNotFoundException expected) {
+			}
+		}
+		finally {
 			bf.destroySingletons();
 		}
 	}
@@ -217,7 +206,8 @@ public void testAutodetectLazyMBeans() throws Exception {
 			assertNotNull(server.getObjectInstance(oname));
 			name = (String) server.getAttribute(oname, "Name");
 			assertEquals("Invalid name returned", "Juergen Hoeller", name);
-		} finally {
+		}
+		finally {
 			bf.destroySingletons();
 		}
 	}
@@ -228,7 +218,8 @@ public void testAutodetectNoMBeans() throws Exception {
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource("autodetectNoMBeans.xml", getClass()));
 		try {
 			bf.getBean("exporter");
-		} finally {
+		}
+		finally {
 			bf.destroySingletons();
 		}
 	}
@@ -241,7 +232,7 @@ public void testWithMBeanExporterListeners() throws Exception {
 		MBeanExporter exporter = new MBeanExporter();
 		exporter.setBeans(getBeanMap());
 		exporter.setServer(server);
-		exporter.setListeners(new MBeanExporterListener[] { listener1, listener2 });
+		exporter.setListeners(listener1, listener2);
 		exporter.afterPropertiesSet();
 		exporter.destroy();
 
@@ -257,7 +248,7 @@ public void testExportJdkProxy() throws Exception {
 		ProxyFactory factory = new ProxyFactory();
 		factory.setTarget(bean);
 		factory.addAdvice(new NopInterceptor());
-		factory.setInterfaces(new Class<?>[] { IJmxTestBean.class });
+		factory.setInterfaces(IJmxTestBean.class);
 
 		IJmxTestBean proxy = (IJmxTestBean) factory.getProxy();
 		String name = "bean:mmm=whatever";
@@ -377,8 +368,8 @@ public void testWithExposeClassLoader() throws Exception {
 
 		assertIsRegistered("Bean instance not registered", objectName);
 
-		Object result = server.invoke(objectName, "add", new Object[] { new Integer(2), new Integer(3) }, new String[] {
-				int.class.getName(), int.class.getName() });
+		Object result = server.invoke(objectName, "add", new Object[] {new Integer(2), new Integer(3)}, new String[] {
+				int.class.getName(), int.class.getName()});
 
 		assertEquals("Incorrect result return from add", result, new Integer(5));
 		assertEquals("Incorrect attribute value", name, server.getAttribute(objectName, "Name"));
@@ -593,7 +584,7 @@ public void testMBeanIsNotUnregisteredSpuriouslyIfSomeExternalProcessHasUnregist
 		exporter.setBeans(getBeanMap());
 		exporter.setServer(this.server);
 		MockMBeanExporterListener listener = new MockMBeanExporterListener();
-		exporter.setListeners(new MBeanExporterListener[] { listener });
+		exporter.setListeners(listener);
 		exporter.afterPropertiesSet();
 		assertIsRegistered("The bean was not registered with the MBeanServer",
 				ObjectNameManager.getInstance(OBJECT_NAME));
@@ -688,6 +679,37 @@ public void testMBeanIsUnregisteredForRuntimeExceptionDuringInitialization() thr
 				ObjectNameManager.getInstance(objectName2));
 	}
 
+	@Test
+	public void testRegisterFactoryBean() throws MalformedObjectNameException {
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerBeanDefinition("spring:type=FactoryBean", new RootBeanDefinition(ProperSomethingFactoryBean.class));
+
+		MBeanExporter exporter = new MBeanExporter();
+		exporter.setServer(getServer());
+		exporter.setBeanFactory(factory);
+		exporter.setAutodetectMode(MBeanExporter.AUTODETECT_ALL);
+		exporter.afterPropertiesSet();
+
+		assertIsRegistered("Non-null FactoryBean object registered",
+				ObjectNameManager.getInstance("spring:type=FactoryBean"));
+	}
+
+	@Test
+	public void testIgnoreNullObjectFromFactoryBean() throws MalformedObjectNameException {
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerBeanDefinition("spring:type=FactoryBean", new RootBeanDefinition(NullSomethingFactoryBean.class));
+
+		MBeanExporter exporter = new MBeanExporter();
+		exporter.setServer(getServer());
+		exporter.setBeanFactory(factory);
+		exporter.setAutodetectMode(MBeanExporter.AUTODETECT_ALL);
+		exporter.afterPropertiesSet();
+
+		assertIsNotRegistered("Null FactoryBean object not registered",
+				ObjectNameManager.getInstance("spring:type=FactoryBean"));
+	}
+
+
 	private Map<String, Object> getBeanMap() {
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put(OBJECT_NAME, new JmxTestBean());
@@ -702,6 +724,7 @@ private void assertListener(MockMBeanExporterListener listener) throws Malformed
 		assertEquals("Incorrect ObjectName in unregister", desired, listener.getUnregistered().get(0));
 	}
 
+
 	private static class InvokeDetectAssembler implements MBeanInfoAssembler {
 
 		private boolean invoked = false;
@@ -713,6 +736,7 @@ public ModelMBeanInfo getMBeanInfo(Object managedResource, String beanKey) throw
 		}
 	}
 
+
 	private static class MockMBeanExporterListener implements MBeanExporterListener {
 
 		private List<ObjectName> registered = new ArrayList<ObjectName>();
@@ -738,6 +762,7 @@ public List<ObjectName> getUnregistered() {
 		}
 	}
 
+
 	private static class SelfNamingTestBean implements SelfNaming {
 
 		private ObjectName objectName;
@@ -752,11 +777,13 @@ public ObjectName getObjectName() throws MalformedObjectNameException {
 		}
 	}
 
+
 	public static interface PersonMBean {
 
 		String getName();
 	}
 
+
 	public static class Person implements PersonMBean {
 
 		private String name;
@@ -771,6 +798,7 @@ public void setName(String name) {
 		}
 	}
 
+
 	public static final class StubNotificationListener implements NotificationListener {
 
 		private List<Notification> notifications = new ArrayList<Notification>();
@@ -785,6 +813,7 @@ public List<Notification> getNotifications() {
 		}
 	}
 
+
 	private static class RuntimeExceptionThrowingConstructorBean {
 
 		@SuppressWarnings("unused")
@@ -793,6 +822,7 @@ public RuntimeExceptionThrowingConstructorBean() {
 		}
 	}
 
+
 	private static final class NamedBeanAutodetectCapableMBeanInfoAssemblerStub extends
 			SimpleReflectiveMBeanInfoAssembler implements AutodetectCapableMBeanInfoAssembler {
 
@@ -808,4 +838,41 @@ public boolean includeBean(Class<?> beanClass, String beanName) {
 		}
 	}
 
+
+	public interface SomethingMBean {}
+
+	public static class Something implements SomethingMBean {}
+
+
+	public static class ProperSomethingFactoryBean implements FactoryBean<Something> {
+
+		public Something getObject() {
+			return new Something();
+		}
+
+		public Class<?> getObjectType() {
+			return Something.class;
+		}
+
+		public boolean isSingleton() {
+			return true;
+		}
+	}
+
+
+	public static class NullSomethingFactoryBean implements FactoryBean<Something> {
+
+		public Something getObject() {
+			return null;
+		}
+
+		public Class<?> getObjectType() {
+			return Something.class;
+		}
+
+		public boolean isSingleton() {
+			return true;
+		}
+	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java
index 10b1985515..9b8ec774e0 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java
@@ -1,23 +1,22 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.springframework.jmx.export.assembler;
 
 import java.util.Properties;
-
 import javax.management.MBeanAttributeInfo;
 import javax.management.modelmbean.ModelMBeanAttributeInfo;
 import javax.management.modelmbean.ModelMBeanInfo;
@@ -34,6 +33,7 @@ public class MethodNameBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAss
 
 	protected static final String OBJECT_NAME = "bean:name=testBean4";
 
+
 	@Test
 	public void testGetAgeIsReadOnly() throws Exception {
 		ModelMBeanInfo info = getMBeanInfoFromAssembler();
@@ -47,7 +47,7 @@ public void testGetAgeIsReadOnly() throws Exception {
 	public void testWithFallThrough() throws Exception {
 		MethodNameBasedMBeanInfoAssembler assembler =
 				getWithMapping("foobar", "add,myOperation,getName,setName,getAge");
-		assembler.setManagedMethods(new String[]{"getNickName", "setNickName"});
+		assembler.setManagedMethods("getNickName", "setNickName");
 
 		ModelMBeanInfo inf = assembler.getMBeanInfo(getBean(), getObjectName());
 		MBeanAttributeInfo attr = inf.getAttribute("NickName");
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java
index d85f42b508..dae9a8a367 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java
@@ -1,17 +1,17 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.springframework.jmx.export.assembler;
@@ -33,6 +33,7 @@ public class MethodNameBasedMBeanInfoAssemblerTests extends AbstractJmxAssembler
 
 	protected static final String OBJECT_NAME = "bean:name=testBean5";
 
+
 	@Override
 	protected String getObjectName() {
 		return OBJECT_NAME;
@@ -51,7 +52,7 @@ protected int getExpectedAttributeCount() {
 	@Override
 	protected MBeanInfoAssembler getAssembler() {
 		MethodNameBasedMBeanInfoAssembler assembler = new MethodNameBasedMBeanInfoAssembler();
-		assembler.setManagedMethods(new String[] {"add", "myOperation", "getName", "setName", "getAge"});
+		assembler.setManagedMethods("add", "myOperation", "getName", "setName", "getAge");
 		return assembler;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
index d9d7e60ac6..5d14e715a3 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
@@ -20,6 +20,8 @@
 import javax.naming.NamingException;
 
 import org.junit.Test;
+
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.tests.mock.jndi.ExpectedLookupTemplate;
 import org.springframework.tests.sample.beans.DerivedTestBean;
 import org.springframework.tests.sample.beans.ITestBean;
@@ -142,8 +144,7 @@ public void testLookupWithExpectedTypeAndMatch() throws Exception {
 	@Test
 	public void testLookupWithExpectedTypeAndNoMatch() throws Exception {
 		JndiObjectFactoryBean jof = new JndiObjectFactoryBean();
-		Object o = new Object();
-		jof.setJndiTemplate(new ExpectedLookupTemplate("foo", o));
+		jof.setJndiTemplate(new ExpectedLookupTemplate("foo", new Object()));
 		jof.setJndiName("foo");
 		jof.setExpectedType(String.class);
 		try {
@@ -151,15 +152,14 @@ public void testLookupWithExpectedTypeAndNoMatch() throws Exception {
 			fail("Should have thrown NamingException");
 		}
 		catch (NamingException ex) {
-			assertTrue(ex.getMessage().indexOf("java.lang.String") != -1);
+			assertTrue(ex.getMessage().contains("java.lang.String"));
 		}
 	}
 
 	@Test
 	public void testLookupWithDefaultObject() throws Exception {
 		JndiObjectFactoryBean jof = new JndiObjectFactoryBean();
-		String s = "";
-		jof.setJndiTemplate(new ExpectedLookupTemplate("foo", s));
+		jof.setJndiTemplate(new ExpectedLookupTemplate("foo", ""));
 		jof.setJndiName("myFoo");
 		jof.setExpectedType(String.class);
 		jof.setDefaultObject("myString");
@@ -170,8 +170,7 @@ public void testLookupWithDefaultObject() throws Exception {
 	@Test
 	public void testLookupWithDefaultObjectAndExpectedType() throws Exception {
 		JndiObjectFactoryBean jof = new JndiObjectFactoryBean();
-		String s = "";
-		jof.setJndiTemplate(new ExpectedLookupTemplate("foo", s));
+		jof.setJndiTemplate(new ExpectedLookupTemplate("foo", ""));
 		jof.setJndiName("myFoo");
 		jof.setExpectedType(String.class);
 		jof.setDefaultObject("myString");
@@ -179,14 +178,36 @@ public void testLookupWithDefaultObjectAndExpectedType() throws Exception {
 		assertEquals("myString", jof.getObject());
 	}
 
+	@Test
+	public void testLookupWithDefaultObjectAndExpectedTypeConversion() throws Exception {
+		JndiObjectFactoryBean jof = new JndiObjectFactoryBean();
+		jof.setJndiTemplate(new ExpectedLookupTemplate("foo", ""));
+		jof.setJndiName("myFoo");
+		jof.setExpectedType(Integer.class);
+		jof.setDefaultObject("5");
+		jof.afterPropertiesSet();
+		assertEquals(new Integer(5), jof.getObject());
+	}
+
+	@Test
+	public void testLookupWithDefaultObjectAndExpectedTypeConversionViaBeanFactory() throws Exception {
+		JndiObjectFactoryBean jof = new JndiObjectFactoryBean();
+		jof.setJndiTemplate(new ExpectedLookupTemplate("foo", ""));
+		jof.setJndiName("myFoo");
+		jof.setExpectedType(Integer.class);
+		jof.setDefaultObject("5");
+		jof.setBeanFactory(new DefaultListableBeanFactory());
+		jof.afterPropertiesSet();
+		assertEquals(new Integer(5), jof.getObject());
+	}
+
 	@Test
 	public void testLookupWithDefaultObjectAndExpectedTypeNoMatch() throws Exception {
 		JndiObjectFactoryBean jof = new JndiObjectFactoryBean();
-		String s = "";
-		jof.setJndiTemplate(new ExpectedLookupTemplate("foo", s));
+		jof.setJndiTemplate(new ExpectedLookupTemplate("foo", ""));
 		jof.setJndiName("myFoo");
-		jof.setExpectedType(String.class);
-		jof.setDefaultObject(Boolean.TRUE);
+		jof.setExpectedType(Boolean.class);
+		jof.setDefaultObject("5");
 		try {
 			jof.afterPropertiesSet();
 			fail("Should have thrown IllegalArgumentException");
diff --git a/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java
index 917e8dc918..15bd7ba095 100644
--- a/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,6 @@
 
 import static org.junit.Assert.*;
 
-
 /**
  * @author Juergen Hoeller
  * @author Chris Beams
@@ -215,52 +214,53 @@ public void testCreateInitialContext() throws Exception {
 		assertEquals(ctx.lookup(name), o2);
 	}
 
-}
 
-class StubDataSource implements DataSource {
+	static class StubDataSource implements DataSource {
 
-	@Override
-	public Connection getConnection() throws SQLException {
-		return null;
-	}
+		@Override
+		public Connection getConnection() throws SQLException {
+			return null;
+		}
 
-	@Override
-	public Connection getConnection(String username, String password) throws SQLException {
-		return null;
-	}
+		@Override
+		public Connection getConnection(String username, String password) throws SQLException {
+			return null;
+		}
 
-	@Override
-	public PrintWriter getLogWriter() throws SQLException {
-		return null;
-	}
+		@Override
+		public PrintWriter getLogWriter() throws SQLException {
+			return null;
+		}
 
-	@Override
-	public int getLoginTimeout() throws SQLException {
-		return 0;
-	}
+		@Override
+		public int getLoginTimeout() throws SQLException {
+			return 0;
+		}
 
-	@Override
-	public void setLogWriter(PrintWriter arg0) throws SQLException {
+		@Override
+		public void setLogWriter(PrintWriter arg0) throws SQLException {
 
-	}
+		}
 
-	@Override
-	public void setLoginTimeout(int arg0) throws SQLException {
+		@Override
+		public void setLoginTimeout(int arg0) throws SQLException {
 
-	}
+		}
 
-	@Override
-	public boolean isWrapperFor(Class<?> arg0) throws SQLException {
-		return false;
-	}
+		@Override
+		public boolean isWrapperFor(Class<?> arg0) throws SQLException {
+			return false;
+		}
 
-	@Override
-	public <T> T unwrap(Class<T> arg0) throws SQLException {
-		return null;
-	}
+		@Override
+		public <T> T unwrap(Class<T> arg0) throws SQLException {
+			return null;
+		}
 
-	@Override
-	public Logger getParentLogger() {
-		return null;
+		@Override
+		public Logger getParentLogger() {
+			return null;
+		}
 	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
index 028f60c559..b3bb1d4f58 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,19 +18,22 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.HashMap;
 import java.util.concurrent.Future;
 
-import org.junit.Before;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
 
+import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
+import org.springframework.aop.support.DefaultIntroductionAdvisor;
+import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.tests.Assume;
-import org.springframework.tests.TestGroup;
 
 import static org.junit.Assert.*;
 
@@ -46,10 +49,6 @@ public class AsyncExecutionTests {
 
 	private static int listenerConstructed = 0;
 
-	@Before
-	public void setUp() {
-		Assume.group(TestGroup.PERFORMANCE);
-	}
 
 	@Test
 	public void asyncMethods() throws Exception {
@@ -59,6 +58,7 @@ public void asyncMethods() throws Exception {
 		context.registerBeanDefinition("autoProxyCreator", new RootBeanDefinition(DefaultAdvisorAutoProxyCreator.class));
 		context.registerBeanDefinition("asyncAdvisor", new RootBeanDefinition(AsyncAnnotationAdvisor.class));
 		context.refresh();
+
 		AsyncMethodBean asyncTest = context.getBean("asyncTest", AsyncMethodBean.class);
 		asyncTest.doNothing(5);
 		asyncTest.doSomething(10);
@@ -74,6 +74,7 @@ public void asyncMethodsThroughInterface() throws Exception {
 		context.registerBeanDefinition("autoProxyCreator", new RootBeanDefinition(DefaultAdvisorAutoProxyCreator.class));
 		context.registerBeanDefinition("asyncAdvisor", new RootBeanDefinition(AsyncAnnotationAdvisor.class));
 		context.refresh();
+
 		SimpleInterface asyncTest = context.getBean("asyncTest", SimpleInterface.class);
 		asyncTest.doNothing(5);
 		asyncTest.doSomething(10);
@@ -92,6 +93,7 @@ public void asyncMethodsWithQualifier() throws Exception {
 		context.registerBeanDefinition("e1", new RootBeanDefinition(ThreadPoolTaskExecutor.class));
 		context.registerBeanDefinition("e2", new RootBeanDefinition(ThreadPoolTaskExecutor.class));
 		context.refresh();
+
 		AsyncMethodWithQualifierBean asyncTest = context.getBean("asyncTest", AsyncMethodWithQualifierBean.class);
 		asyncTest.doNothing(5);
 		asyncTest.doSomething(10);
@@ -112,6 +114,7 @@ public void asyncMethodsWithQualifierThroughInterface() throws Exception {
 		context.registerBeanDefinition("e1", new RootBeanDefinition(ThreadPoolTaskExecutor.class));
 		context.registerBeanDefinition("e2", new RootBeanDefinition(ThreadPoolTaskExecutor.class));
 		context.refresh();
+
 		SimpleInterface asyncTest = context.getBean("asyncTest", SimpleInterface.class);
 		asyncTest.doNothing(5);
 		asyncTest.doSomething(10);
@@ -129,12 +132,56 @@ public void asyncClass() throws Exception {
 		context.registerBeanDefinition("autoProxyCreator", new RootBeanDefinition(DefaultAdvisorAutoProxyCreator.class));
 		context.registerBeanDefinition("asyncAdvisor", new RootBeanDefinition(AsyncAnnotationAdvisor.class));
 		context.refresh();
+
 		AsyncClassBean asyncTest = context.getBean("asyncTest", AsyncClassBean.class);
 		asyncTest.doSomething(10);
 		Future<String> future = asyncTest.returnSomething(20);
 		assertEquals("20", future.get());
 	}
 
+	@Test
+	public void asyncClassWithPostProcessor() throws Exception {
+		originalThreadName = Thread.currentThread().getName();
+		GenericApplicationContext context = new GenericApplicationContext();
+		context.registerBeanDefinition("asyncTest", new RootBeanDefinition(AsyncClassBean.class));
+		context.registerBeanDefinition("asyncProcessor", new RootBeanDefinition(AsyncAnnotationBeanPostProcessor.class));
+		context.refresh();
+
+		AsyncClassBean asyncTest = context.getBean("asyncTest", AsyncClassBean.class);
+		asyncTest.doSomething(10);
+		Future<String> future = asyncTest.returnSomething(20);
+		assertEquals("20", future.get());
+	}
+
+	@Test
+	public void asyncClassWithInterface() throws Exception {
+		originalThreadName = Thread.currentThread().getName();
+		GenericApplicationContext context = new GenericApplicationContext();
+		context.registerBeanDefinition("asyncTest", new RootBeanDefinition(AsyncClassBeanWithInterface.class));
+		context.registerBeanDefinition("autoProxyCreator", new RootBeanDefinition(DefaultAdvisorAutoProxyCreator.class));
+		context.registerBeanDefinition("asyncAdvisor", new RootBeanDefinition(AsyncAnnotationAdvisor.class));
+		context.refresh();
+
+		RegularInterface asyncTest = context.getBean("asyncTest", RegularInterface.class);
+		asyncTest.doSomething(10);
+		Future<String> future = asyncTest.returnSomething(20);
+		assertEquals("20", future.get());
+	}
+
+	@Test
+	public void asyncClassWithInterfaceAndPostProcessor() throws Exception {
+		originalThreadName = Thread.currentThread().getName();
+		GenericApplicationContext context = new GenericApplicationContext();
+		context.registerBeanDefinition("asyncTest", new RootBeanDefinition(AsyncClassBeanWithInterface.class));
+		context.registerBeanDefinition("asyncProcessor", new RootBeanDefinition(AsyncAnnotationBeanPostProcessor.class));
+		context.refresh();
+
+		RegularInterface asyncTest = context.getBean("asyncTest", RegularInterface.class);
+		asyncTest.doSomething(10);
+		Future<String> future = asyncTest.returnSomething(20);
+		assertEquals("20", future.get());
+	}
+
 	@Test
 	public void asyncInterface() throws Exception {
 		originalThreadName = Thread.currentThread().getName();
@@ -143,6 +190,50 @@ public void asyncInterface() throws Exception {
 		context.registerBeanDefinition("autoProxyCreator", new RootBeanDefinition(DefaultAdvisorAutoProxyCreator.class));
 		context.registerBeanDefinition("asyncAdvisor", new RootBeanDefinition(AsyncAnnotationAdvisor.class));
 		context.refresh();
+
+		AsyncInterface asyncTest = context.getBean("asyncTest", AsyncInterface.class);
+		asyncTest.doSomething(10);
+		Future<String> future = asyncTest.returnSomething(20);
+		assertEquals("20", future.get());
+	}
+
+	@Test
+	public void asyncInterfaceWithPostProcessor() throws Exception {
+		originalThreadName = Thread.currentThread().getName();
+		GenericApplicationContext context = new GenericApplicationContext();
+		context.registerBeanDefinition("asyncTest", new RootBeanDefinition(AsyncInterfaceBean.class));
+		context.registerBeanDefinition("asyncProcessor", new RootBeanDefinition(AsyncAnnotationBeanPostProcessor.class));
+		context.refresh();
+
+		AsyncInterface asyncTest = context.getBean("asyncTest", AsyncInterface.class);
+		asyncTest.doSomething(10);
+		Future<String> future = asyncTest.returnSomething(20);
+		assertEquals("20", future.get());
+	}
+
+	@Test
+	public void dynamicAsyncInterface() throws Exception {
+		originalThreadName = Thread.currentThread().getName();
+		GenericApplicationContext context = new GenericApplicationContext();
+		context.registerBeanDefinition("asyncTest", new RootBeanDefinition(DynamicAsyncInterfaceBean.class));
+		context.registerBeanDefinition("autoProxyCreator", new RootBeanDefinition(DefaultAdvisorAutoProxyCreator.class));
+		context.registerBeanDefinition("asyncAdvisor", new RootBeanDefinition(AsyncAnnotationAdvisor.class));
+		context.refresh();
+
+		AsyncInterface asyncTest = context.getBean("asyncTest", AsyncInterface.class);
+		asyncTest.doSomething(10);
+		Future<String> future = asyncTest.returnSomething(20);
+		assertEquals("20", future.get());
+	}
+
+	@Test
+	public void dynamicAsyncInterfaceWithPostProcessor() throws Exception {
+		originalThreadName = Thread.currentThread().getName();
+		GenericApplicationContext context = new GenericApplicationContext();
+		context.registerBeanDefinition("asyncTest", new RootBeanDefinition(DynamicAsyncInterfaceBean.class));
+		context.registerBeanDefinition("asyncProcessor", new RootBeanDefinition(AsyncAnnotationBeanPostProcessor.class));
+		context.refresh();
+
 		AsyncInterface asyncTest = context.getBean("asyncTest", AsyncInterface.class);
 		asyncTest.doSomething(10);
 		Future<String> future = asyncTest.returnSomething(20);
@@ -157,6 +248,7 @@ public void asyncMethodsInInterface() throws Exception {
 		context.registerBeanDefinition("autoProxyCreator", new RootBeanDefinition(DefaultAdvisorAutoProxyCreator.class));
 		context.registerBeanDefinition("asyncAdvisor", new RootBeanDefinition(AsyncAnnotationAdvisor.class));
 		context.refresh();
+
 		AsyncMethodsInterface asyncTest = context.getBean("asyncTest", AsyncMethodsInterface.class);
 		asyncTest.doNothing(5);
 		asyncTest.doSomething(10);
@@ -164,6 +256,35 @@ public void asyncMethodsInInterface() throws Exception {
 		assertEquals("20", future.get());
 	}
 
+	@Test
+	public void asyncMethodsInInterfaceWithPostProcessor() throws Exception {
+		originalThreadName = Thread.currentThread().getName();
+		GenericApplicationContext context = new GenericApplicationContext();
+		context.registerBeanDefinition("asyncTest", new RootBeanDefinition(AsyncMethodsInterfaceBean.class));
+		context.registerBeanDefinition("asyncProcessor", new RootBeanDefinition(AsyncAnnotationBeanPostProcessor.class));
+		context.refresh();
+
+		AsyncMethodsInterface asyncTest = context.getBean("asyncTest", AsyncMethodsInterface.class);
+		asyncTest.doNothing(5);
+		asyncTest.doSomething(10);
+		Future<String> future = asyncTest.returnSomething(20);
+		assertEquals("20", future.get());
+	}
+
+	@Test
+	public void dynamicAsyncMethodsInInterfaceWithPostProcessor() throws Exception {
+		originalThreadName = Thread.currentThread().getName();
+		GenericApplicationContext context = new GenericApplicationContext();
+		context.registerBeanDefinition("asyncTest", new RootBeanDefinition(DynamicAsyncMethodsInterfaceBean.class));
+		context.registerBeanDefinition("asyncProcessor", new RootBeanDefinition(AsyncAnnotationBeanPostProcessor.class));
+		context.refresh();
+
+		AsyncMethodsInterface asyncTest = context.getBean("asyncTest", AsyncMethodsInterface.class);
+		asyncTest.doSomething(10);
+		Future<String> future = asyncTest.returnSomething(20);
+		assertEquals("20", future.get());
+	}
+
 	@Test
 	public void asyncMethodListener() throws Exception {
 		originalThreadName = Thread.currentThread().getName();
@@ -304,6 +425,28 @@ public Future<String> returnSomething(int i) {
 	}
 
 
+	public interface RegularInterface {
+
+		void doSomething(int i);
+
+		Future<String> returnSomething(int i);
+	}
+
+
+	@Async
+	public static class AsyncClassBeanWithInterface implements RegularInterface {
+
+		public void doSomething(int i) {
+			assertTrue(!Thread.currentThread().getName().equals(originalThreadName));
+		}
+
+		public Future<String> returnSomething(int i) {
+			assertTrue(!Thread.currentThread().getName().equals(originalThreadName));
+			return new AsyncResult<String>(Integer.toString(i));
+		}
+	}
+
+
 	@Async
 	public interface AsyncInterface {
 
@@ -328,6 +471,44 @@ public Future<String> returnSomething(int i) {
 	}
 
 
+	public static class DynamicAsyncInterfaceBean implements FactoryBean<AsyncInterface> {
+
+		private final AsyncInterface proxy;
+
+		public DynamicAsyncInterfaceBean() {
+			ProxyFactory pf = new ProxyFactory(new HashMap<String, String>());
+			DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(new MethodInterceptor() {
+				@Override
+				public Object invoke(MethodInvocation invocation) throws Throwable {
+					assertTrue(!Thread.currentThread().getName().equals(originalThreadName));
+					if (Future.class.equals(invocation.getMethod().getReturnType())) {
+						return new AsyncResult<String>(invocation.getArguments()[0].toString());
+					}
+					return null;
+				}
+			});
+			advisor.addInterface(AsyncInterface.class);
+			pf.addAdvisor(advisor);
+			this.proxy = (AsyncInterface) pf.getProxy();
+		}
+
+		@Override
+		public AsyncInterface getObject() {
+			return this.proxy;
+		}
+
+		@Override
+		public Class<?> getObjectType() {
+			return this.proxy.getClass();
+		}
+
+		@Override
+		public boolean isSingleton() {
+			return true;
+		}
+	}
+
+
 	public interface AsyncMethodsInterface {
 
 		void doNothing(int i);
@@ -360,6 +541,44 @@ public Future<String> returnSomething(int i) {
 	}
 
 
+	public static class DynamicAsyncMethodsInterfaceBean implements FactoryBean<AsyncMethodsInterface> {
+
+		private final AsyncMethodsInterface proxy;
+
+		public DynamicAsyncMethodsInterfaceBean() {
+			ProxyFactory pf = new ProxyFactory(new HashMap<String, String>());
+			DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(new MethodInterceptor() {
+				@Override
+				public Object invoke(MethodInvocation invocation) throws Throwable {
+					assertTrue(!Thread.currentThread().getName().equals(originalThreadName));
+					if (Future.class.equals(invocation.getMethod().getReturnType())) {
+						return new AsyncResult<String>(invocation.getArguments()[0].toString());
+					}
+					return null;
+				}
+			});
+			advisor.addInterface(AsyncMethodsInterface.class);
+			pf.addAdvisor(advisor);
+			this.proxy = (AsyncMethodsInterface) pf.getProxy();
+		}
+
+		@Override
+		public AsyncMethodsInterface getObject() {
+			return this.proxy;
+		}
+
+		@Override
+		public Class<?> getObjectType() {
+			return this.proxy.getClass();
+		}
+
+		@Override
+		public boolean isSingleton() {
+			return true;
+		}
+	}
+
+
 	public static class AsyncMethodListener implements ApplicationListener<ApplicationEvent> {
 
 		@Override
diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java
index 74e3d76639..9777e559e1 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.FutureTask;
 
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -32,6 +31,8 @@
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.util.CustomizableThreadCreator;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Mark Fisher
  * @author Juergen Hoeller
@@ -47,21 +48,23 @@ public void setup() {
 				"executorContext.xml", ExecutorBeanDefinitionParserTests.class);
 	}
 
+
 	@Test
 	public void defaultExecutor() throws Exception {
-		Object executor = this.context.getBean("default");
+		ThreadPoolTaskExecutor executor = this.context.getBean("default", ThreadPoolTaskExecutor.class);
 		assertEquals(1, getCorePoolSize(executor));
 		assertEquals(Integer.MAX_VALUE, getMaxPoolSize(executor));
 		assertEquals(Integer.MAX_VALUE, getQueueCapacity(executor));
 		assertEquals(60, getKeepAliveSeconds(executor));
 		assertEquals(false, getAllowCoreThreadTimeOut(executor));
+
 		FutureTask<String> task = new FutureTask<String>(new Callable<String>() {
 			@Override
 			public String call() throws Exception {
 				return "foo";
 			}
 		});
-		((ThreadPoolTaskExecutor)executor).execute(task);
+		executor.execute(task);
 		assertEquals("foo", task.get());
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/CronSequenceGeneratorTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/CronSequenceGeneratorTests.java
index 491706f9e3..9bc71fb465 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/support/CronSequenceGeneratorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/support/CronSequenceGeneratorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,24 +25,55 @@
 /**
  * @author Juergen Hoeller
  */
+@SuppressWarnings("deprecation")
 public class CronSequenceGeneratorTests {
 
 	@Test
-	public void testAt50Seconds() {
+	public void at50Seconds() {
 		assertEquals(new Date(2012, 6, 2, 1, 0),
 				new CronSequenceGenerator("*/15 * 1-4 * * *").next(new Date(2012, 6, 1, 9, 53, 50)));
 	}
 
 	@Test
-	public void testAt0Seconds() {
+	public void at0Seconds() {
 		assertEquals(new Date(2012, 6, 2, 1, 0),
 				new CronSequenceGenerator("*/15 * 1-4 * * *").next(new Date(2012, 6, 1, 9, 53)));
 	}
 
 	@Test
-	public void testAt0Minutes() {
+	public void at0Minutes() {
 		assertEquals(new Date(2012, 6, 2, 1, 0),
 				new CronSequenceGenerator("0 */2 1-4 * * *").next(new Date(2012, 6, 1, 9, 0)));
 	}
 
+	@Test(expected = IllegalArgumentException.class)
+	public void with0Increment() {
+		new CronSequenceGenerator("*/0 * * * * *").next(new Date(2012, 6, 1, 9, 0));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void withNegativeIncrement() {
+		new CronSequenceGenerator("*/-1 * * * * *").next(new Date(2012, 6, 1, 9, 0));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void withInvertedMinuteRange() {
+		new CronSequenceGenerator("* 6-5 * * * *").next(new Date(2012, 6, 1, 9, 0));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void withInvertedHourRange() {
+		new CronSequenceGenerator("* * 6-5 * * *").next(new Date(2012, 6, 1, 9, 0));
+	}
+
+	@Test
+	public void withSameMinuteRange() {
+		new CronSequenceGenerator("* 6-6 * * * *").next(new Date(2012, 6, 1, 9, 0));
+	}
+
+	@Test
+	public void withSameHourRange() {
+		new CronSequenceGenerator("* * 6-6 * * *").next(new Date(2012, 6, 1, 9, 0));
+	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests.java
index b0373d46a4..f372911ac5 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests.java
@@ -1,12 +1,28 @@
-package org.springframework.scripting.groovy;
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+package org.springframework.scripting.groovy;
 
 import org.junit.After;
 import org.junit.Test;
+
 import org.springframework.context.support.GenericXmlApplicationContext;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Dave Syer
  */
@@ -14,18 +30,9 @@ public class GroovyAspectIntegrationTests {
 
 	private GenericXmlApplicationContext context;
 
-	@After
-	public void close() {
-		if (context != null) {
-			context.close();
-		}
-	}
-
 	@Test
 	public void testJavaBean() {
-
 		context = new GenericXmlApplicationContext(getClass(), getClass().getSimpleName()+"-java-context.xml");
-
 		TestService bean = context.getBean("javaBean", TestService.class);
 		LogUserAdvice logAdvice = context.getBean(LogUserAdvice.class);
 
@@ -33,8 +40,9 @@ public void testJavaBean() {
 		try {
 			bean.sayHello();
 			fail("Expected exception");
-		} catch (RuntimeException e) {
-			assertEquals("TestServiceImpl", e.getMessage());
+		}
+		catch (RuntimeException ex) {
+			assertEquals("TestServiceImpl", ex.getMessage());
 		}
 		assertEquals(1, logAdvice.getCountThrows());
 
@@ -43,7 +51,6 @@ public void testJavaBean() {
 	@Test
 	public void testGroovyBeanInterface() {
 		context = new GenericXmlApplicationContext(getClass(), getClass().getSimpleName()+"-groovy-interface-context.xml");
-
 		TestService bean = context.getBean("groovyBean", TestService.class);
 		LogUserAdvice logAdvice = context.getBean(LogUserAdvice.class);
 
@@ -51,8 +58,9 @@ public void testGroovyBeanInterface() {
 		try {
 			bean.sayHello();
 			fail("Expected exception");
-		} catch (RuntimeException e) {
-			assertEquals("GroovyServiceImpl", e.getMessage());
+		}
+		catch (RuntimeException ex) {
+			assertEquals("GroovyServiceImpl", ex.getMessage());
 		}
 		assertEquals(1, logAdvice.getCountThrows());
 	}
@@ -60,9 +68,7 @@ public void testGroovyBeanInterface() {
 
 	@Test
 	public void testGroovyBeanDynamic() {
-
 		context = new GenericXmlApplicationContext(getClass(), getClass().getSimpleName()+"-groovy-dynamic-context.xml");
-
 		TestService bean = context.getBean("groovyBean", TestService.class);
 		LogUserAdvice logAdvice = context.getBean(LogUserAdvice.class);
 
@@ -70,8 +76,9 @@ public void testGroovyBeanDynamic() {
 		try {
 			bean.sayHello();
 			fail("Expected exception");
-		} catch (RuntimeException e) {
-			assertEquals("GroovyServiceImpl", e.getMessage());
+		}
+		catch (RuntimeException ex) {
+			assertEquals("GroovyServiceImpl", ex.getMessage());
 		}
 		// No proxy here because the pointcut only applies to the concrete class, not the interface
 		assertEquals(0, logAdvice.getCountThrows());
@@ -80,9 +87,7 @@ public void testGroovyBeanDynamic() {
 
 	@Test
 	public void testGroovyBeanProxyTargetClass() {
-
 		context = new GenericXmlApplicationContext(getClass(), getClass().getSimpleName()+"-groovy-proxy-target-class-context.xml");
-
 		TestService bean = context.getBean("groovyBean", TestService.class);
 		LogUserAdvice logAdvice = context.getBean(LogUserAdvice.class);
 
@@ -90,11 +95,19 @@ public void testGroovyBeanProxyTargetClass() {
 		try {
 			bean.sayHello();
 			fail("Expected exception");
-		} catch (TestException e) {
-			assertEquals("GroovyServiceImpl", e.getMessage());
+		}
+		catch (TestException ex) {
+			assertEquals("GroovyServiceImpl", ex.getMessage());
 		}
 		assertEquals(1, logAdvice.getCountBefore());
 		assertEquals(1, logAdvice.getCountThrows());
 	}
 
+	@After
+	public void close() {
+		if (context != null) {
+			context.close();
+		}
+	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java
index fa15ef7bfd..8f5e2d00f3 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java
@@ -1,18 +1,33 @@
-package org.springframework.scripting.groovy;
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+package org.springframework.scripting.groovy;
 
 import org.junit.Test;
+
 import org.springframework.aop.Advisor;
 import org.springframework.aop.aspectj.AspectJExpressionPointcut;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.scripting.groovy.GroovyScriptFactory;
 import org.springframework.scripting.support.ResourceScriptSource;
 import org.springframework.util.ClassUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Dave Syer
  */
@@ -20,15 +35,13 @@ public class GroovyAspectTests {
 
 	@Test
 	public void testManualGroovyBeanWithUnconditionalPointcut() throws Exception {
-
 		LogUserAdvice logAdvice = new LogUserAdvice();
 
 		GroovyScriptFactory scriptFactory = new GroovyScriptFactory("GroovyServiceImpl.grv");
 		TestService target = (TestService) scriptFactory.getScriptedObject(new ResourceScriptSource(
-				new ClassPathResource("GroovyServiceImpl.grv", getClass())), null);
+				new ClassPathResource("GroovyServiceImpl.grv", getClass())));
 
 		testAdvice(new DefaultPointcutAdvisor(logAdvice), logAdvice, target, "GroovyServiceImpl");
-
 	}
 
 	@Test
@@ -37,7 +50,7 @@ public void testManualGroovyBeanWithStaticPointcut() throws Exception {
 
 		GroovyScriptFactory scriptFactory = new GroovyScriptFactory("GroovyServiceImpl.grv");
 		TestService target = (TestService) scriptFactory.getScriptedObject(new ResourceScriptSource(
-				new ClassPathResource("GroovyServiceImpl.grv", getClass())), null);
+				new ClassPathResource("GroovyServiceImpl.grv", getClass())));
 
 		AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
 		pointcut.setExpression(String.format("execution(* %s.TestService+.*(..))", ClassUtils.getPackageName(getClass())));
@@ -46,12 +59,11 @@ public void testManualGroovyBeanWithStaticPointcut() throws Exception {
 
 	@Test
 	public void testManualGroovyBeanWithDynamicPointcut() throws Exception {
-
 		LogUserAdvice logAdvice = new LogUserAdvice();
 
 		GroovyScriptFactory scriptFactory = new GroovyScriptFactory("GroovyServiceImpl.grv");
 		TestService target = (TestService) scriptFactory.getScriptedObject(new ResourceScriptSource(
-				new ClassPathResource("GroovyServiceImpl.grv", getClass())), null);
+				new ClassPathResource("GroovyServiceImpl.grv", getClass())));
 
 		AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
 		pointcut.setExpression(String.format("@within(%s.Log)", ClassUtils.getPackageName(getClass())));
@@ -61,12 +73,11 @@ public void testManualGroovyBeanWithDynamicPointcut() throws Exception {
 
 	@Test
 	public void testManualGroovyBeanWithDynamicPointcutProxyTargetClass() throws Exception {
-
 		LogUserAdvice logAdvice = new LogUserAdvice();
 
 		GroovyScriptFactory scriptFactory = new GroovyScriptFactory("GroovyServiceImpl.grv");
 		TestService target = (TestService) scriptFactory.getScriptedObject(new ResourceScriptSource(
-				new ClassPathResource("GroovyServiceImpl.grv", getClass())), null);
+				new ClassPathResource("GroovyServiceImpl.grv", getClass())));
 
 		AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
 		pointcut.setExpression(String.format("@within(%s.Log)", ClassUtils.getPackageName(getClass())));
@@ -76,6 +87,7 @@ public void testManualGroovyBeanWithDynamicPointcutProxyTargetClass() throws Exc
 
 	private void testAdvice(Advisor advisor, LogUserAdvice logAdvice, TestService target, String message)
 			throws Exception {
+
 		testAdvice(advisor, logAdvice, target, message, false);
 	}
 
@@ -93,9 +105,11 @@ private void testAdvice(Advisor advisor, LogUserAdvice logAdvice, TestService ta
 		try {
 			bean.sayHello();
 			fail("Expected exception");
-		} catch (TestException e) {
-			assertEquals(message, e.getMessage());
+		}
+		catch (TestException ex) {
+			assertEquals(message, ex.getMessage());
 		}
 		assertEquals(1, logAdvice.getCountThrows());
 	}
+
 }
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
index 7ced7671ce..99c12ad098 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
@@ -16,13 +16,13 @@
 
 package org.springframework.scripting.groovy;
 
-import groovy.lang.DelegatingMetaClass;
-import groovy.lang.GroovyObject;
-
 import java.io.FileNotFoundException;
 import java.util.Arrays;
 import java.util.Map;
 
+import groovy.lang.DelegatingMetaClass;
+import groovy.lang.GroovyObject;
+
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -61,13 +61,9 @@
  * @author Mark Fisher
  * @author Chris Beams
  */
+@SuppressWarnings("resource")
 public class GroovyScriptFactoryTests {
 
-	@Before
-	public void setUp() {
-		Assume.group(TestGroup.LONG_RUNNING);
-	}
-
 	@Test
 	public void testStaticScript() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
@@ -191,7 +187,8 @@ public void testScriptCompilationException() throws Exception {
 		try {
 			new ClassPathXmlApplicationContext("org/springframework/scripting/groovy/groovyBrokenContext.xml");
 			fail("Should throw exception for broken script file");
-		} catch (NestedRuntimeException ex) {
+		}
+		catch (NestedRuntimeException ex) {
 			assertTrue("Wrong root cause: " + ex, ex.contains(ScriptCompilationException.class));
 		}
 	}
@@ -205,9 +202,10 @@ public void testScriptedClassThatDoesNotHaveANoArgCtor() throws Exception {
 		GroovyScriptFactory factory = new GroovyScriptFactory(ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX
 				+ badScript);
 		try {
-			factory.getScriptedObject(script, new Class<?>[] {});
+			factory.getScriptedObject(script);
 			fail("Must have thrown a ScriptCompilationException (no public no-arg ctor in scripted class).");
-		} catch (ScriptCompilationException expected) {
+		}
+		catch (ScriptCompilationException expected) {
 			assertTrue(expected.contains(InstantiationException.class));
 		}
 	}
@@ -221,9 +219,10 @@ public void testScriptedClassThatHasNoPublicNoArgCtor() throws Exception {
 		GroovyScriptFactory factory = new GroovyScriptFactory(ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX
 				+ badScript);
 		try {
-			factory.getScriptedObject(script, new Class<?>[] {});
+			factory.getScriptedObject(script);
 			fail("Must have thrown a ScriptCompilationException (no oublic no-arg ctor in scripted class).");
-		} catch (ScriptCompilationException expected) {
+		}
+		catch (ScriptCompilationException expected) {
 			assertTrue(expected.contains(IllegalAccessException.class));
 		}
 	}
@@ -257,7 +256,8 @@ public void testCtorWithNullScriptSourceLocator() throws Exception {
 		try {
 			new GroovyScriptFactory(null);
 			fail("Must have thrown exception by this point.");
-		} catch (IllegalArgumentException expected) {
+		}
+		catch (IllegalArgumentException expected) {
 		}
 	}
 
@@ -266,7 +266,8 @@ public void testCtorWithEmptyScriptSourceLocator() throws Exception {
 		try {
 			new GroovyScriptFactory("");
 			fail("Must have thrown exception by this point.");
-		} catch (IllegalArgumentException expected) {
+		}
+		catch (IllegalArgumentException expected) {
 		}
 	}
 
@@ -275,7 +276,8 @@ public void testCtorWithWhitespacedScriptSourceLocator() throws Exception {
 		try {
 			new GroovyScriptFactory("\n   ");
 			fail("Must have thrown exception by this point.");
-		} catch (IllegalArgumentException expected) {
+		}
+		catch (IllegalArgumentException expected) {
 		}
 	}
 
@@ -284,7 +286,8 @@ public void testWithInlineScriptWithLeadingWhitespace() throws Exception {
 		try {
 			new ClassPathXmlApplicationContext("lwspBadGroovyContext.xml", getClass());
 			fail("Must have thrown a BeanCreationException ('inline:' prefix was preceded by whitespace");
-		} catch (BeanCreationException expected) {
+		}
+		catch (BeanCreationException expected) {
 			assertTrue(expected.contains(FileNotFoundException.class));
 		}
 	}
@@ -296,7 +299,7 @@ public void testGetScriptedObjectDoesNotChokeOnNullInterfacesBeingPassedIn() thr
 		given(script.suggestedClassName()).willReturn("someName");
 
 		GroovyScriptFactory factory = new GroovyScriptFactory("a script source locator (doesn't matter here)");
-		Object scriptedObject = factory.getScriptedObject(script, null);
+		Object scriptedObject = factory.getScriptedObject(script);
 		assertNotNull(scriptedObject);
 	}
 
@@ -304,9 +307,10 @@ public void testGetScriptedObjectDoesNotChokeOnNullInterfacesBeingPassedIn() thr
 	public void testGetScriptedObjectDoesChokeOnNullScriptSourceBeingPassedIn() throws Exception {
 		GroovyScriptFactory factory = new GroovyScriptFactory("a script source locator (doesn't matter here)");
 		try {
-			factory.getScriptedObject(null, null);
+			factory.getScriptedObject(null);
 			fail("Must have thrown a NullPointerException as per contract ('null' ScriptSource supplied");
-		} catch (NullPointerException expected) {
+		}
+		catch (NullPointerException expected) {
 		}
 	}
 
@@ -395,15 +399,14 @@ public void testRefreshableFromTagProxyTargetClass() throws Exception {
 	public void testProxyTargetClassNotAllowedIfNotGroovy() throws Exception {
 		try {
 			new ClassPathXmlApplicationContext("jruby-with-xsd-proxy-target-class.xml", getClass());
-		} catch (BeanCreationException e) {
-			assertTrue(e.getMessage().contains("Cannot use proxyTargetClass=true"));
+		}
+		catch (BeanCreationException ex) {
+			assertTrue(ex.getMessage().contains("Cannot use proxyTargetClass=true"));
 		}
 	}
 
 	@Test
 	public void testAnonymousScriptDetected() throws Exception {
-		Assume.group(TestGroup.LONG_RUNNING);
-
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
 		Map<?, Messenger> beans = ctx.getBeansOfType(Messenger.class);
 		assertEquals(4, beans.size());
@@ -431,7 +434,8 @@ public void testCanPassInMoreThanOneProperty() {
 		try {
 			ctx.getBean("bean3");
 			fail("Should have thrown BeanCreationException");
-		} catch (BeanCreationException ex) {
+		}
+		catch (BeanCreationException ex) {
 			// expected
 			assertTrue(ex.contains(UnsatisfiedDependencyException.class));
 		}
@@ -454,7 +458,8 @@ private void testMetaClass(final String xmlFile) {
 			Calculator calc = (Calculator) ctx.getBean("delegatingCalculator");
 			calc.add(1, 2);
 			fail("expected IllegalStateException");
-		} catch (IllegalStateException ex) {
+		}
+		catch (IllegalStateException ex) {
 			assertEquals("Gotcha", ex.getMessage());
 		}
 	}
@@ -479,6 +484,7 @@ public void testRefreshableFactoryBean() {
 		assertEquals("test", result);
 	}
 
+
 	public static class TestCustomizer implements GroovyObjectCustomizer {
 
 		@Override
@@ -486,9 +492,10 @@ public void customize(GroovyObject goo) {
 			DelegatingMetaClass dmc = new DelegatingMetaClass(goo.getMetaClass()) {
 				@Override
 				public Object invokeMethod(Object arg0, String mName, Object[] arg2) {
-					if (mName.indexOf("Missing") != -1) {
+					if (mName.contains("Missing")) {
 						throw new IllegalStateException("Gotcha");
-					} else {
+					}
+					else {
 						return super.invokeMethod(arg0, mName, arg2);
 					}
 				}
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
index 55f3016d81..0c45266dbf 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
@@ -18,11 +18,10 @@
 
 import java.util.Map;
 
-import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.target.dynamic.Refreshable;
-import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -31,8 +30,7 @@
 import org.springframework.scripting.Messenger;
 import org.springframework.scripting.ScriptCompilationException;
 import org.springframework.scripting.TestBeanAwareMessenger;
-import org.springframework.tests.Assume;
-import org.springframework.tests.TestGroup;
+import org.springframework.tests.sample.beans.TestBean;
 
 import static org.junit.Assert.*;
 
@@ -50,10 +48,6 @@ public class JRubyScriptFactoryTests {
 					"end\n" +
 					"RubyBar.new";
 
-	@Before
-	public void setUp() {
-		Assume.group(TestGroup.LONG_RUNNING);
-	}
 
 	@Test
 	public void testStaticScript() throws Exception {
@@ -106,7 +100,7 @@ public void testScriptCompilationException() throws Exception {
 	@Test
 	public void testCtorWithNullScriptSourceLocator() throws Exception {
 		try {
-			new JRubyScriptFactory(null, new Class<?>[]{Messenger.class});
+			new JRubyScriptFactory(null, Messenger.class);
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -116,7 +110,7 @@ public void testCtorWithNullScriptSourceLocator() throws Exception {
 	@Test
 	public void testCtorWithEmptyScriptSourceLocator() throws Exception {
 		try {
-			new JRubyScriptFactory("", new Class<?>[]{Messenger.class});
+			new JRubyScriptFactory("", Messenger.class);
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -126,7 +120,7 @@ public void testCtorWithEmptyScriptSourceLocator() throws Exception {
 	@Test
 	public void testCtorWithWhitespacedScriptSourceLocator() throws Exception {
 		try {
-			new JRubyScriptFactory("\n   ", new Class<?>[]{Messenger.class});
+			new JRubyScriptFactory("\n   ", Messenger.class);
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -136,7 +130,7 @@ public void testCtorWithWhitespacedScriptSourceLocator() throws Exception {
 	@Test
 	public void testCtorWithNullScriptInterfacesArray() throws Exception {
 		try {
-			new JRubyScriptFactory(RUBY_SCRIPT_SOURCE_LOCATOR, null);
+			new JRubyScriptFactory(RUBY_SCRIPT_SOURCE_LOCATOR);
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -291,7 +285,7 @@ public void testWithWrapperArgsInReturnTypeAndParameters() throws Exception {
 	}
 
 	@Test
-	public void testAOP() throws Exception {
+	public void testAop() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jruby-aop.xml", getClass());
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
 		assertEquals(new StringBuffer("Hello World!").reverse().toString(), messenger.getMessage());
diff --git a/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java
index 3d1452ac29..1ae3b78d6b 100644
--- a/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.tests.mock.jndi;
 
 import java.util.Hashtable;
-
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
@@ -40,9 +39,9 @@
  *
  * <p>There are various choices for DataSource implementations:
  * <ul>
- * <li>SingleConnectionDataSource (using the same Connection for all getConnection calls);
- * <li>DriverManagerDataSource (creating a new Connection on each getConnection call);
- * <li>Apache's Jakarta Commons DBCP offers BasicDataSource (a real pool).
+ * <li>{@code SingleConnectionDataSource} (using the same Connection for all getConnection calls)
+ * <li>{@code DriverManagerDataSource} (creating a new Connection on each getConnection call)
+ * <li>Apache's Jakarta Commons DBCP offers {@code org.apache.commons.dbcp.BasicDataSource} (a real pool)
  * </ul>
  *
  * <p>Typical usage in bootstrap code:
@@ -77,7 +76,6 @@
  * @see SimpleNamingContext
  * @see org.springframework.jdbc.datasource.SingleConnectionDataSource
  * @see org.springframework.jdbc.datasource.DriverManagerDataSource
- * @see org.apache.commons.dbcp.BasicDataSource
  */
 public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder {
 
@@ -197,7 +195,7 @@ public InitialContextFactory createInitialContextFactory(Hashtable<?,?> environm
 		if (activated == null && environment != null) {
 			Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY);
 			if (icf != null) {
-				Class<?> icfClass = null;
+				Class<?> icfClass;
 				if (icf instanceof Class) {
 					icfClass = (Class<?>) icf;
 				}
@@ -216,10 +214,7 @@ else if (icf instanceof String) {
 					return (InitialContextFactory) icfClass.newInstance();
 				}
 				catch (Throwable ex) {
-					IllegalStateException ise =
-							new IllegalStateException("Cannot instantiate specified InitialContextFactory: " + icf);
-					ise.initCause(ex);
-					throw ise;
+					throw new IllegalStateException("Cannot instantiate specified InitialContextFactory: " + icf, ex);
 				}
 			}
 		}
diff --git a/spring-context/src/test/java/org/springframework/tests/sample/beans/Employee.java b/spring-context/src/test/java/org/springframework/tests/sample/beans/Employee.java
index 7bed71f394..40301c7a24 100644
--- a/spring-context/src/test/java/org/springframework/tests/sample/beans/Employee.java
+++ b/spring-context/src/test/java/org/springframework/tests/sample/beans/Employee.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2002-2012 the original author or authors.
  *
@@ -17,19 +16,10 @@
 
 package org.springframework.tests.sample.beans;
 
-import org.springframework.tests.sample.beans.TestBean;
-
 public class Employee extends TestBean {
 
 	private String co;
 
-	/**
-	 * Constructor for Employee.
-	 */
-	public Employee() {
-		super();
-	}
-
 	public String getCompany() {
 		return co;
 	}
diff --git a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
index 7b159f3b3a..11ce2b5ce3 100644
--- a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
+++ b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
@@ -16,26 +16,26 @@
 
 package org.springframework.ui;
 
-import static org.junit.Assert.*;
-
 import java.io.Serializable;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
+
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rick Evans
  * @author Juergen Hoeller
@@ -226,12 +226,12 @@ public void testInnerClassWithTwoUpperCaseLetters() throws Exception {
 	public void testAopCglibProxy() throws Exception {
 		ModelMap map = new ModelMap();
 		ProxyFactory factory = new ProxyFactory();
-		Date date = new Date();
-		factory.setTarget(date);
+		SomeInnerClass val = new SomeInnerClass();
+		factory.setTarget(val);
 		factory.setProxyTargetClass(true);
 		map.addAttribute(factory.getProxy());
-		assertTrue(map.containsKey("date"));
-		assertEquals(date, map.get("date"));
+		assertTrue(map.containsKey("someInnerClass"));
+		assertEquals(val, map.get("someInnerClass"));
 	}
 
 	@Test
@@ -288,11 +288,20 @@ public Object invoke(Object proxy, Method method, Object[] args) {
 	}
 
 
-	private static class SomeInnerClass {
+	public static class SomeInnerClass {
+
+		public boolean equals(Object obj) {
+			return (obj instanceof SomeInnerClass);
+		}
+
+		@Override
+		public int hashCode() {
+			return SomeInnerClass.class.hashCode();
+		}
 	}
 
 
-	private static class UKInnerClass {
+	public static class UKInnerClass {
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
index 77fc0dee24..daf3d2d6ad 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,16 +37,10 @@
 
 import junit.framework.TestCase;
 
-import org.springframework.tests.sample.beans.BeanWithObjectProperty;
-import org.springframework.tests.sample.beans.DerivedTestBean;
-import org.springframework.tests.sample.beans.ITestBean;
-import org.springframework.tests.sample.beans.IndexedTestBean;
 import org.springframework.beans.InvalidPropertyException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.NotWritablePropertyException;
 import org.springframework.beans.NullValueInNestedPathException;
-import org.springframework.tests.sample.beans.SerializablePerson;
-import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.propertyeditors.CustomCollectionEditor;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -56,6 +50,13 @@
 import org.springframework.format.Formatter;
 import org.springframework.format.number.NumberFormatter;
 import org.springframework.format.support.FormattingConversionService;
+import org.springframework.tests.sample.beans.BeanWithObjectProperty;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.SerializablePerson;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -134,7 +135,7 @@ public void testBindingNoErrorsNotIgnoreUnknown() throws Exception {
 		binder.setIgnoreUnknownFields(false);
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", "Rod");
-		pvs.add("age", new Integer(32));
+		pvs.add("age", 32);
 		pvs.add("nonExisting", "someValue");
 
 		try {
@@ -151,7 +152,7 @@ public void testBindingNoErrorsWithInvalidField() throws Exception {
 		DataBinder binder = new DataBinder(rod, "person");
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", "Rod");
-		pvs.add("spouse.age", new Integer(32));
+		pvs.add("spouse.age", 32);
 
 		try {
 			binder.bind(pvs);
@@ -168,7 +169,7 @@ public void testBindingNoErrorsWithIgnoreInvalid() throws Exception {
 		binder.setIgnoreInvalidFields(true);
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", "Rod");
-		pvs.add("spouse.age", new Integer(32));
+		pvs.add("spouse.age", 32);
 
 		binder.bind(pvs);
 	}
@@ -504,7 +505,7 @@ public void testBindingErrorWithFormatterAgainstFields() {
 	public void testBindingWithAllowedFields() throws Exception {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod);
-		binder.setAllowedFields(new String[] {"name", "myparam"});
+		binder.setAllowedFields("name", "myparam");
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", "Rod");
 		pvs.add("age", "32x");
@@ -518,7 +519,7 @@ public void testBindingWithAllowedFields() throws Exception {
 	public void testBindingWithDisallowedFields() throws Exception {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod);
-		binder.setDisallowedFields(new String[] {"age"});
+		binder.setDisallowedFields("age");
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", "Rod");
 		pvs.add("age", "32x");
@@ -535,8 +536,8 @@ public void testBindingWithDisallowedFields() throws Exception {
 	public void testBindingWithAllowedAndDisallowedFields() throws Exception {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod);
-		binder.setAllowedFields(new String[] {"name", "myparam"});
-		binder.setDisallowedFields(new String[] {"age"});
+		binder.setAllowedFields("name", "myparam");
+		binder.setDisallowedFields("age");
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", "Rod");
 		pvs.add("age", "32x");
@@ -553,8 +554,8 @@ public void testBindingWithAllowedAndDisallowedFields() throws Exception {
 	public void testBindingWithOverlappingAllowedAndDisallowedFields() throws Exception {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod);
-		binder.setAllowedFields(new String[] {"name", "age"});
-		binder.setDisallowedFields(new String[] {"age"});
+		binder.setAllowedFields("name", "age");
+		binder.setDisallowedFields("age");
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", "Rod");
 		pvs.add("age", "32x");
@@ -571,7 +572,7 @@ public void testBindingWithOverlappingAllowedAndDisallowedFields() throws Except
 	public void testBindingWithAllowedFieldsUsingAsterisks() throws Exception {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
-		binder.setAllowedFields(new String[] {"nam*", "*ouchy"});
+		binder.setAllowedFields("nam*", "*ouchy");
 
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", "Rod");
@@ -597,8 +598,8 @@ public void testBindingWithAllowedFieldsUsingAsterisks() throws Exception {
 	public void testBindingWithAllowedAndDisallowedMapFields() throws Exception {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod);
-		binder.setAllowedFields(new String[] {"someMap[key1]", "someMap[key2]"});
-		binder.setDisallowedFields(new String[] {"someMap['key3']", "someMap[key4]"});
+		binder.setAllowedFields("someMap[key1]", "someMap[key2]");
+		binder.setDisallowedFields("someMap['key3']", "someMap[key4]");
 
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("someMap[key1]", "value1");
@@ -614,8 +615,8 @@ public void testBindingWithAllowedAndDisallowedMapFields() throws Exception {
 		assertNull(rod.getSomeMap().get("key4"));
 		String[] disallowedFields = binder.getBindingResult().getSuppressedFields();
 		assertEquals(2, disallowedFields.length);
-		assertEquals("someMap[key3]", disallowedFields[0]);
-		assertEquals("someMap[key4]", disallowedFields[1]);
+		assertTrue(ObjectUtils.containsElement(disallowedFields, "someMap[key3]"));
+		assertTrue(ObjectUtils.containsElement(disallowedFields, "someMap[key4]"));
 	}
 
 	/**
@@ -626,7 +627,7 @@ public void testBindingWithRequiredFields() throws Exception {
 		tb.setSpouse(new TestBean());
 
 		DataBinder binder = new DataBinder(tb, "person");
-		binder.setRequiredFields(new String[] {"touchy", "name", "age", "date", "spouse.name"});
+		binder.setRequiredFields("touchy", "name", "age", "date", "spouse.name");
 
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("touchy", "");
@@ -656,7 +657,7 @@ public void testBindingWithRequiredMapFields() throws Exception {
 		tb.setSpouse(new TestBean());
 
 		DataBinder binder = new DataBinder(tb, "person");
-		binder.setRequiredFields(new String[] {"someMap[key1]", "someMap[key2]", "someMap['key3']", "someMap[key4]"});
+		binder.setRequiredFields("someMap[key1]", "someMap[key2]", "someMap['key3']", "someMap[key4]");
 
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("someMap[key1]", "value1");
@@ -1542,7 +1543,7 @@ public void testBindExceptionSerializable() throws Exception {
 	public void testTrackDisallowedFields() throws Exception {
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
-		binder.setAllowedFields(new String[] {"name", "age"});
+		binder.setAllowedFields("name", "age");
 
 		String name = "Rob Harrop";
 		String beanName = "foobar";
@@ -1627,7 +1628,27 @@ public void testNestedGrowingList() {
 		assertEquals("firstValue", list.get(0));
 		assertEquals("secondValue", list.get(1));
 		assertEquals(2, list.size());
-	  }
+	}
+
+	public void testFieldErrorAccessVariations() throws Exception {
+		TestBean testBean = new TestBean();
+		DataBinder binder = new DataBinder(testBean, "testBean");
+		assertNull(binder.getBindingResult().getGlobalError());
+		assertNull(binder.getBindingResult().getFieldError());
+		assertNull(binder.getBindingResult().getFieldError(""));
+
+		MutablePropertyValues mpv = new MutablePropertyValues();
+		mpv.add("age", "invalid");
+		binder.bind(mpv);
+		assertNull(binder.getBindingResult().getGlobalError());
+		assertNull(binder.getBindingResult().getFieldError(""));
+		assertNull(binder.getBindingResult().getFieldError("b*"));
+		assertEquals("age", binder.getBindingResult().getFieldError().getField());
+		assertEquals("age", binder.getBindingResult().getFieldError("*").getField());
+		assertEquals("age", binder.getBindingResult().getFieldError("a*").getField());
+		assertEquals("age", binder.getBindingResult().getFieldError("ag*").getField());
+		assertEquals("age", binder.getBindingResult().getFieldError("age").getField());
+	}
 
 
 	@SuppressWarnings("unused")
diff --git a/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java b/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java
index a2c3a1074a..409f00c81b 100644
--- a/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java
+++ b/spring-core/src/main/java/org/springframework/asm/SpringAsmInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 package org.springframework.asm;
 
 /**
- * Utility class exposing constants related to Spring's internal repackaging of the ASM
- * bytecode manipulation library.
+ * Utility class exposing constants related to Spring's internal repackaging
+ * of the ASM bytecode manipulation library (currently based on version 5.0).
  *
- * <p>See <a href="package-summary.html">package-level Javadoc</a> for more
+ * <p>See <a href="package-summary.html">package-level javadocs</a> for more
  * information on {@code org.springframework.asm}.
  *
  * @author Chris Beams
@@ -29,10 +29,9 @@
 public final class SpringAsmInfo {
 
 	/**
-	 * The ASM version used internally throughout the framework.
-	 *
-	 * @see Opcodes#ASM4
+	 * The ASM compatibility version for Spring's ASM visitor implementations:
+	 * currently {@link Opcodes#ASM5}.
 	 */
-	public static final int ASM_VERSION = Opcodes.ASM4;
+	public static final int ASM_VERSION = Opcodes.ASM5;
 
 }
diff --git a/spring-core/src/main/java/org/springframework/asm/package-info.java b/spring-core/src/main/java/org/springframework/asm/package-info.java
index 842143aa51..9ced53eaa3 100644
--- a/spring-core/src/main/java/org/springframework/asm/package-info.java
+++ b/spring-core/src/main/java/org/springframework/asm/package-info.java
@@ -1,28 +1,16 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 /**
- * Spring's repackaging of <a href="http://asm.ow2.org">org.objectweb.asm 4</a> (for
- * internal use only).
+ * Spring's repackaging of
+ * <a href="http://asm.ow2.org">org.objectweb.asm 5.0</a>
+ * (for internal use only).
+ *
  * <p>This repackaging technique avoids any potential conflicts with
- * dependencies on ASM at the application level or from other third-party
+ * dependencies on ASM at the application level or from third-party
  * libraries and frameworks.
- * <p>As this repackaging happens at the classfile level, sources and Javadoc
- * are not available here. See the original ObjectWeb
- * <a href="http://asm.ow2.org/asm40/javadoc/user">ASM 4 Javadoc</a>
+ *
+ * <p>As this repackaging happens at the class file level, sources
+ * and javadocs are not available here. See the original ObjectWeb
+ * <a href="http://asm.ow2.org/asm50/javadoc/user">ASM 5.0 javadocs</a>
  * for details when working with these classes.
  *
  * @since 3.2
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/SpringNamingPolicy.java b/spring-core/src/main/java/org/springframework/cglib/core/SpringNamingPolicy.java
new file mode 100644
index 0000000000..839f36f8b3
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/cglib/core/SpringNamingPolicy.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cglib.core;
+
+/**
+ * Custom extension of CGLIB's {@link DefaultNamingPolicy}, modifying
+ * the tag in generated class names from "ByCGLIB" to "BySpringCGLIB".
+ *
+ * <p>This is primarily designed to avoid clashes between a regular CGLIB
+ * version (used by some other library) and Spring's embedded variant,
+ * in case the same class happens to get proxied for different purposes.
+ *
+ * @author Juergen Hoeller
+ * @since 3.2.8
+ */
+public class SpringNamingPolicy extends DefaultNamingPolicy {
+
+	public static final SpringNamingPolicy INSTANCE = new SpringNamingPolicy();
+
+	@Override
+	protected String getTag() {
+		return "BySpringCGLIB";
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/cglib/transform/impl/MemorySafeUndeclaredThrowableStrategy.java b/spring-core/src/main/java/org/springframework/cglib/transform/impl/MemorySafeUndeclaredThrowableStrategy.java
new file mode 100644
index 0000000000..28f92352d5
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/cglib/transform/impl/MemorySafeUndeclaredThrowableStrategy.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cglib.transform.impl;
+
+import org.springframework.cglib.core.ClassGenerator;
+import org.springframework.cglib.core.DefaultGeneratorStrategy;
+import org.springframework.cglib.core.TypeUtils;
+import org.springframework.cglib.transform.ClassTransformer;
+import org.springframework.cglib.transform.MethodFilter;
+import org.springframework.cglib.transform.MethodFilterTransformer;
+import org.springframework.cglib.transform.TransformingClassGenerator;
+
+/**
+ * Memory-safe variant of {@link UndeclaredThrowableStrategy} ported from CGLIB 3.1,
+ * introduced for using it in Spring before it was officially released in CGLIB.
+ *
+ * @author Phillip Webb
+ * @since 3.2.4
+ */
+public class MemorySafeUndeclaredThrowableStrategy extends DefaultGeneratorStrategy {
+
+	private static final MethodFilter TRANSFORM_FILTER = new MethodFilter() {
+		public boolean accept(int access, String name, String desc, String signature, String[] exceptions) {
+			return (!TypeUtils.isPrivate(access) && name.indexOf('$') < 0);
+		}
+	};
+
+
+	private final Class<?> wrapper;
+
+
+	public MemorySafeUndeclaredThrowableStrategy(Class<?> wrapper) {
+		this.wrapper = wrapper;
+	}
+
+
+	protected ClassGenerator transform(ClassGenerator cg) throws Exception {
+		ClassTransformer ct = new UndeclaredThrowableTransformer(this.wrapper);
+		ct = new MethodFilterTransformer(TRANSFORM_FILTER, ct);
+		return new TransformingClassGenerator(cg, ct);
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
index 1027d4dfc9..62c33d1a79 100644
--- a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -143,7 +143,7 @@ static boolean isBridgeMethodFor(Method bridgeMethod, Method candidateMethod, Ma
 	 */
 	private static Method findGenericDeclaration(Method bridgeMethod) {
 		// Search parent types for method that has same signature as bridge.
-		Class superclass = bridgeMethod.getDeclaringClass().getSuperclass();
+		Class<?> superclass = bridgeMethod.getDeclaringClass().getSuperclass();
 		while (superclass != null && !Object.class.equals(superclass)) {
 			Method method = searchForMatch(superclass, bridgeMethod);
 			if (method != null && !method.isBridge()) {
@@ -153,8 +153,8 @@ private static Method findGenericDeclaration(Method bridgeMethod) {
 		}
 
 		// Search interfaces.
-		Class[] interfaces = ClassUtils.getAllInterfacesForClass(bridgeMethod.getDeclaringClass());
-		for (Class ifc : interfaces) {
+		Class<?>[] interfaces = ClassUtils.getAllInterfacesForClass(bridgeMethod.getDeclaringClass());
+		for (Class<?> ifc : interfaces) {
 			Method method = searchForMatch(ifc, bridgeMethod);
 			if (method != null && !method.isBridge()) {
 				return method;
@@ -174,13 +174,13 @@ private static boolean isResolvedTypeMatch(
 			Method genericMethod, Method candidateMethod, Map<TypeVariable, Type> typeVariableMap) {
 
 		Type[] genericParameters = genericMethod.getGenericParameterTypes();
-		Class[] candidateParameters = candidateMethod.getParameterTypes();
+		Class<?>[] candidateParameters = candidateMethod.getParameterTypes();
 		if (genericParameters.length != candidateParameters.length) {
 			return false;
 		}
 		for (int i = 0; i < genericParameters.length; i++) {
 			Type genericParameter = genericParameters[i];
-			Class candidateParameter = candidateParameters[i];
+			Class<?> candidateParameter = candidateParameters[i];
 			if (candidateParameter.isArray()) {
 				// An array type: compare the component type.
 				Type rawType = GenericTypeResolver.getRawType(genericParameter, typeVariableMap);
@@ -193,7 +193,7 @@ private static boolean isResolvedTypeMatch(
 				}
 			}
 			// A non-array type: compare the type itself.
-			Class resolvedParameter = GenericTypeResolver.resolveType(genericParameter, typeVariableMap);
+			Class<?> resolvedParameter = GenericTypeResolver.resolveType(genericParameter, typeVariableMap);
 			if (!candidateParameter.equals(resolvedParameter)) {
 				return false;
 			}
@@ -206,7 +206,7 @@ private static boolean isResolvedTypeMatch(
 	 * that of the supplied {@link Method}, then this matching {@link Method} is returned,
 	 * otherwise {@code null} is returned.
 	 */
-	private static Method searchForMatch(Class type, Method bridgeMethod) {
+	private static Method searchForMatch(Class<?> type, Method bridgeMethod) {
 		return ReflectionUtils.findMethod(type, bridgeMethod.getName(), bridgeMethod.getParameterTypes());
 	}
 
@@ -221,9 +221,8 @@ public static boolean isVisibilityBridgeMethodPair(Method bridgeMethod, Method b
 		if (bridgeMethod == bridgedMethod) {
 			return true;
 		}
-		return Arrays.equals(bridgeMethod.getParameterTypes(), bridgedMethod.getParameterTypes()) &&
-				bridgeMethod.getReturnType().equals(bridgedMethod.getReturnType());
+		return (Arrays.equals(bridgeMethod.getParameterTypes(), bridgedMethod.getParameterTypes()) &&
+				bridgeMethod.getReturnType().equals(bridgedMethod.getReturnType()));
 	}
 
-
 }
diff --git a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
index 5e5cddf49d..23335434fc 100644
--- a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
@@ -34,6 +34,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import org.springframework.util.ClassUtils;
 import org.springframework.util.LinkedCaseInsensitiveMap;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -73,8 +74,8 @@ public abstract class CollectionFactory {
 		// New Java 6 collection interfaces
 		ClassLoader cl = CollectionFactory.class.getClassLoader();
 		try {
-			navigableSetClass = cl.loadClass("java.util.NavigableSet");
-			navigableMapClass = cl.loadClass("java.util.NavigableMap");
+			navigableSetClass = ClassUtils.forName("java.util.NavigableSet", cl);
+			navigableMapClass = ClassUtils.forName("java.util.NavigableMap", cl);
 			approximableCollectionTypes.add(navigableSetClass);
 			approximableMapTypes.add(navigableMapClass);
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java b/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java
index 4d48b0449d..70a0a87c88 100644
--- a/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java
+++ b/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import java.io.NotSerializableException;
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
-import java.lang.reflect.Proxy;
 
 import org.springframework.util.ClassUtils;
 
@@ -68,7 +67,7 @@ public ConfigurableObjectInputStream(
 
 
 	@Override
-	protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
+	protected Class<?> resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
 		try {
 			if (this.classLoader != null) {
 				// Use the specified ClassLoader to resolve local classes.
@@ -85,13 +84,13 @@ protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, Cl
 	}
 
 	@Override
-	protected Class resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException {
+	protected Class<?> resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException {
 		if (!this.acceptProxyClasses) {
 			throw new NotSerializableException("Not allowed to accept serialized proxy classes");
 		}
 		if (this.classLoader != null) {
 			// Use the specified ClassLoader to resolve local proxy classes.
-			Class[] resolvedInterfaces = new Class[interfaces.length];
+			Class<?>[] resolvedInterfaces = new Class<?>[interfaces.length];
 			for (int i = 0; i < interfaces.length; i++) {
 				try {
 					resolvedInterfaces[i] = ClassUtils.forName(interfaces[i], this.classLoader);
@@ -101,7 +100,7 @@ protected Class resolveProxyClass(String[] interfaces) throws IOException, Class
 				}
 			}
 			try {
-				return Proxy.getProxyClass(this.classLoader, resolvedInterfaces);
+				return ClassUtils.createCompositeInterface(resolvedInterfaces, this.classLoader);
 			}
 			catch (IllegalArgumentException ex) {
 				throw new ClassNotFoundException(null, ex);
@@ -113,11 +112,11 @@ protected Class resolveProxyClass(String[] interfaces) throws IOException, Class
 				return super.resolveProxyClass(interfaces);
 			}
 			catch (ClassNotFoundException ex) {
-				Class[] resolvedInterfaces = new Class[interfaces.length];
+				Class<?>[] resolvedInterfaces = new Class<?>[interfaces.length];
 				for (int i = 0; i < interfaces.length; i++) {
 					resolvedInterfaces[i] = resolveFallbackIfPossible(interfaces[i], ex);
 				}
-				return Proxy.getProxyClass(getFallbackClassLoader(), resolvedInterfaces);
+				return ClassUtils.createCompositeInterface(resolvedInterfaces, getFallbackClassLoader());
 			}
 		}
 	}
@@ -131,7 +130,7 @@ protected Class resolveProxyClass(String[] interfaces) throws IOException, Class
 	 * @param ex the original exception thrown when attempting to load the class
 	 * @return the newly resolved class (never {@code null})
 	 */
-	protected Class resolveFallbackIfPossible(String className, ClassNotFoundException ex)
+	protected Class<?> resolveFallbackIfPossible(String className, ClassNotFoundException ex)
 			throws IOException, ClassNotFoundException{
 
 		throw ex;
@@ -139,8 +138,9 @@ protected Class resolveFallbackIfPossible(String className, ClassNotFoundExcepti
 
 	/**
 	 * Return the fallback ClassLoader to use when no ClassLoader was specified
-	 * and ObjectInputStream's own default ClassLoader failed.
-	 * <p>The default implementation simply returns {@code null}.
+	 * and ObjectInputStream's own default class loader failed.
+	 * <p>The default implementation simply returns {@code null}, indicating
+	 * that no specific fallback is available.
 	 */
 	protected ClassLoader getFallbackClassLoader() throws IOException {
 		return null;
diff --git a/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java
index c3b05e35fe..8b4c280a97 100644
--- a/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.MalformedParameterizedTypeException;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -446,8 +447,13 @@ private static Class<?> extractTypeFromClass(Class<?> clazz, Class<?> source, in
 			return null;
 		}
 		if (clazz.getSuperclass() != null && isIntrospectionCandidate(clazz.getSuperclass())) {
-			return extractType(clazz.getGenericSuperclass(), source, typeIndex, typeVariableMap, typeIndexesPerLevel,
-					nestingLevel, currentLevel);
+			try {
+				return extractType(clazz.getGenericSuperclass(), source, typeIndex, typeVariableMap,
+						typeIndexesPerLevel, nestingLevel, currentLevel);
+			}
+			catch (MalformedParameterizedTypeException ex) {
+				// from getGenericSuperclass() - ignore and continue with interface introspection
+			}
 		}
 		Type[] ifcs = clazz.getGenericInterfaces();
 		if (ifcs != null) {
diff --git a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
index 7d8045b51b..b860aaafca 100644
--- a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
@@ -18,6 +18,7 @@
 
 import java.lang.reflect.Array;
 import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.MalformedParameterizedTypeException;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -74,12 +75,12 @@ public static Type getTargetType(MethodParameter methodParam) {
 	 * @param clazz the class to resolve type variables against
 	 * @return the corresponding generic parameter or return type
 	 */
-	public static Class<?> resolveParameterType(MethodParameter methodParam, Class clazz) {
+	public static Class<?> resolveParameterType(MethodParameter methodParam, Class<?> clazz) {
 		Type genericType = getTargetType(methodParam);
 		Assert.notNull(clazz, "Class must not be null");
 		Map<TypeVariable, Type> typeVariableMap = getTypeVariableMap(clazz);
 		Type rawType = getRawType(genericType, typeVariableMap);
-		Class result = (rawType instanceof Class ? (Class) rawType : methodParam.getParameterType());
+		Class<?> result = (rawType instanceof Class ? (Class) rawType : methodParam.getParameterType());
 		methodParam.setParameterType(result);
 		methodParam.typeVariableMap = typeVariableMap;
 		return result;
@@ -130,8 +131,10 @@ public static Class<?> resolveReturnType(Method method, Class<?> clazz) {
 	 * invoked, never {@code null}
 	 * @return the resolved target return type, the standard return type, or {@code null}
 	 * @since 3.2
-	 * @see #resolveReturnType
+	 * @deprecated in favor of resolveReturnTypeForFactoryMethod in the internal
+	 * AutowireUtils class in the beans module; we do not expect other use of it!
 	 */
+	@Deprecated
 	public static Class<?> resolveReturnTypeForGenericMethod(Method method, Object[] args) {
 		Assert.notNull(method, "Method must not be null");
 		Assert.notNull(args, "Argument array must not be null");
@@ -227,8 +230,8 @@ public static Class<?> resolveReturnTypeArgument(Method method, Class<?> generic
 	 * @param genericIfc the generic interface or superclass to resolve the type argument from
 	 * @return the resolved type of the argument, or {@code null} if not resolvable
 	 */
-	public static Class<?> resolveTypeArgument(Class clazz, Class genericIfc) {
-		Class[] typeArgs = resolveTypeArguments(clazz, genericIfc);
+	public static Class<?> resolveTypeArgument(Class<?> clazz, Class<?> genericIfc) {
+		Class<?>[] typeArgs = resolveTypeArguments(clazz, genericIfc);
 		if (typeArgs == null) {
 			return null;
 		}
@@ -243,31 +246,40 @@ public static Class<?> resolveTypeArgument(Class clazz, Class genericIfc) {
 	 * Resolve the type arguments of the given generic interface against the given
 	 * target class which is assumed to implement the generic interface and possibly
 	 * declare concrete types for its type variables.
+	 * <p>Note: In Spring 3.2, this method doesn't return {@code null} in all scenarios
+	 * where it should. To be fixed in Spring 4.0; for client code, this just means it
+	 * might see {@code null} in a few more cases then where it now sees an array with
+	 * a single {@link Object} type.
 	 * @param clazz the target class to check against
 	 * @param genericIfc the generic interface or superclass to resolve the type argument from
 	 * @return the resolved type of each argument, with the array size matching the
 	 * number of actual type arguments, or {@code null} if not resolvable
 	 */
-	public static Class[] resolveTypeArguments(Class clazz, Class genericIfc) {
+	public static Class<?>[] resolveTypeArguments(Class<?> clazz, Class<?> genericIfc) {
 		return doResolveTypeArguments(clazz, clazz, genericIfc);
 	}
 
-	private static Class[] doResolveTypeArguments(Class ownerClass, Class classToIntrospect, Class genericIfc) {
+	private static Class<?>[] doResolveTypeArguments(Class<?> ownerClass, Class<?> classToIntrospect, Class<?> genericIfc) {
 		while (classToIntrospect != null) {
 			if (genericIfc.isInterface()) {
 				Type[] ifcs = classToIntrospect.getGenericInterfaces();
 				for (Type ifc : ifcs) {
-					Class[] result = doResolveTypeArguments(ownerClass, ifc, genericIfc);
+					Class<?>[] result = doResolveTypeArguments(ownerClass, ifc, genericIfc);
 					if (result != null) {
 						return result;
 					}
 				}
 			}
 			else {
-				Class[] result = doResolveTypeArguments(
-						ownerClass, classToIntrospect.getGenericSuperclass(), genericIfc);
-				if (result != null) {
-					return result;
+				try {
+					Class<?>[] result = doResolveTypeArguments(ownerClass, classToIntrospect.getGenericSuperclass(), genericIfc);
+					if (result != null) {
+						return result;
+					}
+				}
+				catch (MalformedParameterizedTypeException ex) {
+					// from getGenericSuperclass() - return null to skip further superclass traversal
+					return null;
 				}
 			}
 			classToIntrospect = classToIntrospect.getSuperclass();
@@ -275,13 +287,13 @@ private static Class[] doResolveTypeArguments(Class ownerClass, Class classToInt
 		return null;
 	}
 
-	private static Class[] doResolveTypeArguments(Class ownerClass, Type ifc, Class genericIfc) {
+	private static Class<?>[] doResolveTypeArguments(Class<?> ownerClass, Type ifc, Class<?> genericIfc) {
 		if (ifc instanceof ParameterizedType) {
 			ParameterizedType paramIfc = (ParameterizedType) ifc;
 			Type rawType = paramIfc.getRawType();
 			if (genericIfc.equals(rawType)) {
 				Type[] typeArgs = paramIfc.getActualTypeArguments();
-				Class[] result = new Class[typeArgs.length];
+				Class<?>[] result = new Class[typeArgs.length];
 				for (int i = 0; i < typeArgs.length; i++) {
 					Type arg = typeArgs[i];
 					result[i] = extractClass(ownerClass, arg);
@@ -299,9 +311,9 @@ else if (ifc != null && genericIfc.isAssignableFrom((Class) ifc)) {
 	}
 
 	/**
-	 * Extract a class instance from given Type.
+	 * Extract a Class from the given Type.
 	 */
-	private static Class extractClass(Class ownerClass, Type arg) {
+	private static Class<?> extractClass(Class<?> ownerClass, Type arg) {
 		if (arg instanceof ParameterizedType) {
 			return extractClass(ownerClass, ((ParameterizedType) arg).getRawType());
 		}
@@ -316,9 +328,12 @@ else if (arg instanceof TypeVariable) {
 			arg = getTypeVariableMap(ownerClass).get(tv);
 			if (arg == null) {
 				arg = extractBoundForTypeVariable(tv);
+				if (arg instanceof ParameterizedType) {
+					return extractClass(ownerClass, ((ParameterizedType) arg).getRawType());
+				}
 			}
 			else {
-				arg = extractClass(ownerClass, arg);
+				return extractClass(ownerClass, arg);
 			}
 		}
 		return (arg instanceof Class ? (Class) arg : Object.class);
@@ -368,7 +383,7 @@ static Type getRawType(Type genericType, Map<TypeVariable, Type> typeVariableMap
 	 * {@link Class concrete classes} for the specified {@link Class}. Searches
 	 * all super types, enclosing types and interfaces.
 	 */
-	public static Map<TypeVariable, Type> getTypeVariableMap(Class clazz) {
+	public static Map<TypeVariable, Type> getTypeVariableMap(Class<?> clazz) {
 		Map<TypeVariable, Type> typeVariableMap = typeVariableCache.get(clazz);
 
 		if (typeVariableMap == null) {
@@ -377,28 +392,37 @@ public static Map<TypeVariable, Type> getTypeVariableMap(Class clazz) {
 			// interfaces
 			extractTypeVariablesFromGenericInterfaces(clazz.getGenericInterfaces(), typeVariableMap);
 
-			// super class
-			Type genericType = clazz.getGenericSuperclass();
-			Class type = clazz.getSuperclass();
-			while (type != null && !Object.class.equals(type)) {
-				if (genericType instanceof ParameterizedType) {
-					ParameterizedType pt = (ParameterizedType) genericType;
-					populateTypeMapFromParameterizedType(pt, typeVariableMap);
+			try {
+				// super class
+				Class<?> type = clazz;
+				while (type.getSuperclass() != null && !Object.class.equals(type.getSuperclass())) {
+					Type genericType = type.getGenericSuperclass();
+					if (genericType instanceof ParameterizedType) {
+						ParameterizedType pt = (ParameterizedType) genericType;
+						populateTypeMapFromParameterizedType(pt, typeVariableMap);
+					}
+					extractTypeVariablesFromGenericInterfaces(type.getSuperclass().getGenericInterfaces(), typeVariableMap);
+					type = type.getSuperclass();
 				}
-				extractTypeVariablesFromGenericInterfaces(type.getGenericInterfaces(), typeVariableMap);
-				genericType = type.getGenericSuperclass();
-				type = type.getSuperclass();
+			}
+			catch (MalformedParameterizedTypeException ex) {
+				// from getGenericSuperclass() - ignore and continue with member class check
 			}
 
-			// enclosing class
-			type = clazz;
-			while (type.isMemberClass()) {
-				genericType = type.getGenericSuperclass();
-				if (genericType instanceof ParameterizedType) {
-					ParameterizedType pt = (ParameterizedType) genericType;
-					populateTypeMapFromParameterizedType(pt, typeVariableMap);
+			try {
+				// enclosing class
+				Class<?> type = clazz;
+				while (type.isMemberClass()) {
+					Type genericType = type.getGenericSuperclass();
+					if (genericType instanceof ParameterizedType) {
+						ParameterizedType pt = (ParameterizedType) genericType;
+						populateTypeMapFromParameterizedType(pt, typeVariableMap);
+					}
+					type = type.getEnclosingClass();
 				}
-				type = type.getEnclosingClass();
+			}
+			catch (MalformedParameterizedTypeException ex) {
+				// from getGenericSuperclass() - ignore and preserve previously accumulated type variables
 			}
 
 			typeVariableCache.put(clazz, typeVariableMap);
diff --git a/spring-core/src/main/java/org/springframework/core/JdkVersion.java b/spring-core/src/main/java/org/springframework/core/JdkVersion.java
index b66c85b9de..a77f75ff52 100644
--- a/spring-core/src/main/java/org/springframework/core/JdkVersion.java
+++ b/spring-core/src/main/java/org/springframework/core/JdkVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,6 +54,11 @@ public abstract class JdkVersion {
 	 */
 	public static final int JAVA_17 = 4;
 
+	/**
+	 * Constant identifying the 1.8 JVM (Java 8).
+	 */
+	public static final int JAVA_18 = 5;
+
 
 	private static final String javaVersion;
 
@@ -62,7 +67,10 @@ public abstract class JdkVersion {
 	static {
 		javaVersion = System.getProperty("java.version");
 		// version String should look like "1.4.2_10"
-		if (javaVersion.contains("1.7.")) {
+		if (javaVersion.contains("1.8.")) {
+			majorJavaVersion = JAVA_18;
+		}
+		else if (javaVersion.contains("1.7.")) {
 			majorJavaVersion = JAVA_17;
 		}
 		else if (javaVersion.contains("1.6.")) {
@@ -87,7 +95,7 @@ public static String getJavaVersion() {
 
 	/**
 	 * Get the major version code. This means we can do things like
-	 * {@code if (getMajorJavaVersion() < JAVA_14)}.
+	 * {@code if (getMajorJavaVersion() >= JAVA_17)}.
 	 * @return a code comparable to the JAVA_XX codes in this class
 	 * @see #JAVA_13
 	 * @see #JAVA_14
diff --git a/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
index 3cab216bf0..151dcb3051 100644
--- a/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
+++ b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@
  */
 public class LocalVariableTableParameterNameDiscoverer implements ParameterNameDiscoverer {
 
-	private static Log logger = LogFactory.getLog(LocalVariableTableParameterNameDiscoverer.class);
+	private static final Log logger = LogFactory.getLog(LocalVariableTableParameterNameDiscoverer.class);
 
 	// marker object for classes that do not have any debug info
 	private static final Map<Member, String[]> NO_DEBUG_INFO_MAP = Collections.emptyMap();
@@ -101,8 +101,8 @@ private Map<Member, String[]> inspectClass(Class<?> clazz) {
 			// We couldn't load the class file, which is not fatal as it
 			// simply means this method of discovering parameter names won't work.
 			if (logger.isDebugEnabled()) {
-				logger.debug("Cannot find '.class' file for class [" + clazz
-						+ "] - unable to determine constructors/methods parameter names");
+				logger.debug("Cannot find '.class' file for class [" + clazz +
+						"] - unable to determine constructor/method parameter names");
 			}
 			return NO_DEBUG_INFO_MAP;
 		}
@@ -114,8 +114,15 @@ private Map<Member, String[]> inspectClass(Class<?> clazz) {
 		}
 		catch (IOException ex) {
 			if (logger.isDebugEnabled()) {
-				logger.debug("Exception thrown while reading '.class' file for class [" + clazz
-						+ "] - unable to determine constructors/methods parameter names", ex);
+				logger.debug("Exception thrown while reading '.class' file for class [" + clazz +
+						"] - unable to determine constructor/method parameter names", ex);
+			}
+		}
+		catch (IllegalArgumentException ex) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("ASM ClassReader failed to parse class file [" + clazz +
+						"], probably due to a new Java class file version that isn't supported yet " +
+						"- unable to determine constructor/method parameter names", ex);
 			}
 		}
 		finally {
@@ -139,6 +146,7 @@ private static class ParameterNameDiscoveringVisitor extends ClassVisitor {
 		private static final String STATIC_CLASS_INIT = "<clinit>";
 
 		private final Class<?> clazz;
+
 		private final Map<Member, String[]> memberMap;
 
 		public ParameterNameDiscoveringVisitor(Class<?> clazz, Map<Member, String[]> memberMap) {
@@ -171,12 +179,17 @@ private static class LocalVariableTableVisitor extends MethodVisitor {
 		private static final String CONSTRUCTOR = "<init>";
 
 		private final Class<?> clazz;
+
 		private final Map<Member, String[]> memberMap;
+
 		private final String name;
+
 		private final Type[] args;
+
+		private final String[] parameterNames;
+
 		private final boolean isStatic;
 
-		private String[] parameterNames;
 		private boolean hasLvtInfo = false;
 
 		/*
@@ -185,25 +198,22 @@ private static class LocalVariableTableVisitor extends MethodVisitor {
 		 */
 		private final int[] lvtSlotIndex;
 
-		public LocalVariableTableVisitor(Class<?> clazz, Map<Member, String[]> map, String name, String desc,
-				boolean isStatic) {
+		public LocalVariableTableVisitor(Class<?> clazz, Map<Member, String[]> map, String name, String desc, boolean isStatic) {
 			super(SpringAsmInfo.ASM_VERSION);
 			this.clazz = clazz;
 			this.memberMap = map;
 			this.name = name;
-			// determine args
-			args = Type.getArgumentTypes(desc);
-			this.parameterNames = new String[args.length];
+			this.args = Type.getArgumentTypes(desc);
+			this.parameterNames = new String[this.args.length];
 			this.isStatic = isStatic;
-			this.lvtSlotIndex = computeLvtSlotIndices(isStatic, args);
+			this.lvtSlotIndex = computeLvtSlotIndices(isStatic, this.args);
 		}
 
 		@Override
-		public void visitLocalVariable(String name, String description, String signature, Label start, Label end,
-				int index) {
+		public void visitLocalVariable(String name, String description, String signature, Label start, Label end, int index) {
 			this.hasLvtInfo = true;
-			for (int i = 0; i < lvtSlotIndex.length; i++) {
-				if (lvtSlotIndex[i] == index) {
+			for (int i = 0; i < this.lvtSlotIndex.length; i++) {
+				if (this.lvtSlotIndex[i] == index) {
 					this.parameterNames[i] = name;
 				}
 			}
@@ -216,27 +226,25 @@ public void visitEnd() {
 				// which doesn't use any local variables.
 				// This means that hasLvtInfo could be false for that kind of methods
 				// even if the class has local variable info.
-				memberMap.put(resolveMember(), parameterNames);
+				this.memberMap.put(resolveMember(), this.parameterNames);
 			}
 		}
 
 		private Member resolveMember() {
-			ClassLoader loader = clazz.getClassLoader();
-			Class<?>[] classes = new Class<?>[args.length];
-
-			// resolve args
-			for (int i = 0; i < args.length; i++) {
-				classes[i] = ClassUtils.resolveClassName(args[i].getClassName(), loader);
+			ClassLoader loader = this.clazz.getClassLoader();
+			Class<?>[] argTypes = new Class<?>[this.args.length];
+			for (int i = 0; i < this.args.length; i++) {
+				argTypes[i] = ClassUtils.resolveClassName(this.args[i].getClassName(), loader);
 			}
 			try {
-				if (CONSTRUCTOR.equals(name)) {
-					return clazz.getDeclaredConstructor(classes);
+				if (CONSTRUCTOR.equals(this.name)) {
+					return this.clazz.getDeclaredConstructor(argTypes);
 				}
-
-				return clazz.getDeclaredMethod(name, classes);
-			} catch (NoSuchMethodException ex) {
-				throw new IllegalStateException("Method [" + name
-						+ "] was discovered in the .class file but cannot be resolved in the class object", ex);
+				return this.clazz.getDeclaredMethod(this.name, argTypes);
+			}
+			catch (NoSuchMethodException ex) {
+				throw new IllegalStateException("Method [" + this.name +
+						"] was discovered in the .class file but cannot be resolved in the class object", ex);
 			}
 		}
 
@@ -247,7 +255,8 @@ private static int[] computeLvtSlotIndices(boolean isStatic, Type[] paramTypes)
 				lvtIndex[i] = nextIndex;
 				if (isWideType(paramTypes[i])) {
 					nextIndex += 2;
-				} else {
+				}
+				else {
 					nextIndex++;
 				}
 			}
diff --git a/spring-core/src/main/java/org/springframework/core/MethodParameter.java b/spring-core/src/main/java/org/springframework/core/MethodParameter.java
index 28e9f90677..70cb78fd09 100644
--- a/spring-core/src/main/java/org/springframework/core/MethodParameter.java
+++ b/spring-core/src/main/java/org/springframework/core/MethodParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,19 +44,19 @@ public class MethodParameter {
 
 	private final Method method;
 
-	private final Constructor constructor;
+	private final Constructor<?> constructor;
 
 	private final int parameterIndex;
 
-	private Class<?> parameterType;
+	private volatile Class<?> parameterType;
 
-	private Type genericParameterType;
+	private volatile Type genericParameterType;
 
-	private Annotation[] parameterAnnotations;
+	private volatile Annotation[] parameterAnnotations;
 
-	private ParameterNameDiscoverer parameterNameDiscoverer;
+	private volatile ParameterNameDiscoverer parameterNameDiscoverer;
 
-	private String parameterName;
+	private volatile String parameterName;
 
 	private int nestingLevel = 1;
 
@@ -65,24 +65,24 @@ public class MethodParameter {
 
 	Map<TypeVariable, Type> typeVariableMap;
 
-	private int hash = 0;
-
 
 	/**
-	 * Create a new MethodParameter for the given method, with nesting level 1.
+	 * Create a new {@code MethodParameter} for the given method, with nesting level 1.
 	 * @param method the Method to specify a parameter for
-	 * @param parameterIndex the index of the parameter
+	 * @param parameterIndex the index of the parameter: -1 for the method
+	 * return type; 0 for the first method parameter; 1 for the second method
+	 * parameter, etc.
 	 */
 	public MethodParameter(Method method, int parameterIndex) {
 		this(method, parameterIndex, 1);
 	}
 
 	/**
-	 * Create a new MethodParameter for the given method.
+	 * Create a new {@code MethodParameter} for the given method.
 	 * @param method the Method to specify a parameter for
-	 * @param parameterIndex the index of the parameter
-	 * (-1 for the method return type; 0 for the first method parameter,
-	 * 1 for the second method parameter, etc)
+	 * @param parameterIndex the index of the parameter: -1 for the method
+	 * return type; 0 for the first method parameter; 1 for the second method
+	 * parameter, etc.
 	 * @param nestingLevel the nesting level of the target type
 	 * (typically 1; e.g. in case of a List of Lists, 1 would indicate the
 	 * nested List, whereas 2 would indicate the element of the nested List)
@@ -100,7 +100,7 @@ public MethodParameter(Method method, int parameterIndex, int nestingLevel) {
 	 * @param constructor the Constructor to specify a parameter for
 	 * @param parameterIndex the index of the parameter
 	 */
-	public MethodParameter(Constructor constructor, int parameterIndex) {
+	public MethodParameter(Constructor<?> constructor, int parameterIndex) {
 		this(constructor, parameterIndex, 1);
 	}
 
@@ -112,7 +112,7 @@ public MethodParameter(Constructor constructor, int parameterIndex) {
 	 * (typically 1; e.g. in case of a List of Lists, 1 would indicate the
 	 * nested List, whereas 2 would indicate the element of the nested List)
 	 */
-	public MethodParameter(Constructor constructor, int parameterIndex, int nestingLevel) {
+	public MethodParameter(Constructor<?> constructor, int parameterIndex, int nestingLevel) {
 		Assert.notNull(constructor, "Constructor must not be null");
 		this.constructor = constructor;
 		this.parameterIndex = parameterIndex;
@@ -138,7 +138,6 @@ public MethodParameter(MethodParameter original) {
 		this.nestingLevel = original.nestingLevel;
 		this.typeIndexesPerLevel = original.typeIndexesPerLevel;
 		this.typeVariableMap = original.typeVariableMap;
-		this.hash = original.hash;
 	}
 
 
@@ -156,36 +155,36 @@ public Method getMethod() {
 	 * <p>Note: Either Method or Constructor is available.
 	 * @return the Constructor, or {@code null} if none
 	 */
-	public Constructor getConstructor() {
+	public Constructor<?> getConstructor() {
 		return this.constructor;
 	}
 
 	/**
-	 * Returns the wrapped member.
-	 * @return the member
+	 * Return the class that declares the underlying Method or Constructor.
 	 */
-	private Member getMember() {
-		return this.method != null ? this.method : this.constructor;
+	public Class<?> getDeclaringClass() {
+		return getMember().getDeclaringClass();
 	}
 
 	/**
-	 * Returns the wrapped annotated element.
-	 * @return the annotated element
+	 * Return the wrapped member.
+	 * @return the Method or Constructor as Member
 	 */
-	private AnnotatedElement getAnnotatedElement() {
-		return this.method != null ? this.method : this.constructor;
+	private Member getMember() {
+		return (this.method != null ? this.method : this.constructor);
 	}
 
 	/**
-	 * Return the class that declares the underlying Method or Constructor.
+	 * Return the wrapped annotated element.
+	 * @return the Method or Constructor as AnnotatedElement
 	 */
-	public Class getDeclaringClass() {
-		return getMember().getDeclaringClass();
+	private AnnotatedElement getAnnotatedElement() {
+		return (this.method != null ? this.method : this.constructor);
 	}
 
 	/**
 	 * Return the index of the method/constructor parameter.
-	 * @return the parameter index (never negative)
+	 * @return the parameter index (-1 in case of the return type)
 	 */
 	public int getParameterIndex() {
 		return this.parameterIndex;
@@ -219,6 +218,7 @@ public Class<?> getParameterType() {
 	/**
 	 * Return the generic type of the method/constructor parameter.
 	 * @return the parameter type (never {@code null})
+	 * @since 3.0
 	 */
 	public Type getGenericParameterType() {
 		if (this.genericParameterType == null) {
@@ -234,6 +234,12 @@ public Type getGenericParameterType() {
 		return this.genericParameterType;
 	}
 
+	/**
+	 * Return the nested type of the method/constructor parameter.
+	 * @return the parameter type (never {@code null})
+	 * @since 3.1
+	 * @see #getNestingLevel()
+	 */
 	public Class<?> getNestedParameterType() {
 		if (this.nestingLevel > 1) {
 			Type type = getGenericParameterType();
@@ -241,12 +247,12 @@ public Class<?> getNestedParameterType() {
 				Integer index = getTypeIndexForCurrentLevel();
 				Type arg = ((ParameterizedType) type).getActualTypeArguments()[index != null ? index : 0];
 				if (arg instanceof Class) {
-					return (Class) arg;
+					return (Class<?>) arg;
 				}
 				else if (arg instanceof ParameterizedType) {
 					arg = ((ParameterizedType) arg).getRawType();
 					if (arg instanceof Class) {
-						return (Class) arg;
+						return (Class<?>) arg;
 					}
 				}
 			}
@@ -338,10 +344,10 @@ public void initParameterNameDiscovery(ParameterNameDiscoverer parameterNameDisc
 	 * has been set to begin with)
 	 */
 	public String getParameterName() {
-		if (this.parameterNameDiscoverer != null) {
+		ParameterNameDiscoverer discoverer = this.parameterNameDiscoverer;
+		if (discoverer != null) {
 			String[] parameterNames = (this.method != null ?
-					this.parameterNameDiscoverer.getParameterNames(this.method) :
-					this.parameterNameDiscoverer.getParameterNames(this.constructor));
+					discoverer.getParameterNames(this.method) : discoverer.getParameterNames(this.constructor));
 			if (parameterNames != null) {
 				this.parameterName = parameterNames[this.parameterIndex];
 			}
@@ -417,35 +423,20 @@ private Map<Integer, Integer> getTypeIndexesPerLevel() {
 	}
 
 	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
+	public boolean equals(Object other) {
+		if (this == other) {
 			return true;
 		}
-		if (obj != null && obj instanceof MethodParameter) {
-			MethodParameter other = (MethodParameter) obj;
-
-			if (this.parameterIndex != other.parameterIndex) {
-				return false;
-			}
-			else if (this.getMember().equals(other.getMember())) {
-				return true;
-			}
-			else {
-				return false;
-			}
+		if (!(other instanceof MethodParameter)) {
+			return false;
 		}
-		return false;
+		MethodParameter otherParam = (MethodParameter) other;
+		return (this.parameterIndex == otherParam.parameterIndex && getMember().equals(otherParam.getMember()));
 	}
 
 	@Override
 	public int hashCode() {
-		int result = this.hash;
-		if (result == 0) {
-			result = getMember().hashCode();
-			result = 31 * result + this.parameterIndex;
-			this.hash = result;
-		}
-		return result;
+		return (getMember().hashCode() * 31 + this.parameterIndex);
 	}
 
 
@@ -462,7 +453,7 @@ public static MethodParameter forMethodOrConstructor(Object methodOrConstructor,
 			return new MethodParameter((Method) methodOrConstructor, parameterIndex);
 		}
 		else if (methodOrConstructor instanceof Constructor) {
-			return new MethodParameter((Constructor) methodOrConstructor, parameterIndex);
+			return new MethodParameter((Constructor<?>) methodOrConstructor, parameterIndex);
 		}
 		else {
 			throw new IllegalArgumentException(
diff --git a/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java b/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java
index 520c8bc9ac..8d20d81f88 100644
--- a/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java
+++ b/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java
@@ -110,7 +110,7 @@ public Throwable getMostSpecificCause() {
 	 * @param exType the exception type to look for
 	 * @return whether there is a nested exception of the specified type
 	 */
-	public boolean contains(Class exType) {
+	public boolean contains(Class<?> exType) {
 		if (exType == null) {
 			return false;
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java b/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java
index 88204140f3..d7165b3ee3 100644
--- a/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java
+++ b/spring-core/src/main/java/org/springframework/core/ParameterizedTypeReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 /**
  * The purpose of this class is to enable capturing and passing a generic
  * {@link Type}. In order to capture the generic type and retain it at runtime,
- * you need to create a sub-class as follows:
+ * you need to create a subclass as follows:
  *
  * <pre class="code">
  * ParameterizedTypeReference&lt;List&lt;String&gt;&gt; typeRef = new ParameterizedTypeReference&lt;List&lt;String&gt;&gt;() {};
@@ -37,54 +37,31 @@
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  * @since 3.2
- *
  * @see <a href="http://gafter.blogspot.nl/2006/12/super-type-tokens.html">Neal Gafter on Super Type Tokens</a>
  */
 public abstract class ParameterizedTypeReference<T> {
 
 	private final Type type;
 
-	protected ParameterizedTypeReference() {
-		Class<?> parameterizedTypeReferenceSubClass = findParameterizedTypeReferenceSubClass(getClass());
 
-		Type type = parameterizedTypeReferenceSubClass.getGenericSuperclass();
+	protected ParameterizedTypeReference() {
+		Class<?> parameterizedTypeReferenceSubclass = findParameterizedTypeReferenceSubclass(getClass());
+		Type type = parameterizedTypeReferenceSubclass.getGenericSuperclass();
 		Assert.isInstanceOf(ParameterizedType.class, type);
-
 		ParameterizedType parameterizedType = (ParameterizedType) type;
 		Assert.isTrue(parameterizedType.getActualTypeArguments().length == 1);
-
 		this.type = parameterizedType.getActualTypeArguments()[0];
 	}
 
-	private static Class<?> findParameterizedTypeReferenceSubClass(Class<?> child) {
-
-		Class<?> parent = child.getSuperclass();
-
-		if (Object.class.equals(parent)) {
-			throw new IllegalStateException("Expected ParameterizedTypeReference superclass");
-		}
-		else if (ParameterizedTypeReference.class.equals(parent)) {
-			return child;
-		}
-		else {
-			return findParameterizedTypeReferenceSubClass(parent);
-		}
-	}
 
 	public Type getType() {
 		return this.type;
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o instanceof ParameterizedTypeReference) {
-			ParameterizedTypeReference<?> other = (ParameterizedTypeReference<?>) o;
-			return this.type.equals(other.type);
-		}
-		return false;
+	public boolean equals(Object obj) {
+		return (this == obj || (obj instanceof ParameterizedTypeReference &&
+				this.type.equals(((ParameterizedTypeReference) obj).type)));
 	}
 
 	@Override
@@ -96,4 +73,19 @@ public int hashCode() {
 	public String toString() {
 		return "ParameterizedTypeReference<" + this.type + ">";
 	}
+
+
+	private static Class<?> findParameterizedTypeReferenceSubclass(Class<?> child) {
+		Class<?> parent = child.getSuperclass();
+		if (Object.class.equals(parent)) {
+			throw new IllegalStateException("Expected ParameterizedTypeReference superclass");
+		}
+		else if (ParameterizedTypeReference.class.equals(parent)) {
+			return child;
+		}
+		else {
+			return findParameterizedTypeReferenceSubclass(parent);
+		}
+	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/SpringProperties.java b/spring-core/src/main/java/org/springframework/core/SpringProperties.java
new file mode 100644
index 0000000000..f0b25d6d3b
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/SpringProperties.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.core;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Properties;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Static holder for local Spring properties, i.e. defined at the Spring library level.
+ *
+ * <p>Reads a {@code spring.properties} file from the root of the Spring library classpath,
+ * and also allows for programmatically setting properties through {@link #setProperty}.
+ * When checking a property, local entries are being checked first, then falling back
+ * to JVM-level system properties through a {@link System#getProperty} check.
+ *
+ * <p>This is an alternative way to set Spring-related system properties such as
+ * "spring.getenv.ignore" and "spring.beaninfo.ignore", in particular for scenarios
+ * where JVM system properties are locked on the target platform (e.g. WebSphere).
+ * See {@link #setFlag} for a convenient way to locally set such flags to "true".
+ *
+ * @author Juergen Hoeller
+ * @since 3.2.7
+ * @see org.springframework.core.env.AbstractEnvironment#IGNORE_GETENV_PROPERTY_NAME
+ * @see org.springframework.beans.CachedIntrospectionResults#IGNORE_BEANINFO_PROPERTY_NAME
+ * @see org.springframework.jdbc.core.StatementCreatorUtils#IGNORE_GETPARAMETERTYPE_PROPERTY_NAME
+ */
+public abstract class SpringProperties {
+
+	private static final String PROPERTIES_RESOURCE_LOCATION = "spring.properties";
+
+	private static final Log logger = LogFactory.getLog(SpringProperties.class);
+
+	private static final Properties localProperties = new Properties();
+
+
+	static {
+		try {
+			ClassLoader cl = SpringProperties.class.getClassLoader();
+			URL url = (cl != null ? cl.getResource(PROPERTIES_RESOURCE_LOCATION) :
+					ClassLoader.getSystemResource(PROPERTIES_RESOURCE_LOCATION));
+			if (url != null) {
+				logger.info("Found 'spring.properties' file in local classpath");
+				InputStream is = url.openStream();
+				try {
+					localProperties.load(is);
+				}
+				finally {
+					is.close();
+				}
+			}
+		}
+		catch (IOException ex) {
+			if (logger.isInfoEnabled()) {
+				logger.info("Could not load 'spring.properties' file from local classpath: " + ex);
+			}
+		}
+	}
+
+
+	/**
+	 * Programmatically set a local property, overriding an entry in the
+	 * {@code spring.properties} file (if any).
+	 * @param key the property key
+	 * @param value the associated property value, or {@code null} to reset it
+	 */
+	public static void setProperty(String key, String value) {
+		if (value != null) {
+			localProperties.setProperty(key, value);
+		}
+		else {
+			localProperties.remove(key);
+		}
+	}
+
+	/**
+	 * Retrieve the property value for the given key, checking local Spring
+	 * properties first and falling back to JVM-level system properties.
+	 * @param key the property key
+	 * @return the associated property value, or {@code null} if none found
+	 */
+	public static String getProperty(String key) {
+		String value = localProperties.getProperty(key);
+		if (value == null) {
+			try {
+				value = System.getProperty(key);
+			}
+			catch (Throwable ex) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("Could not retrieve system property '" + key + "': " + ex);
+				}
+			}
+		}
+		return value;
+	}
+
+	/**
+	 * Programmatically set a local flag to "true", overriding an
+	 * entry in the {@code spring.properties} file (if any).
+	 * @param key the property key
+	 */
+	public static void setFlag(String key) {
+		localProperties.put(key, Boolean.TRUE.toString());
+	}
+
+	/**
+	 * Retrieve the flag for the given property key.
+	 * @param key the property key
+	 * @return {@code true} if the property is set to "true",
+	 * {@code} false otherwise
+	 */
+	public static boolean getFlag(String key) {
+		return Boolean.parseBoolean(getProperty(key));
+	}
+
+}
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java
index c9d1fe47c5..19ba5fec9a 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java
@@ -51,7 +51,7 @@ protected int getOrder(Object obj) {
 		}
 		if (obj != null) {
 			Class<?> clazz = (obj instanceof Class ? (Class) obj : obj.getClass());
-			Order order = clazz.getAnnotation(Order.class);
+			Order order = AnnotationUtils.findAnnotation(clazz, Order.class);
 			if (order != null) {
 				return order.value();
 			}
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
index e177856e82..3b4def636d 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
-
 import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
 
 import org.springframework.core.BridgeMethodResolver;
 import org.springframework.util.Assert;
+import org.springframework.util.ReflectionUtils;
 
 /**
  * General utility methods for working with annotations, handling bridge methods (which the compiler
@@ -61,8 +61,8 @@ public abstract class AnnotationUtils {
 	 * Method, Constructor or Field. Meta-annotations will be searched if the annotation
 	 * is not declared locally on the supplied element.
 	 * @param ae the Method, Constructor or Field from which to get the annotation
-	 * @param annotationType the annotation class to look for, both locally and as a meta-annotation
-	 * @return the matching annotation or {@code null} if not found
+	 * @param annotationType the annotation type to look for, both locally and as a meta-annotation
+	 * @return the matching annotation, or {@code null} if none found
 	 * @since 3.1
 	 */
 	public static <T extends Annotation> T getAnnotation(AnnotatedElement ae, Class<T> annotationType) {
@@ -93,7 +93,7 @@ public static Annotation[] getAnnotations(Method method) {
 	 * Get a single {@link Annotation} of {@code annotationType} from the supplied {@link Method}.
 	 * <p>Correctly handles bridge {@link Method Methods} generated by the compiler.
 	 * @param method the method to look for annotations on
-	 * @param annotationType the annotation class to look for
+	 * @param annotationType the annotation type to look for
 	 * @return the annotations found
 	 * @see org.springframework.core.BridgeMethodResolver#findBridgedMethod(Method)
 	 */
@@ -116,29 +116,29 @@ public static <A extends Annotation> A getAnnotation(Method method, Class<A> ann
 	 * traversing its super methods if no annotation can be found on the given method itself.
 	 * <p>Annotations on methods are not inherited by default, so we need to handle this explicitly.
 	 * @param method the method to look for annotations on
-	 * @param annotationType the annotation class to look for
-	 * @return the annotation found, or {@code null} if none found
+	 * @param annotationType the annotation type to look for
+	 * @return the annotation found, or {@code null} if none
 	 */
 	public static <A extends Annotation> A findAnnotation(Method method, Class<A> annotationType) {
 		A annotation = getAnnotation(method, annotationType);
-		Class<?> cl = method.getDeclaringClass();
+		Class<?> clazz = method.getDeclaringClass();
 		if (annotation == null) {
-			annotation = searchOnInterfaces(method, annotationType, cl.getInterfaces());
+			annotation = searchOnInterfaces(method, annotationType, clazz.getInterfaces());
 		}
 		while (annotation == null) {
-			cl = cl.getSuperclass();
-			if (cl == null || cl == Object.class) {
+			clazz = clazz.getSuperclass();
+			if (clazz == null || clazz.equals(Object.class)) {
 				break;
 			}
 			try {
-				Method equivalentMethod = cl.getDeclaredMethod(method.getName(), method.getParameterTypes());
+				Method equivalentMethod = clazz.getDeclaredMethod(method.getName(), method.getParameterTypes());
 				annotation = getAnnotation(equivalentMethod, annotationType);
 			}
 			catch (NoSuchMethodException ex) {
 				// No equivalent method found
 			}
 			if (annotation == null) {
-				annotation = searchOnInterfaces(method, annotationType, cl.getInterfaces());
+				annotation = searchOnInterfaces(method, annotationType, clazz.getInterfaces());
 			}
 		}
 		return annotation;
@@ -193,7 +193,7 @@ private static boolean isInterfaceWithAnnotatedMethods(Class<?> iface) {
 	 * with the interfaces that the superclass declares. Recursing up through the entire superclass
 	 * hierarchy if no match is found.
 	 * @param clazz the class to look for annotations on
-	 * @param annotationType the annotation class to look for
+	 * @param annotationType the annotation type to look for
 	 * @return the annotation found, or {@code null} if none found
 	 */
 	public static <A extends Annotation> A findAnnotation(Class<?> clazz, Class<A> annotationType) {
@@ -216,11 +216,11 @@ public static <A extends Annotation> A findAnnotation(Class<?> clazz, Class<A> a
 				}
 			}
 		}
-		Class<?> superClass = clazz.getSuperclass();
-		if (superClass == null || superClass == Object.class) {
+		Class<?> superclass = clazz.getSuperclass();
+		if (superclass == null || superclass.equals(Object.class)) {
 			return null;
 		}
-		return findAnnotation(superClass, annotationType);
+		return findAnnotation(superclass, annotationType);
 	}
 
 	/**
@@ -233,9 +233,8 @@ public static <A extends Annotation> A findAnnotation(Class<?> clazz, Class<A> a
 	 * <p>The standard {@link Class} API does not provide a mechanism for determining which class
 	 * in an inheritance hierarchy actually declares an {@link Annotation}, so we need to handle
 	 * this explicitly.
-	 * @param annotationType the Class object corresponding to the annotation type
-	 * @param clazz the Class object corresponding to the class on which to check for the annotation,
-	 * or {@code null}
+	 * @param annotationType the annotation type to look for, both locally and as a meta-annotation
+	 * @param clazz the class on which to check for the annotation (may be {@code null})
 	 * @return the first {@link Class} in the inheritance hierarchy of the specified {@code clazz}
 	 * which declares an annotation for the specified {@code annotationType}, or {@code null}
 	 * if not found
@@ -249,8 +248,10 @@ public static Class<?> findAnnotationDeclaringClass(Class<? extends Annotation>
 		if (clazz == null || clazz.equals(Object.class)) {
 			return null;
 		}
-		return (isAnnotationDeclaredLocally(annotationType, clazz)) ? clazz : findAnnotationDeclaringClass(
-			annotationType, clazz.getSuperclass());
+		if (isAnnotationDeclaredLocally(annotationType, clazz)) {
+			return clazz;
+		}
+		return findAnnotationDeclaringClass(annotationType, clazz.getSuperclass());
 	}
 
 	/**
@@ -273,25 +274,22 @@ public static Class<?> findAnnotationDeclaringClass(Class<? extends Annotation>
 	 * @return the first {@link Class} in the inheritance hierarchy of the specified
 	 * {@code clazz} which declares an annotation of at least one of the specified
 	 * {@code annotationTypes}, or {@code null} if not found
+	 * @since 3.2.2
 	 * @see Class#isAnnotationPresent(Class)
 	 * @see Class#getDeclaredAnnotations()
 	 * @see #findAnnotationDeclaringClass(Class, Class)
 	 * @see #isAnnotationDeclaredLocally(Class, Class)
-	 * @since 3.2.2
 	 */
-	public static Class<?> findAnnotationDeclaringClassForTypes(List<Class<? extends Annotation>> annotationTypes,
-			Class<?> clazz) {
+	public static Class<?> findAnnotationDeclaringClassForTypes(List<Class<? extends Annotation>> annotationTypes, Class<?> clazz) {
 		Assert.notEmpty(annotationTypes, "The list of annotation types must not be empty");
 		if (clazz == null || clazz.equals(Object.class)) {
 			return null;
 		}
-
 		for (Class<? extends Annotation> annotationType : annotationTypes) {
 			if (isAnnotationDeclaredLocally(annotationType, clazz)) {
 				return clazz;
 			}
 		}
-
 		return findAnnotationDeclaringClassForTypes(annotationTypes, clazz.getSuperclass());
 	}
 
@@ -417,14 +415,13 @@ else if (value instanceof Class[]) {
 					}
 					if (nestedAnnotationsAsMap && value instanceof Annotation) {
 						attrs.put(method.getName(),
-							getAnnotationAttributes((Annotation) value, classValuesAsString, nestedAnnotationsAsMap));
+							getAnnotationAttributes((Annotation) value, classValuesAsString, true));
 					}
 					else if (nestedAnnotationsAsMap && value instanceof Annotation[]) {
 						Annotation[] realAnnotations = (Annotation[]) value;
 						AnnotationAttributes[] mappedAnnotations = new AnnotationAttributes[realAnnotations.length];
 						for (int i = 0; i < realAnnotations.length; i++) {
-							mappedAnnotations[i] = getAnnotationAttributes(realAnnotations[i], classValuesAsString,
-								nestedAnnotationsAsMap);
+							mappedAnnotations[i] = getAnnotationAttributes(realAnnotations[i], classValuesAsString, true);
 						}
 						attrs.put(method.getName(), mappedAnnotations);
 					}
@@ -460,7 +457,8 @@ public static Object getValue(Annotation annotation) {
 	 */
 	public static Object getValue(Annotation annotation, String attributeName) {
 		try {
-			Method method = annotation.annotationType().getDeclaredMethod(attributeName, new Class[0]);
+			Method method = annotation.annotationType().getDeclaredMethod(attributeName);
+			ReflectionUtils.makeAccessible(method);
 			return method.invoke(annotation);
 		}
 		catch (Exception ex) {
@@ -510,8 +508,7 @@ public static Object getDefaultValue(Class<? extends Annotation> annotationType)
 	 */
 	public static Object getDefaultValue(Class<? extends Annotation> annotationType, String attributeName) {
 		try {
-			Method method = annotationType.getDeclaredMethod(attributeName, new Class[0]);
-			return method.getDefaultValue();
+			return annotationType.getDeclaredMethod(attributeName).getDefaultValue();
 		}
 		catch (Exception ex) {
 			return null;
diff --git a/spring-core/src/main/java/org/springframework/core/convert/ConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/ConversionService.java
index 84756278b2..382e5ad353 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/ConversionService.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/ConversionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,54 +27,63 @@
 public interface ConversionService {
 
 	/**
-	 * Returns true if objects of sourceType can be converted to targetType.
-	 * If this method returns true, it means {@link #convert(Object, Class)} is capable of converting an instance of sourceType to targetType.
-	 * Special note on collections, arrays, and maps types:
-	 * For conversion between collection, array, and map types, this method will return 'true'
-	 * even though a convert invocation may still generate a {@link ConversionException} if the underlying elements are not convertible.
-	 * Callers are expected to handle this exceptional case when working with collections and maps.
-	 * @param sourceType the source type to convert from (may be null if source is null)
+	 * Return {@code true} if objects of {@code sourceType} can be converted to the {@code targetType}.
+	 * <p>If this method returns {@code true}, it means {@link #convert(Object, Class)} is capable
+	 * of converting an instance of {@code sourceType} to {@code targetType}.
+	 * <p>Special note on collections, arrays, and maps types:
+	 * For conversion between collection, array, and map types, this method will return {@code true}
+	 * even though a convert invocation may still generate a {@link ConversionException} if the
+	 * underlying elements are not convertible. Callers are expected to handle this exceptional case
+	 * when working with collections and maps.
+	 * @param sourceType the source type to convert from (may be {@code null} if source is {@code null})
 	 * @param targetType the target type to convert to (required)
-	 * @return true if a conversion can be performed, false if not
-	 * @throws IllegalArgumentException if targetType is null
+	 * @return {@code true} if a conversion can be performed, {@code false} if not
+	 * @throws IllegalArgumentException if {@code targetType} is {@code null}
 	 */
 	boolean canConvert(Class<?> sourceType, Class<?> targetType);
 
 	/**
-	 * Returns true if objects of sourceType can be converted to the targetType.
-	 * The TypeDescriptors provide additional context about the source and target locations where conversion would occur, often object fields or property locations.
-	 * If this method returns true, it means {@link #convert(Object, TypeDescriptor, TypeDescriptor)} is capable of converting an instance of sourceType to targetType.
-	 * Special note on collections, arrays, and maps types:
-	 * For conversion between collection, array, and map types, this method will return 'true'
-	 * even though a convert invocation may still generate a {@link ConversionException} if the underlying elements are not convertible.
-	 * Callers are expected to handle this exceptional case when working with collections and maps.
-	 * @param sourceType context about the source type to convert from (may be null if source is null)
+	 * Return {@code true} if objects of {@code sourceType} can be converted to the {@code targetType}.
+	 * The TypeDescriptors provide additional context about the source and target locations
+	 * where conversion would occur, often object fields or property locations.
+	 * <p>If this method returns {@code true}, it means {@link #convert(Object, TypeDescriptor, TypeDescriptor)}
+	 * is capable of converting an instance of {@code sourceType} to {@code targetType}.
+	 * <p>Special note on collections, arrays, and maps types:
+	 * For conversion between collection, array, and map types, this method will return {@code true}
+	 * even though a convert invocation may still generate a {@link ConversionException} if the
+	 * underlying elements are not convertible. Callers are expected to handle this exceptional case
+	 * when working with collections and maps.
+	 * @param sourceType context about the source type to convert from
+	 * (may be {@code null} if source is {@code null})
 	 * @param targetType context about the target type to convert to (required)
-	 * @return true if a conversion can be performed between the source and target types, false if not
-	 * @throws IllegalArgumentException if targetType is null
+	 * @return {@code true} if a conversion can be performed between the source and target types,
+	 * {@code false} if not
+	 * @throws IllegalArgumentException if {@code targetType} is {@code null}
 	 */
 	boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType);
 
 	/**
-	 * Convert the source to targetType.
-	 * @param source the source object to convert (may be null)
+	 * Convert the given {@code source} to the specified {@code targetType}.
+	 * @param source the source object to convert (may be {@code null})
 	 * @param targetType the target type to convert to (required)
 	 * @return the converted object, an instance of targetType
 	 * @throws ConversionException if a conversion exception occurred
-	 * @throws IllegalArgumentException if targetType is null
+	 * @throws IllegalArgumentException if targetType is {@code null}
 	 */
 	<T> T convert(Object source, Class<T> targetType);
 
 	/**
-	 * Convert the source to targetType.
-	 * The TypeDescriptors provide additional context about the source and target locations where conversion will occur, often object fields or property locations.
-	 * @param source the source object to convert (may be null)
-	 * @param sourceType context about the source type converting from (may be null if source is null)
+	 * Convert the given {@code source} to the specified {@code targetType}.
+	 * The TypeDescriptors provide additional context about the source and target locations
+	 * where conversion will occur, often object fields or property locations.
+	 * @param source the source object to convert (may be {@code null})
+	 * @param sourceType context about the source type to convert from
+	 * (may be {@code null} if source is {@code null})
 	 * @param targetType context about the target type to convert to (required)
-	 * @return the converted object, an instance of {@link TypeDescriptor#getObjectType() targetType}</code>
+	 * @return the converted object, an instance of {@link TypeDescriptor#getObjectType() targetType}
 	 * @throws ConversionException if a conversion exception occurred
-	 * @throws IllegalArgumentException if targetType is null
-	 * @throws IllegalArgumentException if sourceType is null but source is not null
+	 * @throws IllegalArgumentException if targetType is {@code null},
+	 * or {@code sourceType} is {@code null} but source is not {@code null}
 	 */
 	Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType);
 
diff --git a/spring-core/src/main/java/org/springframework/core/convert/ParameterDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/ParameterDescriptor.java
index 773464c8a1..c4ccebe7b4 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/ParameterDescriptor.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/ParameterDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,9 +32,6 @@ class ParameterDescriptor extends AbstractDescriptor {
 
 	public ParameterDescriptor(MethodParameter methodParameter) {
 		super(methodParameter.getParameterType());
-		if (methodParameter.getNestingLevel() != 1) {
-			throw new IllegalArgumentException("MethodParameter argument must have its nestingLevel set to 1");
-		}
 		this.methodParameter = methodParameter;
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/convert/Property.java b/spring-core/src/main/java/org/springframework/core/convert/Property.java
index 11dc4ec4d8..84258e9d96 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/Property.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,6 +62,7 @@ public final class Property {
 
 	private Annotation[] annotations;
 
+
 	public Property(Class<?> objectType, Method readMethod, Method writeMethod) {
 		this(objectType, readMethod, writeMethod, null);
 	}
@@ -118,7 +119,7 @@ MethodParameter getMethodParameter() {
 	}
 
 	Annotation[] getAnnotations() {
-		if(this.annotations == null) {
+		if (this.annotations == null) {
 			this.annotations = resolveAnnotations();
 		}
 		return this.annotations;
@@ -192,7 +193,7 @@ private MethodParameter resolveParameterType(MethodParameter parameter) {
 
 	private Annotation[] resolveAnnotations() {
 		Annotation[] annotations = annotationCache.get(this);
-		if(annotations == null) {
+		if (annotations == null) {
 			Map<Class<? extends Annotation>, Annotation> annotationMap = new LinkedHashMap<Class<? extends Annotation>, Annotation>();
 			addAnnotationsToMap(annotationMap, getReadMethod());
 			addAnnotationsToMap(annotationMap, getWriteMethod());
@@ -241,34 +242,25 @@ private Class<?> declaringClass() {
 		}
 	}
 
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int hashCode = 1;
-		hashCode = prime * hashCode + ObjectUtils.nullSafeHashCode(objectType);
-		hashCode = prime * hashCode + ObjectUtils.nullSafeHashCode(readMethod);
-		hashCode = prime * hashCode + ObjectUtils.nullSafeHashCode(writeMethod);
-		hashCode = prime * hashCode + ObjectUtils.nullSafeHashCode(name);
-		return hashCode;
-	}
 
 	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
+	public boolean equals(Object other) {
+		if (this == other) {
 			return true;
 		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
+		if (!(other instanceof Property)) {
 			return false;
 		}
-		Property other = (Property) obj;
-		boolean equals = true;
-		equals &= ObjectUtils.nullSafeEquals(objectType, other.objectType);
-		equals &= ObjectUtils.nullSafeEquals(readMethod, other.readMethod);
-		equals &= ObjectUtils.nullSafeEquals(writeMethod, other.writeMethod);
-		equals &= ObjectUtils.nullSafeEquals(name, other.name);
-		return equals;
+		Property otherProperty = (Property) other;
+		return (ObjectUtils.nullSafeEquals(this.objectType, otherProperty.objectType) &&
+				ObjectUtils.nullSafeEquals(this.name, otherProperty.name) &&
+				ObjectUtils.nullSafeEquals(this.readMethod, otherProperty.readMethod) &&
+				ObjectUtils.nullSafeEquals(this.writeMethod, otherProperty.writeMethod));
 	}
+
+	@Override
+	public int hashCode() {
+		return (ObjectUtils.nullSafeHashCode(this.objectType) * 31 + ObjectUtils.nullSafeHashCode(this.name));
+	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
index 79c134e7cf..39d0f84792 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.core.convert;
 
+import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
@@ -38,11 +39,12 @@
  * @author Sam Brannen
  * @since 3.0
  */
-public class TypeDescriptor {
+@SuppressWarnings("serial")
+public class TypeDescriptor implements Serializable {
 
 	static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0];
 
-	private static final Map<Class<?>, TypeDescriptor> typeDescriptorCache = new HashMap<Class<?>, TypeDescriptor>();
+	private static final Map<Class<?>, TypeDescriptor> typeDescriptorCache = new HashMap<Class<?>, TypeDescriptor>(18);
 
 	static {
 		typeDescriptorCache.put(boolean.class, new TypeDescriptor(boolean.class));
@@ -51,17 +53,18 @@ public class TypeDescriptor {
 		typeDescriptorCache.put(Byte.class, new TypeDescriptor(Byte.class));
 		typeDescriptorCache.put(char.class, new TypeDescriptor(char.class));
 		typeDescriptorCache.put(Character.class, new TypeDescriptor(Character.class));
-		typeDescriptorCache.put(short.class, new TypeDescriptor(short.class));
-		typeDescriptorCache.put(Short.class, new TypeDescriptor(Short.class));
+		typeDescriptorCache.put(double.class, new TypeDescriptor(double.class));
+		typeDescriptorCache.put(Double.class, new TypeDescriptor(Double.class));
 		typeDescriptorCache.put(int.class, new TypeDescriptor(int.class));
 		typeDescriptorCache.put(Integer.class, new TypeDescriptor(Integer.class));
 		typeDescriptorCache.put(long.class, new TypeDescriptor(long.class));
 		typeDescriptorCache.put(Long.class, new TypeDescriptor(Long.class));
 		typeDescriptorCache.put(float.class, new TypeDescriptor(float.class));
 		typeDescriptorCache.put(Float.class, new TypeDescriptor(Float.class));
-		typeDescriptorCache.put(double.class, new TypeDescriptor(double.class));
-		typeDescriptorCache.put(Double.class, new TypeDescriptor(Double.class));
+		typeDescriptorCache.put(short.class, new TypeDescriptor(short.class));
+		typeDescriptorCache.put(Short.class, new TypeDescriptor(Short.class));
 		typeDescriptorCache.put(String.class, new TypeDescriptor(String.class));
+		typeDescriptorCache.put(Object.class, new TypeDescriptor(Object.class));
 	}
 
 
@@ -117,6 +120,9 @@ public TypeDescriptor(Property property) {
 	 * @return the type descriptor
 	 */
 	public static TypeDescriptor valueOf(Class<?> type) {
+		if (type == null) {
+			type = Object.class;
+		}
 		TypeDescriptor desc = typeDescriptorCache.get(type);
 		return (desc != null ? desc : new TypeDescriptor(type));
 	}
@@ -143,8 +149,10 @@ public static TypeDescriptor collection(Class<?> collectionType, TypeDescriptor
 	/**
 	 * Create a new type descriptor from a {@link java.util.Map} type.
 	 * <p>Useful for converting to typed Maps.
-	 * <p>For example, a Map&lt;String, String&gt; could be converted to a Map&lt;Id, EmailAddress&gt; by converting to a targetType built with this method:
-	 * The method call to construct such a TypeDescriptor would look something like: map(Map.class, TypeDescriptor.valueOf(Id.class), TypeDescriptor.valueOf(EmailAddress.class));
+	 * <p>For example, a Map&lt;String, String&gt; could be converted to a Map&lt;Id, EmailAddress&gt;
+	 * by converting to a targetType built with this method:
+	 * The method call to construct such a TypeDescriptor would look something like:
+	 * map(Map.class, TypeDescriptor.valueOf(Id.class), TypeDescriptor.valueOf(EmailAddress.class));
 	 * @param mapType the map type, which must implement {@link Map}
 	 * @param keyTypeDescriptor a descriptor for the map's key type, used to convert map keys
 	 * @param valueTypeDescriptor the map's value type, used to convert map values
@@ -166,7 +174,7 @@ public static TypeDescriptor map(Class<?> mapType, TypeDescriptor keyTypeDescrip
 	 * @since 3.2.1
 	 */
 	public static TypeDescriptor array(TypeDescriptor elementTypeDescriptor) {
-		if(elementTypeDescriptor == null) {
+		if (elementTypeDescriptor == null) {
 			return null;
 		}
 		Class<?> type = Array.newInstance(elementTypeDescriptor.getType(), 0).getClass();
@@ -192,13 +200,13 @@ public static TypeDescriptor array(TypeDescriptor elementTypeDescriptor) {
 	 * @return the nested type descriptor at the specified nesting level, or null
 	 * if it could not be obtained
 	 * @throws IllegalArgumentException if the nesting level of the input
-	 * {@link MethodParameter} argument is not 1
-	 * @throws IllegalArgumentException if the types up to the specified nesting
-	 * level are not of collection, array, or map types
+	 * {@link MethodParameter} argument is not 1, or if the types up to the
+	 * specified nesting level are not of collection, array, or map types
 	 */
 	public static TypeDescriptor nested(MethodParameter methodParameter, int nestingLevel) {
 		if (methodParameter.getNestingLevel() != 1) {
-			throw new IllegalArgumentException("methodParameter nesting level must be 1: use the nestingLevel parameter to specify the desired nestingLevel for nested type traversal");
+			throw new IllegalArgumentException("methodParameter nesting level must be 1: " +
+					"use the nestingLevel parameter to specify the desired nestingLevel for nested type traversal");
 		}
 		return nested(new ParameterDescriptor(methodParameter), nestingLevel);
 	}
@@ -254,8 +262,10 @@ public static TypeDescriptor nested(Property property, int nestingLevel) {
 
 	/**
 	 * Create a new type descriptor for an object.
-	 * <p>Use this factory method to introspect a source object before asking the conversion system to convert it to some another type.
-	 * <p>If the provided object is null, returns null, else calls {@link #valueOf(Class)} to build a TypeDescriptor from the object's class.
+	 * <p>Use this factory method to introspect a source object before asking the
+	 * conversion system to convert it to some another type.
+	 * <p>If the provided object is null, returns null, else calls {@link #valueOf(Class)}
+	 * to build a TypeDescriptor from the object's class.
 	 * @param source the source object
 	 * @return the type descriptor
 	 */
@@ -263,6 +273,7 @@ public static TypeDescriptor forObject(Object source) {
 		return (source != null ? valueOf(source.getClass()) : null);
 	}
 
+
 	/**
 	 * The type of the backing class, method parameter, field, or property described by this TypeDescriptor.
 	 * <p>Returns primitive types as-is.
@@ -288,10 +299,11 @@ public Class<?> getObjectType() {
 	 * Narrows this {@link TypeDescriptor} by setting its type to the class of the provided value.
 	 * <p>If the value is {@code null}, no narrowing is performed and this TypeDescriptor is returned unchanged.
 	 * <p>Designed to be called by binding frameworks when they read property, field, or method return values.
-	 * Allows such frameworks to narrow a TypeDescriptor built from a declared property, field, or method return value type.
-	 * For example, a field declared as {@code java.lang.Object} would be narrowed to {@code java.util.HashMap}
-	 * if it was set to a {@code java.util.HashMap} value. The narrowed TypeDescriptor can then be used to convert
-	 * the HashMap to some other type. Annotation and nested type context is preserved by the narrowed copy.
+	 * Allows such frameworks to narrow a TypeDescriptor built from a declared property, field, or method return
+	 * value type. For example, a field declared as {@code java.lang.Object} would be narrowed to
+	 * {@code java.util.HashMap} if it was set to a {@code java.util.HashMap} value. The narrowed
+	 * TypeDescriptor can then be used to convert the HashMap to some other type. Annotation and
+	 * nested type context is preserved by the narrowed copy.
 	 * @param value the value to use for narrowing this type descriptor
 	 * @return this TypeDescriptor narrowed (returns a copy with its type updated to the class of the provided value)
 	 */
@@ -373,12 +385,15 @@ public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
 	}
 
 	/**
-	 * Returns true if an object of this type descriptor can be assigned to the location described by the given type descriptor.
-	 * <p>For example, valueOf(String.class).isAssignableTo(valueOf(CharSequence.class)) returns true because a String value can be assigned to a CharSequence variable.
-	 * On the other hand, valueOf(Number.class).isAssignableTo(valueOf(Integer.class)) returns false because, while all Integers are Numbers, not all Numbers are Integers.
-	 * <p>
-	 * For arrays, collections, and maps, element and key/value types are checked if declared.
-	 * For example, a List&lt;String&gt; field value is assignable to a Collection&lt;CharSequence&gt; field, but List&lt;Number&gt; is not assignable to List&lt;Integer&gt;.
+	 * Returns true if an object of this type descriptor can be assigned to the location described by the
+	 * given type descriptor.
+	 * <p>For example, valueOf(String.class).isAssignableTo(valueOf(CharSequence.class)) returns true
+	 * because a String value can be assigned to a CharSequence variable. On the other hand,
+	 * valueOf(Number.class).isAssignableTo(valueOf(Integer.class)) returns false because,
+	 * while all Integers are Numbers, not all Numbers are Integers.
+	 * <p>For arrays, collections, and maps, element and key/value types are checked if declared.
+	 * For example, a List&lt;String&gt; field value is assignable to a Collection&lt;CharSequence&gt;
+	 * field, but List&lt;Number&gt; is not assignable to List&lt;Integer&gt;.
 	 * @return true if this type is assignable to the type represented by the provided type descriptor
 	 * @see #getObjectType()
 	 */
@@ -402,6 +417,7 @@ else if (isMap() && typeDescriptor.isMap()) {
 		}
 	}
 
+
 	// indexable type descriptor operations
 
 	/**
@@ -422,7 +438,8 @@ public boolean isArray() {
 	 * If this type is an array, returns the array's component type.
 	 * If this type is a {@link Collection} and it is parameterized, returns the Collection's element type.
 	 * If the Collection is not parameterized, returns null indicating the element type is not declared.
-	 * @return the array component type or Collection element type, or {@code null} if this type is a Collection but its element type is not parameterized
+	 * @return the array component type or Collection element type, or {@code null} if this type is a
+	 * Collection but its element type is not parameterized
 	 * @throws IllegalStateException if this type is not a java.util.Collection or Array type
 	 */
 	public TypeDescriptor getElementTypeDescriptor() {
@@ -431,10 +448,13 @@ public TypeDescriptor getElementTypeDescriptor() {
 	}
 
 	/**
-	 * If this type is a {@link Collection} or an Array, creates a element TypeDescriptor from the provided collection or array element.
-	 * <p>Narrows the {@link #getElementTypeDescriptor() elementType} property to the class of the provided collection or array element.
-	 * For example, if this describes a java.util.List&lt;java.lang.Number&lt; and the element argument is a java.lang.Integer, the returned TypeDescriptor will be java.lang.Integer.
-	 * If this describes a java.util.List&lt;?&gt; and the element argument is a java.lang.Integer, the returned TypeDescriptor will be java.lang.Integer as well.
+	 * If this type is a {@link Collection} or an Array, creates a element TypeDescriptor from the provided
+	 * collection or array element.
+	 * <p>Narrows the {@link #getElementTypeDescriptor() elementType} property to the class of the provided
+	 * collection or array element. For example, if this describes a java.util.List&lt;java.lang.Number&lt;
+	 * and the element argument is a java.lang.Integer, the returned TypeDescriptor will be java.lang.Integer.
+	 * If this describes a java.util.List&lt;?&gt; and the element argument is a java.lang.Integer, the returned
+	 * TypeDescriptor will be java.lang.Integer as well.
 	 * <p>Annotation and nested type context will be preserved in the narrowed TypeDescriptor that is returned.
 	 * @param element the collection or array element
 	 * @return a element type descriptor, narrowed to the type of the provided element
@@ -445,6 +465,7 @@ public TypeDescriptor elementTypeDescriptor(Object element) {
 		return narrow(element, getElementTypeDescriptor());
 	}
 
+
 	// map type descriptor operations
 
 	/**
@@ -468,8 +489,10 @@ public TypeDescriptor getMapKeyTypeDescriptor() {
 	/**
 	 * If this type is a {@link Map}, creates a mapKey {@link TypeDescriptor} from the provided map key.
 	 * <p>Narrows the {@link #getMapKeyTypeDescriptor() mapKeyType} property to the class of the provided map key.
-	 * For example, if this describes a java.util.Map&lt;java.lang.Number, java.lang.String&lt; and the key argument is a java.lang.Integer, the returned TypeDescriptor will be java.lang.Integer.
-	 * <p>If this describes a java.util.Map&lt;?, ?&gt; and the key argument is a java.lang.Integer, the returned TypeDescriptor will be java.lang.Integer as well.
+	 * For example, if this describes a java.util.Map&lt;java.lang.Number, java.lang.String&lt; and the key argument
+	 * is a java.lang.Integer, the returned TypeDescriptor will be java.lang.Integer.
+	 * <p>If this describes a java.util.Map&lt;?, ?&gt; and the key argument is a java.lang.Integer, the returned
+	 * TypeDescriptor will be java.lang.Integer as well.
 	 * <p>Annotation and nested type context will be preserved in the narrowed TypeDescriptor that is returned.
 	 * @param mapKey the map key
 	 * @return the map key type descriptor
@@ -493,9 +516,11 @@ public TypeDescriptor getMapValueTypeDescriptor() {
 
 	/**
 	 * If this type is a {@link Map}, creates a mapValue {@link TypeDescriptor} from the provided map value.
-	 * <p>Narrows the {@link #getMapValueTypeDescriptor() mapValueType} property to the class of the provided map value.
-	 * For example, if this describes a java.util.Map&lt;java.lang.String, java.lang.Number&lt; and the value argument is a java.lang.Integer, the returned TypeDescriptor will be java.lang.Integer.
-	 * If this describes a java.util.Map&lt;?, ?&gt; and the value argument is a java.lang.Integer, the returned TypeDescriptor will be java.lang.Integer as well.
+	 * <p>Narrows the {@link #getMapValueTypeDescriptor() mapValueType} property to the class of the provided
+	 * map value. For example, if this describes a java.util.Map&lt;java.lang.String, java.lang.Number&lt;
+	 * and the value argument is a java.lang.Integer, the returned TypeDescriptor will be java.lang.Integer.
+	 * If this describes a java.util.Map&lt;?, ?&gt; and the value argument is a java.lang.Integer, the
+	 * returned TypeDescriptor will be java.lang.Integer as well.
 	 * <p>Annotation and nested type context will be preserved in the narrowed TypeDescriptor that is returned.
 	 * @param mapValue the map value
 	 * @return the map value type descriptor
@@ -509,7 +534,8 @@ public TypeDescriptor getMapValueTypeDescriptor(Object mapValue) {
 	// deprecations in Spring 3.1
 
 	/**
-	 * Returns the value of {@link TypeDescriptor#getType() getType()} for the {@link #getElementTypeDescriptor() elementTypeDescriptor}.
+	 * Returns the value of {@link TypeDescriptor#getType() getType()} for the
+	 * {@link #getElementTypeDescriptor() elementTypeDescriptor}.
 	 * @deprecated in Spring 3.1 in favor of {@link #getElementTypeDescriptor()}
 	 * @throws IllegalStateException if this type is not a java.util.Collection or Array type
 	 */
@@ -519,7 +545,8 @@ public Class<?> getElementType() {
 	}
 
 	/**
-	 * Returns the value of {@link TypeDescriptor#getType() getType()} for the {@link #getMapKeyTypeDescriptor() getMapKeyTypeDescriptor}.
+	 * Returns the value of {@link TypeDescriptor#getType() getType()} for the
+	 * {@link #getMapKeyTypeDescriptor() getMapKeyTypeDescriptor}.
 	 * @deprecated in Spring 3.1 in favor of {@link #getMapKeyTypeDescriptor()}
 	 * @throws IllegalStateException if this type is not a java.util.Map
 	 */
@@ -529,7 +556,8 @@ public Class<?> getMapKeyType() {
 	}
 
 	/**
-	 * Returns the value of {@link TypeDescriptor#getType() getType()} for the {@link #getMapValueTypeDescriptor() getMapValueTypeDescriptor}.
+	 * Returns the value of {@link TypeDescriptor#getType() getType()} for the
+	 * {@link #getMapValueTypeDescriptor() getMapValueTypeDescriptor}.
 	 * @deprecated in Spring 3.1 in favor of {@link #getMapValueTypeDescriptor()}
 	 * @throws IllegalStateException if this type is not a java.util.Map
 	 */
@@ -538,20 +566,6 @@ public Class<?> getMapValueType() {
 		return getMapValueTypeDescriptor().getType();
 	}
 
-	// package private helpers
-
-	TypeDescriptor(AbstractDescriptor descriptor) {
-		this.type = descriptor.getType();
-		this.elementTypeDescriptor = descriptor.getElementTypeDescriptor();
-		this.mapKeyTypeDescriptor = descriptor.getMapKeyTypeDescriptor();
-		this.mapValueTypeDescriptor = descriptor.getMapValueTypeDescriptor();
-		this.annotations = descriptor.getAnnotations();
-	}
-
-	static Annotation[] nullSafeAnnotations(Annotation[] annotations) {
-		return annotations != null ? annotations : EMPTY_ANNOTATION_ARRAY;
-	}
-
 
 	// internal constructors
 
@@ -577,6 +591,21 @@ private TypeDescriptor(Class<?> type, TypeDescriptor elementTypeDescriptor, Type
 		this.annotations = annotations;
 	}
 
+	TypeDescriptor(AbstractDescriptor descriptor) {
+		this.type = descriptor.getType();
+		this.elementTypeDescriptor = descriptor.getElementTypeDescriptor();
+		this.mapKeyTypeDescriptor = descriptor.getMapKeyTypeDescriptor();
+		this.mapValueTypeDescriptor = descriptor.getMapValueTypeDescriptor();
+		this.annotations = descriptor.getAnnotations();
+	}
+
+
+	// internal helpers
+
+	static Annotation[] nullSafeAnnotations(Annotation[] annotations) {
+		return (annotations != null ? annotations : EMPTY_ANNOTATION_ARRAY);
+	}
+
 	private static TypeDescriptor nested(AbstractDescriptor descriptor, int nestingLevel) {
 		for (int i = 0; i < nestingLevel; i++) {
 			descriptor = descriptor.nested();
@@ -587,9 +616,6 @@ private static TypeDescriptor nested(AbstractDescriptor descriptor, int nestingL
 		return new TypeDescriptor(descriptor);
 	}
 
-
-	// internal helpers
-
 	private void assertCollectionOrArray() {
 		if (!isCollection() && !isArray()) {
 			throw new IllegalStateException("Not a java.util.Collection or Array");
@@ -619,7 +645,7 @@ private boolean isNestedAssignable(TypeDescriptor nestedTypeDescriptor, TypeDesc
 	}
 
 	private String wildcard(TypeDescriptor typeDescriptor) {
-		return typeDescriptor != null ? typeDescriptor.toString() : "?";
+		return (typeDescriptor != null ? typeDescriptor.toString() : "?");
 	}
 
 
diff --git a/spring-core/src/main/java/org/springframework/core/convert/converter/ConditionalConverter.java b/spring-core/src/main/java/org/springframework/core/convert/converter/ConditionalConverter.java
index 94aacd6261..964139e0a2 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/converter/ConditionalConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/converter/ConditionalConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,11 +26,10 @@
  * <p>Often used to selectively match custom conversion logic based on the presence of a
  * field or class-level characteristic, such as an annotation or method. For example, when
  * converting from a String field to a Date field, an implementation might return
- *
  * {@code true} if the target field has also been annotated with {@code @DateTimeFormat}.
  *
- * <p>As another example, when converting from a String field to an {@code Account} field, an
- * implementation might return {@code true} if the target Account class defines a
+ * <p>As another example, when converting from a String field to an {@code Account} field,
+ * an implementation might return {@code true} if the target Account class defines a
  * {@code public static findAccount(String)} method.
  *
  * @author Phillip Webb
@@ -46,10 +45,10 @@ public interface ConditionalConverter {
 	/**
 	 * Should the conversion from {@code sourceType} to {@code targetType} currently under
 	 * consideration be selected?
-	 *
 	 * @param sourceType the type descriptor of the field we are converting from
 	 * @param targetType the type descriptor of the field we are converting to
 	 * @return true if conversion should be performed, false otherwise
 	 */
 	boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType);
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/convert/converter/ConditionalGenericConverter.java b/spring-core/src/main/java/org/springframework/core/convert/converter/ConditionalGenericConverter.java
index d65d7bb3e9..56dadbfc45 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/converter/ConditionalGenericConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/converter/ConditionalGenericConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 import org.springframework.core.convert.TypeDescriptor;
 
 /**
- * A {@link GenericConverter} that may conditionally execute based on attributes of the
- * {@code source} and {@code target} {@link TypeDescriptor}. See
- * {@link ConditionalConverter} for details.
+ * A {@link GenericConverter} that may conditionally execute based on attributes
+ * of the {@code source} and {@code target} {@link TypeDescriptor}.
+ * See {@link ConditionalConverter} for details.
  *
  * @author Keith Donald
  * @author Phillip Webb
@@ -29,7 +29,6 @@
  * @see GenericConverter
  * @see ConditionalConverter
  */
-public interface ConditionalGenericConverter extends GenericConverter,
-		ConditionalConverter {
+public interface ConditionalGenericConverter extends GenericConverter, ConditionalConverter {
 
 }
diff --git a/spring-core/src/main/java/org/springframework/core/convert/converter/Converter.java b/spring-core/src/main/java/org/springframework/core/convert/converter/Converter.java
index 6710b666ab..cfb578c11a 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/converter/Converter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/converter/Converter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
  *
  * @author Keith Donald
  * @since 3.0
- * @see ConditionalConverter
  * @param <S> The source type
  * @param <T> The target type
  */
@@ -32,8 +31,8 @@ public interface Converter<S, T> {
 
 	/**
 	 * Convert the source of type S to target type T.
-	 * @param source the source object to convert, which must be an instance of S
-	 * @return the converted object, which must be an instance of T
+	 * @param source the source object to convert, which must be an instance of S (never {@code null})
+	 * @return the converted object, which must be an instance of T (potentially {@code null})
 	 * @throws IllegalArgumentException if the source could not be converted to the desired target type
 	 */
 	T convert(S source);
diff --git a/spring-core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java b/spring-core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java
index 9280c4eac3..5331ed6191 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,15 +27,16 @@ public interface ConverterRegistry {
 
 	/**
 	 * Add a plain converter to this registry.
-	 * The convertible sourceType/targetType pair is derived from the Converter's parameterized types.
+	 * The convertible source/target type pair is derived from the Converter's parameterized types.
 	 * @throws IllegalArgumentException if the parameterized types could not be resolved
 	 */
 	void addConverter(Converter<?, ?> converter);
 
 	/**
 	 * Add a plain converter to this registry.
-	 * The convertible sourceType/targetType pair is specified explicitly.
-	 * Allows for a Converter to be reused for multiple distinct pairs without having to create a Converter class for each pair.
+	 * The convertible source/target type pair is specified explicitly.
+	 * <p>Allows for a Converter to be reused for multiple distinct pairs without
+	 * having to create a Converter class for each pair.
 	 * @since 3.1
 	 */
 	void addConverter(Class<?> sourceType, Class<?> targetType, Converter<?, ?> converter);
@@ -47,13 +48,13 @@ public interface ConverterRegistry {
 
 	/**
 	 * Add a ranged converter factory to this registry.
-	 * The convertible sourceType/rangeType pair is derived from the ConverterFactory's parameterized types.
-	 * @throws IllegalArgumentException if the parameterized types could not be resolved.
+	 * The convertible source/target type pair is derived from the ConverterFactory's parameterized types.
+	 * @throws IllegalArgumentException if the parameterized types could not be resolved
 	 */
-	void addConverterFactory(ConverterFactory<?, ?> converterFactory);
+	void addConverterFactory(ConverterFactory<?, ?> factory);
 
 	/**
-	 * Remove any converters from sourceType to targetType.
+	 * Remove any converters from {@code sourceType} to {@code targetType}.
 	 * @param sourceType the source type
 	 * @param targetType the target type
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java b/spring-core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java
index 6826155989..5258497be2 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/converter/GenericConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
 
 package org.springframework.core.convert.converter;
 
+import java.util.Set;
+
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.util.Assert;
 
-import java.util.Set;
-
 /**
  * Generic converter interface for converting between two or more types.
  *
@@ -104,13 +104,17 @@ public boolean equals(Object obj) {
 			}
 			ConvertiblePair other = (ConvertiblePair) obj;
 			return this.sourceType.equals(other.sourceType) && this.targetType.equals(other.targetType);
-
 		}
 
 		@Override
 		public int hashCode() {
 			return this.sourceType.hashCode() * 31 + this.targetType.hashCode();
 		}
+
+		@Override
+		public String toString() {
+			return this.sourceType.getName() + " -> " + this.targetType.getName();
+		}
 	}
 
 }
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToArrayConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToArrayConverter.java
index 2b52d25b17..bb5c7331fc 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToArrayConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToArrayConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,9 @@
 import org.springframework.util.ObjectUtils;
 
 /**
- * Converts an Array to another Array. First adapts the source array to a List, then
- * delegates to {@link CollectionToArrayConverter} to perform the target array conversion.
+ * Converts an array to another array. First adapts the source array to a List,
+ * then delegates to {@link CollectionToArrayConverter} to perform the target
+ * array conversion.
  *
  * @author Keith Donald
  * @author Phillip Webb
@@ -40,11 +41,13 @@ final class ArrayToArrayConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public ArrayToArrayConverter(ConversionService conversionService) {
 		this.helperConverter = new CollectionToArrayConverter(conversionService);
 		this.conversionService = conversionService;
 	}
 
+
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object[].class, Object[].class));
 	}
@@ -53,12 +56,10 @@ public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return this.helperConverter.matches(sourceType, targetType);
 	}
 
-	public Object convert(Object source, TypeDescriptor sourceType,
-			TypeDescriptor targetType) {
-		if ((conversionService instanceof GenericConversionService)
-				&& ((GenericConversionService) conversionService).canBypassConvert(
-						sourceType.getElementTypeDescriptor(),
-						targetType.getElementTypeDescriptor())) {
+	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
+		if (this.conversionService instanceof GenericConversionService &&
+				((GenericConversionService) this.conversionService).canBypassConvert(
+						sourceType.getElementTypeDescriptor(), targetType.getElementTypeDescriptor())) {
 			return source;
 		}
 		List<Object> sourceList = Arrays.asList(ObjectUtils.toObjectArray(source));
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java
index 4e028b49a9..d034eddbca 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,23 +27,27 @@
 import org.springframework.core.convert.converter.ConditionalGenericConverter;
 
 /**
- * Converts an Array to a Collection.
+ * Converts an array to a Collection.
  *
- * <p>First, creates a new Collection of the requested targetType.
+ * <p>First, creates a new Collection of the requested target type.
  * Then adds each array element to the target collection.
- * Will perform an element conversion from the source component type to the collection's parameterized type if necessary.
+ * Will perform an element conversion from the source component type
+ * to the collection's parameterized type if necessary.
  *
  * @author Keith Donald
+ * @author Juergen Hoeller
  * @since 3.0
  */
 final class ArrayToCollectionConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public ArrayToCollectionConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object[].class, Collection.class));
 	}
@@ -58,9 +62,12 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		if (source == null) {
 			return null;
 		}
+
 		int length = Array.getLength(source);
+		TypeDescriptor elementDesc = targetType.getElementTypeDescriptor();
 		Collection<Object> target = CollectionFactory.createCollection(targetType.getType(), length);
-		if (targetType.getElementTypeDescriptor() == null) {
+
+		if (elementDesc == null) {
 			for (int i = 0; i < length; i++) {
 				Object sourceElement = Array.get(source, i);
 				target.add(sourceElement);
@@ -70,7 +77,7 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 			for (int i = 0; i < length; i++) {
 				Object sourceElement = Array.get(source, i);
 				Object targetElement = this.conversionService.convert(sourceElement,
-						sourceType.elementTypeDescriptor(sourceElement), targetType.getElementTypeDescriptor());
+						sourceType.elementTypeDescriptor(sourceElement), elementDesc);
 				target.add(targetElement);
 			}
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToObjectConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToObjectConverter.java
index 1db3b2ec7f..f100458a11 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToObjectConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToObjectConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,8 @@
 import org.springframework.core.convert.converter.ConditionalGenericConverter;
 
 /**
- * Converts an Array to an Object by returning the first array element after converting it to the desired targetType.
+ * Converts an array to an Object by returning the first array element
+ * after converting it to the desired target type.
  *
  * @author Keith Donald
  * @since 3.0
@@ -34,10 +35,12 @@ final class ArrayToObjectConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public ArrayToObjectConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object[].class, Object.class));
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToStringConverter.java
index 15e9e608ed..1307b991cc 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToStringConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ArrayToStringConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,9 @@
 import org.springframework.util.ObjectUtils;
 
 /**
- * Converts an Array to a comma-delimited String.
- * This implementation first adapts the source Array to a List, then delegates to {@link CollectionToStringConverter} to perform the target String conversion.
+ * Converts an array to a comma-delimited String. First adapts the source array
+ * to a List, then delegates to {@link CollectionToStringConverter} to perform
+ * the target String conversion.
  *
  * @author Keith Donald
  * @since 3.0
@@ -36,10 +37,12 @@ final class ArrayToStringConverter implements ConditionalGenericConverter {
 
 	private final CollectionToStringConverter helperConverter;
 
+
 	public ArrayToStringConverter(ConversionService conversionService) {
 		this.helperConverter = new CollectionToStringConverter(conversionService);
 	}
 
+
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object[].class, String.class));
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java
index 42ad1e8c39..f0dfd3d642 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToCollectionConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,16 +34,19 @@
  * parameterized type to the target collection's parameterized type if necessary.
  *
  * @author Keith Donald
+ * @author Juergen Hoeller
  * @since 3.0
  */
 final class CollectionToCollectionConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public CollectionToCollectionConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Collection.class, Collection.class));
 	}
@@ -58,27 +61,34 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		if (source == null) {
 			return null;
 		}
-		boolean copyRequired = !targetType.getType().isInstance(source);
 		Collection<?> sourceCollection = (Collection<?>) source;
+
+		// Shortcut if possible...
+		boolean copyRequired = !targetType.getType().isInstance(source);
 		if (!copyRequired && sourceCollection.isEmpty()) {
-			return sourceCollection;
+			return source;
 		}
+		TypeDescriptor elementDesc = targetType.getElementTypeDescriptor();
+		if (elementDesc == null && !copyRequired) {
+			return source;
+		}
+
+		// At this point, we need a collection copy in any case, even if just for finding out about element copies...
 		Collection<Object> target = CollectionFactory.createCollection(targetType.getType(), sourceCollection.size());
-		if (targetType.getElementTypeDescriptor() == null) {
-			for (Object element : sourceCollection) {
-				target.add(element);
-			}
+		if (elementDesc == null) {
+			target.addAll(sourceCollection);
 		}
 		else {
 			for (Object sourceElement : sourceCollection) {
 				Object targetElement = this.conversionService.convert(sourceElement,
-						sourceType.elementTypeDescriptor(sourceElement), targetType.getElementTypeDescriptor());
+						sourceType.elementTypeDescriptor(sourceElement), elementDesc);
 				target.add(targetElement);
 				if (sourceElement != targetElement) {
 					copyRequired = true;
 				}
 			}
 		}
+
 		return (copyRequired ? target : source);
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
index 148dbee97d..04ffd8fb18 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,14 +81,16 @@ public class GenericConversionService implements ConfigurableConversionService {
 
 	public void addConverter(Converter<?, ?> converter) {
 		GenericConverter.ConvertiblePair typeInfo = getRequiredTypeInfo(converter, Converter.class);
-		Assert.notNull(typeInfo, "Unable to the determine sourceType <S> and targetType " +
-				"<T> which your Converter<S, T> converts between; declare these generic types.");
-		addConverter(new ConverterAdapter(typeInfo, converter));
+		if (typeInfo == null) {
+			throw new IllegalArgumentException("Unable to determine source type <S> and target type <T> for your " +
+					"Converter [" + converter.getClass().getName() + "]; does the class parameterize those types?");
+		}
+		addConverter(new ConverterAdapter(converter, typeInfo));
 	}
 
 	public void addConverter(Class<?> sourceType, Class<?> targetType, Converter<?, ?> converter) {
 		GenericConverter.ConvertiblePair typeInfo = new GenericConverter.ConvertiblePair(sourceType, targetType);
-		addConverter(new ConverterAdapter(typeInfo, converter));
+		addConverter(new ConverterAdapter(converter, typeInfo));
 	}
 
 	public void addConverter(GenericConverter converter) {
@@ -96,14 +98,13 @@ public void addConverter(GenericConverter converter) {
 		invalidateCache();
 	}
 
-	public void addConverterFactory(ConverterFactory<?, ?> converterFactory) {
-		GenericConverter.ConvertiblePair typeInfo = getRequiredTypeInfo(converterFactory, ConverterFactory.class);
+	public void addConverterFactory(ConverterFactory<?, ?> factory) {
+		GenericConverter.ConvertiblePair typeInfo = getRequiredTypeInfo(factory, ConverterFactory.class);
 		if (typeInfo == null) {
-			throw new IllegalArgumentException("Unable to the determine sourceType <S> and " +
-					"targetRangeType R which your ConverterFactory<S, R> converts between; " +
-					"declare these generic types.");
+			throw new IllegalArgumentException("Unable to determine source type <S> and target type <T> for your " +
+					"ConverterFactory [" + factory.getClass().getName() + "]; does the class parameterize those types?");
 		}
-		addConverter(new ConverterFactoryAdapter(typeInfo, converterFactory));
+		addConverter(new ConverterFactoryAdapter(factory, typeInfo));
 	}
 
 	public void removeConvertible(Class<?> sourceType, Class<?> targetType) {
@@ -114,14 +115,13 @@ public void removeConvertible(Class<?> sourceType, Class<?> targetType) {
 	// implementing ConversionService
 
 	public boolean canConvert(Class<?> sourceType, Class<?> targetType) {
-		Assert.notNull(targetType, "The targetType to convert to cannot be null");
-		return canConvert(sourceType != null ?
-				TypeDescriptor.valueOf(sourceType) : null,
+		Assert.notNull(targetType, "targetType to convert to cannot be null");
+		return canConvert((sourceType != null ? TypeDescriptor.valueOf(sourceType) : null),
 				TypeDescriptor.valueOf(targetType));
 	}
 
 	public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType) {
-		Assert.notNull(targetType,"The targetType to convert to cannot be null");
+		Assert.notNull(targetType, "targetType to convert to cannot be null");
 		if (sourceType == null) {
 			return true;
 		}
@@ -130,17 +130,18 @@ public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType)
 	}
 
 	/**
-	 * Returns true if conversion between the sourceType and targetType can be bypassed.
-	 * More precisely this method will return true if objects of sourceType can be
+	 * Return whether conversion between the sourceType and targetType can be bypassed.
+	 * <p>More precisely, this method will return true if objects of sourceType can be
 	 * converted to the targetType by returning the source object unchanged.
-	 * @param sourceType context about the source type to convert from (may be null if source is null)
+	 * @param sourceType context about the source type to convert from
+	 * (may be {@code null} if source is {@code null})
 	 * @param targetType context about the target type to convert to (required)
-	 * @return true if conversion can be bypassed
-	 * @throws IllegalArgumentException if targetType is null
+	 * @return {@code true} if conversion can be bypassed; {@code false} otherwise
+	 * @throws IllegalArgumentException if targetType is {@code null}
 	 * @since 3.2
 	 */
 	public boolean canBypassConvert(TypeDescriptor sourceType, TypeDescriptor targetType) {
-		Assert.notNull(targetType, "The targetType to convert to cannot be null");
+		Assert.notNull(targetType, "targetType to convert to cannot be null");
 		if (sourceType == null) {
 			return true;
 		}
@@ -150,18 +151,18 @@ public boolean canBypassConvert(TypeDescriptor sourceType, TypeDescriptor target
 
 	@SuppressWarnings("unchecked")
 	public <T> T convert(Object source, Class<T> targetType) {
-		Assert.notNull(targetType,"The targetType to convert to cannot be null");
+		Assert.notNull(targetType, "targetType to convert to cannot be null");
 		return (T) convert(source, TypeDescriptor.forObject(source), TypeDescriptor.valueOf(targetType));
 	}
 
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
-		Assert.notNull(targetType,"The targetType to convert to cannot be null");
+		Assert.notNull(targetType, "targetType to convert to cannot be null");
 		if (sourceType == null) {
-			Assert.isTrue(source == null, "The source must be [null] if sourceType == [null]");
-			return handleResult(sourceType, targetType, convertNullSource(sourceType, targetType));
+			Assert.isTrue(source == null, "source must be [null] if sourceType == [null]");
+			return handleResult(null, targetType, convertNullSource(null, targetType));
 		}
 		if (source != null && !sourceType.getObjectType().isInstance(source)) {
-			throw new IllegalArgumentException("The source to convert from must be an instance of " +
+			throw new IllegalArgumentException("source to convert from must be an instance of " +
 					sourceType + "; instead it was a " + source.getClass().getName());
 		}
 		GenericConverter converter = getConverter(sourceType, targetType);
@@ -189,16 +190,17 @@ public Object convert(Object source, TypeDescriptor targetType) {
 		return convert(source, TypeDescriptor.forObject(source), targetType);
 	}
 
+	@Override
 	public String toString() {
 		return this.converters.toString();
 	}
 
 
-	// subclassing hooks
+	// Protected template methods
 
 	/**
 	 * Template method to convert a null source.
-	 * <p>Default implementation returns {@code null}.
+	 * <p>The default implementation returns {@code null}.
 	 * Subclasses may override to return custom null objects for specific target types.
 	 * @param sourceType the sourceType to convert from
 	 * @param targetType the targetType to convert to
@@ -213,11 +215,10 @@ protected Object convertNullSource(TypeDescriptor sourceType, TypeDescriptor tar
 	 * First queries this ConversionService's converter cache.
 	 * On a cache miss, then performs an exhaustive search for a matching converter.
 	 * If no converter matches, returns the default converter.
-	 * Subclasses may override.
 	 * @param sourceType the source type to convert from
 	 * @param targetType the target type to convert to
-	 * @return the generic converter that will perform the conversion, or {@code null} if
-	 * no suitable converter was found
+	 * @return the generic converter that will perform the conversion,
+	 * or {@code null} if no suitable converter was found
 	 * @see #getDefaultConverter(TypeDescriptor, TypeDescriptor)
 	 */
 	protected GenericConverter getConverter(TypeDescriptor sourceType, TypeDescriptor targetType) {
@@ -243,9 +244,8 @@ protected GenericConverter getConverter(TypeDescriptor sourceType, TypeDescripto
 
 	/**
 	 * Return the default converter if no converter is found for the given sourceType/targetType pair.
-	 * Returns a NO_OP Converter if the sourceType is assignable to the targetType.
+	 * <p>Returns a NO_OP Converter if the sourceType is assignable to the targetType.
 	 * Returns {@code null} otherwise, indicating no suitable converter could be found.
-	 * Subclasses may override.
 	 * @param sourceType the source type to convert from
 	 * @param targetType the target type to convert to
 	 * @return the default generic converter that will perform the conversion
@@ -297,23 +297,21 @@ private void assertNotPrimitiveTargetType(TypeDescriptor sourceType, TypeDescrip
 	@SuppressWarnings("unchecked")
 	private final class ConverterAdapter implements ConditionalGenericConverter {
 
-		private final ConvertiblePair typeInfo;
-
 		private final Converter<Object, Object> converter;
 
+		private final ConvertiblePair typeInfo;
 
-		public ConverterAdapter(ConvertiblePair typeInfo, Converter<?, ?> converter) {
+		public ConverterAdapter(Converter<?, ?> converter, ConvertiblePair typeInfo) {
 			this.converter = (Converter<Object, Object>) converter;
 			this.typeInfo = typeInfo;
 		}
 
-
 		public Set<ConvertiblePair> getConvertibleTypes() {
 			return Collections.singleton(this.typeInfo);
 		}
 
 		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
-			if(!this.typeInfo.getTargetType().equals(targetType.getObjectType())) {
+			if (!this.typeInfo.getTargetType().equals(targetType.getObjectType())) {
 				return false;
 			}
 			if (this.converter instanceof ConditionalConverter) {
@@ -329,10 +327,9 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 			return this.converter.convert(source);
 		}
 
+		@Override
 		public String toString() {
-			return this.typeInfo.getSourceType().getName() + " -> " +
-					this.typeInfo.getTargetType().getName() + " : " +
-					this.converter.toString();
+			return this.typeInfo + " : " + this.converter;
 		}
 	}
 
@@ -343,17 +340,15 @@ public String toString() {
 	@SuppressWarnings("unchecked")
 	private final class ConverterFactoryAdapter implements ConditionalGenericConverter {
 
-		private final ConvertiblePair typeInfo;
-
 		private final ConverterFactory<Object, Object> converterFactory;
 
+		private final ConvertiblePair typeInfo;
 
-		public ConverterFactoryAdapter(ConvertiblePair typeInfo, ConverterFactory<?, ?> converterFactory) {
+		public ConverterFactoryAdapter(ConverterFactory<?, ?> converterFactory, ConvertiblePair typeInfo) {
 			this.converterFactory = (ConverterFactory<Object, Object>) converterFactory;
 			this.typeInfo = typeInfo;
 		}
 
-
 		public Set<ConvertiblePair> getConvertibleTypes() {
 			return Collections.singleton(this.typeInfo);
 		}
@@ -363,9 +358,9 @@ public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			if (this.converterFactory instanceof ConditionalConverter) {
 				matches = ((ConditionalConverter) this.converterFactory).matches(sourceType, targetType);
 			}
-			if(matches) {
+			if (matches) {
 				Converter<?, ?> converter = this.converterFactory.getConverter(targetType.getType());
-				if(converter instanceof ConditionalConverter) {
+				if (converter instanceof ConditionalConverter) {
 					matches = ((ConditionalConverter) converter).matches(sourceType, targetType);
 				}
 			}
@@ -379,10 +374,9 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 			return this.converterFactory.getConverter(targetType.getObjectType()).convert(source);
 		}
 
+		@Override
 		public String toString() {
-			return this.typeInfo.getSourceType().getName() + " -> " +
-					this.typeInfo.getTargetType().getName() + " : " +
-					this.converterFactory.toString();
+			return this.typeInfo + " : " + this.converterFactory;
 		}
 	}
 
@@ -396,13 +390,11 @@ private static final class ConverterCacheKey {
 
 		private final TypeDescriptor targetType;
 
-
 		public ConverterCacheKey(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			this.sourceType = sourceType;
 			this.targetType = targetType;
 		}
 
-
 		public boolean equals(Object other) {
 			if (this == other) {
 				return true;
@@ -411,38 +403,40 @@ public boolean equals(Object other) {
 				return false;
 			}
 			ConverterCacheKey otherKey = (ConverterCacheKey) other;
-			return ObjectUtils.nullSafeEquals(this.sourceType, otherKey.sourceType)
-				&& ObjectUtils.nullSafeEquals(this.targetType, otherKey.targetType);
+			return ObjectUtils.nullSafeEquals(this.sourceType, otherKey.sourceType) &&
+					ObjectUtils.nullSafeEquals(this.targetType, otherKey.targetType);
 		}
 
+		@Override
 		public int hashCode() {
-			return ObjectUtils.nullSafeHashCode(this.sourceType) * 29
-				+ ObjectUtils.nullSafeHashCode(this.targetType);
+			return ObjectUtils.nullSafeHashCode(this.sourceType) * 29 +
+					ObjectUtils.nullSafeHashCode(this.targetType);
 		}
 
+		@Override
 		public String toString() {
-			return "ConverterCacheKey [sourceType = " + this.sourceType
-				+ ", targetType = " + this.targetType + "]";
+			return "ConverterCacheKey [sourceType = " + this.sourceType +
+					", targetType = " + this.targetType + "]";
 		}
 	}
 
+
 	/**
 	 * Manages all converters registered with the service.
 	 */
 	private static class Converters {
 
-		private final Set<GenericConverter> globalConverters =
-				new LinkedHashSet<GenericConverter>();
+		private final Set<GenericConverter> globalConverters = new LinkedHashSet<GenericConverter>();
 
 		private final Map<ConvertiblePair, ConvertersForPair> converters =
-			new LinkedHashMap<ConvertiblePair, ConvertersForPair>(36);
+				new LinkedHashMap<ConvertiblePair, ConvertersForPair>(36);
 
 		public void add(GenericConverter converter) {
 			Set<ConvertiblePair> convertibleTypes = converter.getConvertibleTypes();
 			if (convertibleTypes == null) {
 				Assert.state(converter instanceof ConditionalConverter,
 						"Only conditional converters may return null convertible types");
-				globalConverters.add(converter);
+				this.globalConverters.add(converter);
 			}
 			else {
 				for (ConvertiblePair convertiblePair : convertibleTypes) {
@@ -462,16 +456,16 @@ private ConvertersForPair getMatchableConverters(ConvertiblePair convertiblePair
 		}
 
 		public void remove(Class<?> sourceType, Class<?> targetType) {
-			converters.remove(new ConvertiblePair(sourceType, targetType));
+			this.converters.remove(new ConvertiblePair(sourceType, targetType));
 		}
 
 		/**
-		 * Find a {@link GenericConverter} given a source and target type.  This method will
-		 * attempt to match all possible converters by working though the class and interface
-		 * hierarchy of the types.
+		 * Find a {@link GenericConverter} given a source and target type.
+		 * <p>This method will attempt to match all possible converters by working
+		 * through the class and interface hierarchy of the types.
 		 * @param sourceType the source type
 		 * @param targetType the target type
-		 * @return a {@link GenericConverter} or <tt>null</tt>
+		 * @return a matching {@link GenericConverter}, or {@code null} if none found
 		 */
 		public GenericConverter find(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			// Search the full type hierarchy
@@ -480,9 +474,8 @@ public GenericConverter find(TypeDescriptor sourceType, TypeDescriptor targetTyp
 			for (Class<?> sourceCandidate : sourceCandidates) {
 				for (Class<?> targetCandidate : targetCandidates) {
 					ConvertiblePair convertiblePair = new ConvertiblePair(sourceCandidate, targetCandidate);
-					GenericConverter converter = getRegisteredConverter(
-							sourceType, targetType, convertiblePair);
-					if(converter != null) {
+					GenericConverter converter = getRegisteredConverter(sourceType, targetType, convertiblePair);
+					if (converter != null) {
 						return converter;
 					}
 				}
@@ -494,29 +487,26 @@ private GenericConverter getRegisteredConverter(TypeDescriptor sourceType,
 				TypeDescriptor targetType, ConvertiblePair convertiblePair) {
 
 			// Check specifically registered converters
-			ConvertersForPair convertersForPair = converters.get(convertiblePair);
-			GenericConverter converter = convertersForPair == null ? null
-				: convertersForPair.getConverter(sourceType, targetType);
-			if (converter != null) {
-				return converter;
+			ConvertersForPair convertersForPair = this.converters.get(convertiblePair);
+			if (convertersForPair != null) {
+				GenericConverter converter = convertersForPair.getConverter(sourceType, targetType);
+				if (converter != null) {
+					return converter;
+				}
 			}
-
 			// Check ConditionalGenericConverter that match all types
 			for (GenericConverter globalConverter : this.globalConverters) {
-				if (((ConditionalConverter)globalConverter).matches(
-						sourceType, targetType)) {
+				if (((ConditionalConverter)globalConverter).matches(sourceType, targetType)) {
 					return globalConverter;
 				}
 			}
-
 			return null;
 		}
 
 		/**
 		 * Returns an ordered class hierarchy for the given type.
 		 * @param type the type
-		 * @return an ordered list of all classes that the given type extends or
-		 *         implements.
+		 * @return an ordered list of all classes that the given type extends or implements
 		 */
 		private List<Class<?>> getClassHierarchy(Class<?> type) {
 			List<Class<?>> hierarchy = new ArrayList<Class<?>>(20);
@@ -526,8 +516,7 @@ private List<Class<?>> getClassHierarchy(Class<?> type) {
 			int i = 0;
 			while (i < hierarchy.size()) {
 				Class<?> candidate = hierarchy.get(i);
-				candidate = (array ? candidate.getComponentType()
-						: ClassUtils.resolvePrimitiveIfNecessary(candidate));
+				candidate = (array ? candidate.getComponentType() : ClassUtils.resolvePrimitiveIfNecessary(candidate));
 				Class<?> superclass = candidate.getSuperclass();
 				if (candidate.getSuperclass() != null && superclass != Object.class) {
 					addToClassHierarchy(i + 1, candidate.getSuperclass(), array, hierarchy, visited);
@@ -544,10 +533,10 @@ private List<Class<?>> getClassHierarchy(Class<?> type) {
 
 		private void addToClassHierarchy(int index, Class<?> type, boolean asArray,
 				List<Class<?>> hierarchy, Set<Class<?>> visited) {
-			if(asArray) {
+			if (asArray) {
 				type = Array.newInstance(type, 0).getClass();
 			}
-			if(visited.add(type)) {
+			if (visited.add(type)) {
 				hierarchy.add(index, type);
 			}
 		}
@@ -555,11 +544,9 @@ private void addToClassHierarchy(int index, Class<?> type, boolean asArray,
 		@Override
 		public String toString() {
 			StringBuilder builder = new StringBuilder();
-			builder.append("ConversionService converters = ").append("\n");
+			builder.append("ConversionService converters =\n");
 			for (String converterString : getConverterStrings()) {
-				builder.append("\t");
-				builder.append(converterString);
-				builder.append("\n");
+				builder.append('\t').append(converterString).append('\n');
 			}
 			return builder.toString();
 		}
@@ -586,18 +573,17 @@ public void add(GenericConverter converter) {
 			this.converters.addFirst(converter);
 		}
 
-		public GenericConverter getConverter(TypeDescriptor sourceType,
-				TypeDescriptor targetType) {
+		public GenericConverter getConverter(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			for (GenericConverter converter : this.converters) {
-				if (!(converter instanceof ConditionalGenericConverter)
-						|| ((ConditionalGenericConverter) converter).matches(sourceType,
-								targetType)) {
+				if (!(converter instanceof ConditionalGenericConverter) ||
+						((ConditionalGenericConverter) converter).matches(sourceType, targetType)) {
 					return converter;
 				}
 			}
 			return null;
 		}
 
+		@Override
 		public String toString() {
 			return StringUtils.collectionToCommaDelimitedString(this.converters);
 		}
@@ -609,26 +595,24 @@ public String toString() {
 	 */
 	private static class NoOpConverter implements GenericConverter {
 
-		private String name;
-
+		private final String name;
 
 		public NoOpConverter(String name) {
 			this.name = name;
 		}
 
-
 		public Set<ConvertiblePair> getConvertibleTypes() {
 			return null;
 		}
 
-		public Object convert(Object source, TypeDescriptor sourceType,
-				TypeDescriptor targetType) {
+		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			return source;
 		}
 
 		@Override
 		public String toString() {
-			return name;
+			return this.name;
 		}
 	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java
index 653712660b..da30e0d3bd 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,27 +31,31 @@
  * Converts an entity identifier to a entity reference by calling a static finder method
  * on the target entity type.
  *
- * <p>For this converter to match, the finder method must be public, static, have the signature
+ * <p>For this converter to match, the finder method must be static, have the signature
  * {@code find[EntityName]([IdType])}, and return an instance of the desired entity type.
  *
  * @author Keith Donald
+ * @author Juergen Hoeller
  * @since 3.0
  */
 final class IdToEntityConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public IdToEntityConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object.class, Object.class));
 	}
 
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		Method finder = getFinder(targetType.getType());
-		return finder != null && this.conversionService.canConvert(sourceType, TypeDescriptor.valueOf(finder.getParameterTypes()[0]));
+		return (finder != null &&
+				this.conversionService.canConvert(sourceType, TypeDescriptor.valueOf(finder.getParameterTypes()[0])));
 	}
 
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
@@ -59,18 +63,31 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 			return null;
 		}
 		Method finder = getFinder(targetType.getType());
-		Object id = this.conversionService.convert(source, sourceType, TypeDescriptor.valueOf(finder.getParameterTypes()[0]));
+		Object id = this.conversionService.convert(
+				source, sourceType, TypeDescriptor.valueOf(finder.getParameterTypes()[0]));
 		return ReflectionUtils.invokeMethod(finder, source, id);
 	}
 
+
 	private Method getFinder(Class<?> entityClass) {
 		String finderMethod = "find" + getEntityName(entityClass);
-		Method[] methods = entityClass.getDeclaredMethods();
+		Method[] methods;
+		boolean localOnlyFiltered;
+		try {
+			methods = entityClass.getDeclaredMethods();
+			localOnlyFiltered = true;
+		}
+		catch (SecurityException ex) {
+			// Not allowed to access non-public methods...
+			// Fallback: check locally declared public methods only.
+			methods = entityClass.getMethods();
+			localOnlyFiltered = false;
+		}
 		for (Method method : methods) {
-			if (Modifier.isStatic(method.getModifiers()) && method.getParameterTypes().length == 1 && method.getReturnType().equals(entityClass)) {
-				if (method.getName().equals(finderMethod)) {
-					return method;
-				}
+			if (Modifier.isStatic(method.getModifiers()) && method.getName().equals(finderMethod) &&
+					method.getParameterTypes().length == 1 && method.getReturnType().equals(entityClass) &&
+					(localOnlyFiltered || method.getDeclaringClass().equals(entityClass))) {
+				return method;
 			}
 		}
 		return null;
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/MapToMapConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/MapToMapConverter.java
index c2dc4bfc20..98b37deaf6 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/MapToMapConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/MapToMapConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,16 +36,19 @@
  * map's parameterized types K,V if necessary.
  *
  * @author Keith Donald
+ * @author Juergen Hoeller
  * @since 3.0
  */
 final class MapToMapConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public MapToMapConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Map.class, Map.class));
 	}
@@ -59,25 +62,31 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		if (source == null) {
 			return null;
 		}
-		boolean copyRequired = !targetType.getType().isInstance(source);
 		Map<Object, Object> sourceMap = (Map<Object, Object>) source;
+
+		// Shortcut if possible...
+		boolean copyRequired = !targetType.getType().isInstance(source);
 		if (!copyRequired && sourceMap.isEmpty()) {
 			return sourceMap;
 		}
+		TypeDescriptor keyDesc = targetType.getMapKeyTypeDescriptor();
+		TypeDescriptor valueDesc = targetType.getMapValueTypeDescriptor();
+
 		List<MapEntry> targetEntries = new ArrayList<MapEntry>(sourceMap.size());
 		for (Map.Entry<Object, Object> entry : sourceMap.entrySet()) {
 			Object sourceKey = entry.getKey();
 			Object sourceValue = entry.getValue();
-			Object targetKey = convertKey(sourceKey, sourceType, targetType.getMapKeyTypeDescriptor());
-			Object targetValue = convertValue(sourceValue, sourceType, targetType.getMapValueTypeDescriptor());
+			Object targetKey = convertKey(sourceKey, sourceType, keyDesc);
+			Object targetValue = convertValue(sourceValue, sourceType, valueDesc);
 			targetEntries.add(new MapEntry(targetKey, targetValue));
 			if (sourceKey != targetKey || sourceValue != targetValue) {
 				copyRequired = true;
 			}
 		}
-		if(!copyRequired) {
+		if (!copyRequired) {
 			return sourceMap;
 		}
+
 		Map<Object, Object> targetMap = CollectionFactory.createMap(targetType.getType(), sourceMap.size());
 		for (MapEntry entry : targetEntries) {
 			entry.addToMap(targetMap);
@@ -85,6 +94,7 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		return targetMap;
 	}
 
+
 	// internal helpers
 
 	private boolean canConvertKey(TypeDescriptor sourceType, TypeDescriptor targetType) {
@@ -111,10 +121,12 @@ private Object convertValue(Object sourceValue, TypeDescriptor sourceType, TypeD
 		return this.conversionService.convert(sourceValue, sourceType.getMapValueTypeDescriptor(sourceValue), targetType);
 	}
 
+
 	private static class MapEntry {
 
-		private Object key;
-		private Object value;
+		private final Object key;
+
+		private final Object value;
 
 		public MapEntry(Object key, Object value) {
 			this.key = key;
@@ -122,7 +134,7 @@ public MapEntry(Object key, Object value) {
 		}
 
 		public void addToMap(Map<Object, Object> map) {
-			map.put(key, value);
+			map.put(this.key, this.value);
 		}
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToArrayConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToArrayConverter.java
index 2e8d850d71..9cdbb56228 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToArrayConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToArrayConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
 import org.springframework.core.convert.converter.ConditionalGenericConverter;
 
 /**
- * Converts an Object to a single-element Array containing the Object.
- * Will convert the Object to the target Array's component type if necessary.
+ * Converts an Object to a single-element array containing the Object.
+ * Will convert the Object to the target array's component type if necessary.
  *
  * @author Keith Donald
  * @since 3.0
@@ -35,10 +35,12 @@ final class ObjectToArrayConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public ObjectToArrayConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object.class, Object[].class));
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java
index 7741128b53..7890cdb191 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,10 +37,12 @@ final class ObjectToCollectionConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public ObjectToCollectionConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object.class, Collection.class));
 	}
@@ -54,12 +56,15 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		if (source == null) {
 			return null;
 		}
+
+		TypeDescriptor elementDesc = targetType.getElementTypeDescriptor();
 		Collection<Object> target = CollectionFactory.createCollection(targetType.getType(), 1);
-		if (targetType.getElementTypeDescriptor() == null || targetType.getElementTypeDescriptor().isCollection()) {
+
+		if (elementDesc == null || elementDesc.isCollection()) {
 			target.add(source);
 		}
 		else {
-			Object singleElement = this.conversionService.convert(source, sourceType, targetType.getElementTypeDescriptor());
+			Object singleElement = this.conversionService.convert(source, sourceType, elementDesc);
 			target.add(singleElement);
 		}
 		return target;
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java
index 0448e5824f..bf88a43300 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,6 +70,7 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 			else {
 				Constructor<?> constructor = getConstructor(targetClass, sourceClass);
 				if (constructor != null) {
+					ReflectionUtils.makeAccessible(constructor);
 					return constructor.newInstance(source);
 				}
 			}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java
index 37be40401e..420183b3e0 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 /**
  * Simply calls {@link Object#toString()} to convert a source Object to a String.
+ *
  * @author Keith Donald
  * @since 3.0
  */
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/PropertiesToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/PropertiesToStringConverter.java
index 8902d0e9d3..f4962d016f 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/PropertiesToStringConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/PropertiesToStringConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ final class PropertiesToStringConverter implements Converter<Properties, String>
 
 	public String convert(Properties source) {
 		try {
-			ByteArrayOutputStream os = new ByteArrayOutputStream();
+			ByteArrayOutputStream os = new ByteArrayOutputStream(256);
 			source.store(os, null);
 			return os.toString("ISO-8859-1");
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToCollectionConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToCollectionConverter.java
index 553425f377..b16c246213 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToCollectionConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToCollectionConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,29 +28,30 @@
 
 /**
  * Converts a comma-delimited String to a Collection.
- * If the target collection element type is declared, only matches if String.class can be converted to it.
+ * If the target collection element type is declared, only matches if
+ * {@code String.class} can be converted to it.
  *
  * @author Keith Donald
+ * @author Juergen Hoeller
  * @since 3.0
  */
 final class StringToCollectionConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public StringToCollectionConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(String.class, Collection.class));
 	}
 
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
-		if (targetType.getElementTypeDescriptor() != null) {
-			return this.conversionService.canConvert(sourceType, targetType.getElementTypeDescriptor());
-		} else {
-			return true;
-		}
+		return (targetType.getElementTypeDescriptor() == null ||
+				this.conversionService.canConvert(sourceType, targetType.getElementTypeDescriptor()));
 	}
 
 	@SuppressWarnings("unchecked")
@@ -59,15 +60,19 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 			return null;
 		}
 		String string = (String) source;
+
 		String[] fields = StringUtils.commaDelimitedListToStringArray(string);
+		TypeDescriptor elementDesc = targetType.getElementTypeDescriptor();
 		Collection<Object> target = CollectionFactory.createCollection(targetType.getType(), fields.length);
-		if (targetType.getElementTypeDescriptor() == null) {
+
+		if (elementDesc == null) {
 			for (String field : fields) {
 				target.add(field.trim());
 			}
-		} else {
+		}
+		else {
 			for (String field : fields) {
-				Object targetElement = this.conversionService.convert(field.trim(), sourceType, targetType.getElementTypeDescriptor());
+				Object targetElement = this.conversionService.convert(field.trim(), sourceType, elementDesc);
 				target.add(targetElement);
 			}
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java
index 7326b3f045..e015afb39b 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,27 +18,29 @@
 
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConverterFactory;
-import org.springframework.util.Assert;
 
 /**
- * Converts from a String to a java.lang.Enum by calling {@link Enum#valueOf(Class, String)}.
+ * Converts from a String to a {@link java.lang.Enum} by calling {@link Enum#valueOf(Class, String)}.
  *
  * @author Keith Donald
  * @since 3.0
  */
-@SuppressWarnings({ "unchecked", "rawtypes" })
+@SuppressWarnings({"unchecked", "rawtypes"})
 final class StringToEnumConverterFactory implements ConverterFactory<String, Enum> {
 
 	public <T extends Enum> Converter<String, T> getConverter(Class<T> targetType) {
 		Class<?> enumType = targetType;
-		while(enumType != null && !enumType.isEnum()) {
+		while (enumType != null && !enumType.isEnum()) {
 			enumType = enumType.getSuperclass();
 		}
-		Assert.notNull(enumType, "The target type " + targetType.getName()
-				+ " does not refer to an enum");
+		if (enumType == null) {
+			throw new IllegalArgumentException(
+					"The target type " + targetType.getName() + " does not refer to an enum");
+		}
 		return new StringToEnum(enumType);
 	}
 
+
 	private class StringToEnum<T extends Enum> implements Converter<String, T> {
 
 		private final Class<T> enumType;
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToUUIDConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToUUIDConverter.java
index 6478d47845..db5a3ebff5 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToUUIDConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToUUIDConverter.java
@@ -30,7 +30,7 @@
 final class StringToUUIDConverter implements Converter<String, UUID> {
 
 	public UUID convert(String source) {
-		if(StringUtils.hasLength(source)) {
+		if (StringUtils.hasLength(source)) {
 			return UUID.fromString(source.trim());
 		}
 		return null;
diff --git a/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java
index 27a78d1c66..0c5e3fae5b 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java
@@ -28,10 +28,9 @@
  * @deprecated as of Spring 3.0, in favor of Java 5 enums.
  */
 @Deprecated
+@SuppressWarnings("serial")
 public class ShortCodedLabeledEnum extends AbstractGenericLabeledEnum {
 
-	private static final long serialVersionUID = 1L;
-
 	/**
 	 * The unique code of this enum.
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
index f8741fb6ea..6faba91e18 100644
--- a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,10 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.core.SpringProperties;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import static java.lang.String.*;
@@ -42,16 +44,29 @@
  * add by default. {@code AbstractEnvironment} adds none. Subclasses should contribute
  * property sources through the protected {@link #customizePropertySources(MutablePropertySources)}
  * hook, while clients should customize using {@link ConfigurableEnvironment#getPropertySources()}
- * and working against the {@link MutablePropertySources} API. See
- * {@link ConfigurableEnvironment} Javadoc for usage examples.
+ * and working against the {@link MutablePropertySources} API.
+ * See {@link ConfigurableEnvironment} javadoc for usage examples.
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  * @since 3.1
  * @see ConfigurableEnvironment
  * @see StandardEnvironment
  */
 public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 
+	/**
+	 * System property that instructs Spring to ignore system environment variables,
+	 * i.e. to never attempt to retrieve such a variable via {@link System#getenv()}.
+	 * <p>The default is "false", falling back to system environment variable checks if a
+	 * Spring environment property (e.g. a placeholder in a configuration String) isn't
+	 * resolvable otherwise. Consider switching this flag to "true" if you experience
+	 * log warnings from {@code getenv} calls coming from Spring, e.g. on WebSphere
+	 * with strict SecurityManager settings and AccessControlExceptions warnings.
+	 * @see #suppressGetenvAccess()
+	 */
+	public static final String IGNORE_GETENV_PROPERTY_NAME = "spring.getenv.ignore";
+
 	/**
 	 * Name of property to set to specify active profiles: {@value}. Value may be comma
 	 * delimited.
@@ -89,9 +104,9 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private Set<String> activeProfiles = new LinkedHashSet<String>();
+	private final Set<String> activeProfiles = new LinkedHashSet<String>();
 
-	private Set<String> defaultProfiles = new LinkedHashSet<String>(getReservedDefaultProfiles());
+	private final Set<String> defaultProfiles = new LinkedHashSet<String>(getReservedDefaultProfiles());
 
 	private final MutablePropertySources propertySources = new MutablePropertySources(this.logger);
 
@@ -107,14 +122,10 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	 * @see #customizePropertySources(MutablePropertySources)
 	 */
 	public AbstractEnvironment() {
-		String name = getClass().getSimpleName();
-		if (this.logger.isDebugEnabled()) {
-			this.logger.debug(format("Initializing new %s", name));
-		}
 		customizePropertySources(this.propertySources);
 		if (this.logger.isDebugEnabled()) {
 			this.logger.debug(format(
-					"Initialized %s with PropertySources %s", name, this.propertySources));
+					"Initialized %s with PropertySources %s", getClass().getSimpleName(), this.propertySources));
 		}
 	}
 
@@ -168,8 +179,7 @@ public AbstractEnvironment() {
 	 * {@code remove}, or {@code replace} methods exposed by {@link MutablePropertySources}
 	 * in order to create the exact arrangement of property sources desired.
 	 *
-	 * <p>The base implementation in {@link AbstractEnvironment#customizePropertySources}
-	 * registers no property sources.
+	 * <p>The base implementation registers no property sources.
 	 *
 	 * <p>Note that clients of any {@link ConfigurableEnvironment} may further customize
 	 * property sources via the {@link #getPropertySources()} accessor, typically within
@@ -227,21 +237,25 @@ public String[] getActiveProfiles() {
 	 * @see #ACTIVE_PROFILES_PROPERTY_NAME
 	 */
 	protected Set<String> doGetActiveProfiles() {
-		if (this.activeProfiles.isEmpty()) {
-			String profiles = this.getProperty(ACTIVE_PROFILES_PROPERTY_NAME);
-			if (StringUtils.hasText(profiles)) {
-				setActiveProfiles(commaDelimitedListToStringArray(trimAllWhitespace(profiles)));
+		synchronized (this.activeProfiles) {
+			if (this.activeProfiles.isEmpty()) {
+				String profiles = getProperty(ACTIVE_PROFILES_PROPERTY_NAME);
+				if (StringUtils.hasText(profiles)) {
+					setActiveProfiles(commaDelimitedListToStringArray(trimAllWhitespace(profiles)));
+				}
 			}
+			return this.activeProfiles;
 		}
-		return this.activeProfiles;
 	}
 
 	public void setActiveProfiles(String... profiles) {
 		Assert.notNull(profiles, "Profile array must not be null");
-		this.activeProfiles.clear();
-		for (String profile : profiles) {
-			validateProfile(profile);
-			this.activeProfiles.add(profile);
+		synchronized (this.activeProfiles) {
+			this.activeProfiles.clear();
+			for (String profile : profiles) {
+				validateProfile(profile);
+				this.activeProfiles.add(profile);
+			}
 		}
 	}
 
@@ -251,7 +265,9 @@ public void addActiveProfile(String profile) {
 		}
 		validateProfile(profile);
 		doGetActiveProfiles();
-		this.activeProfiles.add(profile);
+		synchronized (this.activeProfiles) {
+			this.activeProfiles.add(profile);
+		}
 	}
 
 
@@ -272,17 +288,20 @@ public String[] getDefaultProfiles() {
 	 * @see #getReservedDefaultProfiles()
 	 */
 	protected Set<String> doGetDefaultProfiles() {
-		if (this.defaultProfiles.equals(getReservedDefaultProfiles())) {
-			String profiles = this.getProperty(DEFAULT_PROFILES_PROPERTY_NAME);
-			if (StringUtils.hasText(profiles)) {
-				setDefaultProfiles(commaDelimitedListToStringArray(trimAllWhitespace(profiles)));
+		synchronized (this.defaultProfiles) {
+			if (this.defaultProfiles.equals(getReservedDefaultProfiles())) {
+				String profiles = getProperty(DEFAULT_PROFILES_PROPERTY_NAME);
+				if (StringUtils.hasText(profiles)) {
+					setDefaultProfiles(commaDelimitedListToStringArray(trimAllWhitespace(profiles)));
+				}
 			}
+			return this.defaultProfiles;
 		}
-		return this.defaultProfiles;
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Specify the set of profiles to be made active by default if no other profiles
+	 * are explicitly made active through {@link #setActiveProfiles}.
 	 * <p>Calling this method removes overrides any reserved default profiles
 	 * that may have been added during construction of the environment.
 	 * @see #AbstractEnvironment()
@@ -290,20 +309,24 @@ protected Set<String> doGetDefaultProfiles() {
 	 */
 	public void setDefaultProfiles(String... profiles) {
 		Assert.notNull(profiles, "Profile array must not be null");
-		this.defaultProfiles.clear();
-		for (String profile : profiles) {
-			validateProfile(profile);
-			this.defaultProfiles.add(profile);
+		synchronized (this.defaultProfiles) {
+			this.defaultProfiles.clear();
+			for (String profile : profiles) {
+				validateProfile(profile);
+				this.defaultProfiles.add(profile);
+			}
 		}
 	}
 
 	public boolean acceptsProfiles(String... profiles) {
 		Assert.notEmpty(profiles, "Must specify at least one profile");
 		for (String profile : profiles) {
-			if (profile != null && profile.length() > 0 && profile.charAt(0) == '!') {
-				return !isProfileActive(profile.substring(1));
+			if (StringUtils.hasLength(profile) && profile.charAt(0) == '!') {
+				if (!isProfileActive(profile.substring(1))) {
+					return true;
+				}
 			}
-			if (isProfileActive(profile)) {
+			else if (isProfileActive(profile)) {
 				return true;
 			}
 		}
@@ -317,8 +340,9 @@ public boolean acceptsProfiles(String... profiles) {
 	 */
 	protected boolean isProfileActive(String profile) {
 		validateProfile(profile);
-		return doGetActiveProfiles().contains(profile) ||
-				(doGetActiveProfiles().isEmpty() && doGetDefaultProfiles().contains(profile));
+		Set<String> currentActiveProfiles = doGetActiveProfiles();
+		return (currentActiveProfiles.contains(profile) ||
+				(currentActiveProfiles.isEmpty() && doGetDefaultProfiles().contains(profile)));
 	}
 
 	/**
@@ -332,9 +356,12 @@ protected boolean isProfileActive(String profile) {
 	 * @see #setDefaultProfiles
 	 */
 	protected void validateProfile(String profile) {
-		Assert.hasText(profile, "Invalid profile [" + profile + "]: must contain text");
-		Assert.isTrue(profile.charAt(0) != '!',
-				"Invalid profile [" + profile + "]: must not begin with the ! operator");
+		if (!StringUtils.hasText(profile)) {
+			throw new IllegalArgumentException("Invalid profile [" + profile + "]: must contain text");
+		}
+		if (profile.charAt(0) == '!') {
+			throw new IllegalArgumentException("Invalid profile [" + profile + "]: must not begin with ! operator");
+		}
 	}
 
 	public MutablePropertySources getPropertySources() {
@@ -343,58 +370,70 @@ public MutablePropertySources getPropertySources() {
 
 	@SuppressWarnings("unchecked")
 	public Map<String, Object> getSystemEnvironment() {
-		Map<String, ?> systemEnvironment;
+		if (suppressGetenvAccess()) {
+			return Collections.emptyMap();
+		}
 		try {
-			systemEnvironment = System.getenv();
+			return (Map) System.getenv();
 		}
 		catch (AccessControlException ex) {
-			systemEnvironment = new ReadOnlySystemAttributesMap() {
+			return (Map) new ReadOnlySystemAttributesMap() {
 				@Override
-				protected String getSystemAttribute(String variableName) {
+				protected String getSystemAttribute(String attributeName) {
 					try {
-						return System.getenv(variableName);
+						return System.getenv(attributeName);
 					}
 					catch (AccessControlException ex) {
 						if (logger.isInfoEnabled()) {
-							logger.info(format("Caught AccessControlException when " +
-									"accessing system environment variable [%s]; its " +
-									"value will be returned [null]. Reason: %s",
-									variableName, ex.getMessage()));
+							logger.info(format("Caught AccessControlException when accessing system " +
+									"environment variable [%s]; its value will be returned [null]. Reason: %s",
+									attributeName, ex.getMessage()));
 						}
 						return null;
 					}
 				}
 			};
 		}
-		return (Map<String, Object>) systemEnvironment;
 	}
 
-	@SuppressWarnings({"unchecked", "rawtypes"})
+	/**
+	 * Determine whether to suppress {@link System#getenv()}/{@link System#getenv(String)}
+	 * access for the purposes of {@link #getSystemEnvironment()}.
+	 * <p>If this method returns {@code true}, an empty dummy Map will be used instead
+	 * of the regular system environment Map, never even trying to call {@code getenv}
+	 * and therefore avoiding security manager warnings (if any).
+	 * <p>The default implementation checks for the "spring.getenv.ignore" system property,
+	 * returning {@code true} if its value equals "true" in any case.
+	 * @see #IGNORE_GETENV_PROPERTY_NAME
+	 * @see SpringProperties#getFlag
+	 */
+	protected boolean suppressGetenvAccess() {
+		return SpringProperties.getFlag(IGNORE_GETENV_PROPERTY_NAME);
+	}
+
+	@SuppressWarnings("unchecked")
 	public Map<String, Object> getSystemProperties() {
-		Map systemProperties;
 		try {
-			systemProperties = System.getProperties();
+			return (Map) System.getProperties();
 		}
 		catch (AccessControlException ex) {
-			systemProperties = new ReadOnlySystemAttributesMap() {
+			return (Map) new ReadOnlySystemAttributesMap() {
 				@Override
-				protected String getSystemAttribute(String propertyName) {
+				protected String getSystemAttribute(String attributeName) {
 					try {
-						return System.getProperty(propertyName);
+						return System.getProperty(attributeName);
 					}
 					catch (AccessControlException ex) {
 						if (logger.isInfoEnabled()) {
-							logger.info(format("Caught AccessControlException when " +
-									"accessing system property [%s]; its value will be " +
-									"returned [null]. Reason: %s",
-									propertyName, ex.getMessage()));
+							logger.info(format("Caught AccessControlException when accessing system " +
+									"property [%s]; its value will be returned [null]. Reason: %s",
+									attributeName, ex.getMessage()));
 						}
 						return null;
 					}
 				}
 			};
 		}
-		return systemProperties;
 	}
 
 	public void merge(ConfigurableEnvironment parent) {
@@ -403,13 +442,21 @@ public void merge(ConfigurableEnvironment parent) {
 				this.propertySources.addLast(ps);
 			}
 		}
-		for (String profile : parent.getActiveProfiles()) {
-			this.activeProfiles.add(profile);
+		String[] parentActiveProfiles = parent.getActiveProfiles();
+		if (!ObjectUtils.isEmpty(parentActiveProfiles)) {
+			synchronized (this.activeProfiles) {
+				for (String profile : parentActiveProfiles) {
+					this.activeProfiles.add(profile);
+				}
+			}
 		}
-		if (parent.getDefaultProfiles().length > 0) {
-			this.defaultProfiles.remove(RESERVED_DEFAULT_PROFILE_NAME);
-			for (String profile : parent.getDefaultProfiles()) {
-				this.defaultProfiles.add(profile);
+		String[] parentDefaultProfiles = parent.getDefaultProfiles();
+		if (!ObjectUtils.isEmpty(parentDefaultProfiles)) {
+			synchronized (this.defaultProfiles) {
+				this.defaultProfiles.remove(RESERVED_DEFAULT_PROFILE_NAME);
+				for (String profile : parentDefaultProfiles) {
+					this.defaultProfiles.add(profile);
+				}
 			}
 		}
 	}
@@ -419,6 +466,44 @@ public void merge(ConfigurableEnvironment parent) {
 	// Implementation of ConfigurablePropertyResolver interface
 	//---------------------------------------------------------------------
 
+	public ConfigurableConversionService getConversionService() {
+		return this.propertyResolver.getConversionService();
+	}
+
+	public void setConversionService(ConfigurableConversionService conversionService) {
+		this.propertyResolver.setConversionService(conversionService);
+	}
+
+	public void setPlaceholderPrefix(String placeholderPrefix) {
+		this.propertyResolver.setPlaceholderPrefix(placeholderPrefix);
+	}
+
+	public void setPlaceholderSuffix(String placeholderSuffix) {
+		this.propertyResolver.setPlaceholderSuffix(placeholderSuffix);
+	}
+
+	public void setValueSeparator(String valueSeparator) {
+		this.propertyResolver.setValueSeparator(valueSeparator);
+	}
+
+	public void setIgnoreUnresolvableNestedPlaceholders(boolean ignoreUnresolvableNestedPlaceholders) {
+		this.propertyResolver.setIgnoreUnresolvableNestedPlaceholders(ignoreUnresolvableNestedPlaceholders);
+	}
+
+	public void setRequiredProperties(String... requiredProperties) {
+		this.propertyResolver.setRequiredProperties(requiredProperties);
+	}
+
+	public void validateRequiredProperties() throws MissingRequiredPropertiesException {
+		this.propertyResolver.validateRequiredProperties();
+	}
+
+
+	//---------------------------------------------------------------------
+	// Implementation of PropertyResolver interface
+	//---------------------------------------------------------------------
+
+	@Override
 	public boolean containsProperty(String key) {
 		return this.propertyResolver.containsProperty(key);
 	}
@@ -437,7 +522,7 @@ public <T> T getProperty(String key, Class<T> targetType) {
 
 	public <T> T getProperty(String key, Class<T> targetType, T defaultValue) {
 		return this.propertyResolver.getProperty(key, targetType, defaultValue);
-	};
+	}
 
 	public <T> Class<T> getPropertyAsClass(String key, Class<T> targetType) {
 		return this.propertyResolver.getPropertyAsClass(key, targetType);
@@ -451,14 +536,6 @@ public <T> T getRequiredProperty(String key, Class<T> targetType) throws Illegal
 		return this.propertyResolver.getRequiredProperty(key, targetType);
 	}
 
-	public void setRequiredProperties(String... requiredProperties) {
-		this.propertyResolver.setRequiredProperties(requiredProperties);
-	}
-
-	public void validateRequiredProperties() throws MissingRequiredPropertiesException {
-		this.propertyResolver.validateRequiredProperties();
-	}
-
 	public String resolvePlaceholders(String text) {
 		return this.propertyResolver.resolvePlaceholders(text);
 	}
@@ -467,30 +544,6 @@ public String resolveRequiredPlaceholders(String text) throws IllegalArgumentExc
 		return this.propertyResolver.resolveRequiredPlaceholders(text);
 	}
 
-	public void setIgnoreUnresolvableNestedPlaceholders(boolean ignoreUnresolvableNestedPlaceholders) {
-		this.propertyResolver.setIgnoreUnresolvableNestedPlaceholders(ignoreUnresolvableNestedPlaceholders);
-	}
-
-	public void setConversionService(ConfigurableConversionService conversionService) {
-		this.propertyResolver.setConversionService(conversionService);
-	}
-
-	public ConfigurableConversionService getConversionService() {
-		return this.propertyResolver.getConversionService();
-	}
-
-	public void setPlaceholderPrefix(String placeholderPrefix) {
-		this.propertyResolver.setPlaceholderPrefix(placeholderPrefix);
-	}
-
-	public void setPlaceholderSuffix(String placeholderSuffix) {
-		this.propertyResolver.setPlaceholderSuffix(placeholderSuffix);
-	}
-
-	public void setValueSeparator(String valueSeparator) {
-		this.propertyResolver.setValueSeparator(valueSeparator);
-	}
-
 
 	@Override
 	public String toString() {
diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java b/spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java
index 9d61649648..4b02991acc 100644
--- a/spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,25 +16,22 @@
 
 package org.springframework.core.env;
 
-import static java.lang.String.format;
-import static org.springframework.util.SystemPropertyUtils.PLACEHOLDER_PREFIX;
-import static org.springframework.util.SystemPropertyUtils.PLACEHOLDER_SUFFIX;
-import static org.springframework.util.SystemPropertyUtils.VALUE_SEPARATOR;
-
 import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.util.PropertyPlaceholderHelper;
-import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;
+import org.springframework.util.SystemPropertyUtils;
 
 /**
  * Abstract base class for resolving properties against any underlying source.
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  * @since 3.1
  */
 public abstract class AbstractPropertyResolver implements ConfigurablePropertyResolver {
@@ -44,15 +41,20 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
 	protected ConfigurableConversionService conversionService = new DefaultConversionService();
 
 	private PropertyPlaceholderHelper nonStrictHelper;
+
 	private PropertyPlaceholderHelper strictHelper;
+
 	private boolean ignoreUnresolvableNestedPlaceholders = false;
 
-	private String placeholderPrefix = PLACEHOLDER_PREFIX;
-	private String placeholderSuffix = PLACEHOLDER_SUFFIX;
-	private String valueSeparator = VALUE_SEPARATOR;
+	private String placeholderPrefix = SystemPropertyUtils.PLACEHOLDER_PREFIX;
+
+	private String placeholderSuffix = SystemPropertyUtils.PLACEHOLDER_SUFFIX;
+
+	private String valueSeparator = SystemPropertyUtils.VALUE_SEPARATOR;
 
 	private final Set<String> requiredProperties = new LinkedHashSet<String>();
 
+
 	public ConfigurableConversionService getConversionService() {
 		return this.conversionService;
 	}
@@ -61,14 +63,46 @@ public void setConversionService(ConfigurableConversionService conversionService
 		this.conversionService = conversionService;
 	}
 
-	public String getProperty(String key, String defaultValue) {
-		String value = getProperty(key);
-		return value == null ? defaultValue : value;
+	/**
+	 * Set the prefix that placeholders replaced by this resolver must begin with.
+	 * <p>The default is "${".
+	 * @see org.springframework.util.SystemPropertyUtils#PLACEHOLDER_PREFIX
+	 */
+	public void setPlaceholderPrefix(String placeholderPrefix) {
+		this.placeholderPrefix = placeholderPrefix;
 	}
 
-	public <T> T getProperty(String key, Class<T> targetType, T defaultValue) {
-		T value = getProperty(key, targetType);
-		return value == null ? defaultValue : value;
+	/**
+	 * Set the suffix that placeholders replaced by this resolver must end with.
+	 * <p>The default is "}".
+	 * @see org.springframework.util.SystemPropertyUtils#PLACEHOLDER_SUFFIX
+	 */
+	public void setPlaceholderSuffix(String placeholderSuffix) {
+		this.placeholderSuffix = placeholderSuffix;
+	}
+
+	/**
+	 * Specify the separating character between the placeholders replaced by this
+	 * resolver and their associated default value, or {@code null} if no such
+	 * special character should be processed as a value separator.
+	 * <p>The default is ":".
+	 * @see org.springframework.util.SystemPropertyUtils#VALUE_SEPARATOR
+	 */
+	public void setValueSeparator(String valueSeparator) {
+		this.valueSeparator = valueSeparator;
+	}
+
+	/**
+	 * Set whether to throw an exception when encountering an unresolvable placeholder
+	 * nested within the value of a given property. A {@code false} value indicates strict
+	 * resolution, i.e. that an exception will be thrown. A {@code true} value indicates
+	 * that unresolvable nested placeholders should be passed through in their unresolved
+	 * ${...} form.
+	 * <p>The default is {@code false}.
+	 * @since 3.2
+	 */
+	public void setIgnoreUnresolvableNestedPlaceholders(boolean ignoreUnresolvableNestedPlaceholders) {
+		this.ignoreUnresolvableNestedPlaceholders = ignoreUnresolvableNestedPlaceholders;
 	}
 
 	public void setRequiredProperties(String... requiredProperties) {
@@ -89,10 +123,21 @@ public void validateRequiredProperties() {
 		}
 	}
 
+
+	public String getProperty(String key, String defaultValue) {
+		String value = getProperty(key);
+		return (value != null ? value : defaultValue);
+	}
+
+	public <T> T getProperty(String key, Class<T> targetType, T defaultValue) {
+		T value = getProperty(key, targetType);
+		return (value != null ? value : defaultValue);
+	}
+
 	public String getRequiredProperty(String key) throws IllegalStateException {
 		String value = getProperty(key);
 		if (value == null) {
-			throw new IllegalStateException(format("required key [%s] not found", key));
+			throw new IllegalStateException(String.format("required key [%s] not found", key));
 		}
 		return value;
 	}
@@ -100,69 +145,40 @@ public String getRequiredProperty(String key) throws IllegalStateException {
 	public <T> T getRequiredProperty(String key, Class<T> valueType) throws IllegalStateException {
 		T value = getProperty(key, valueType);
 		if (value == null) {
-			throw new IllegalStateException(format("required key [%s] not found", key));
+			throw new IllegalStateException(String.format("required key [%s] not found", key));
 		}
 		return value;
 	}
 
-	/**
-	 * {@inheritDoc} The default is "${".
-	 * @see org.springframework.util.SystemPropertyUtils#PLACEHOLDER_PREFIX
-	 */
-	public void setPlaceholderPrefix(String placeholderPrefix) {
-		this.placeholderPrefix = placeholderPrefix;
-	}
-
-	/**
-	 * {@inheritDoc} The default is "}".
-	 * @see org.springframework.util.SystemPropertyUtils#PLACEHOLDER_SUFFIX
-	 */
-	public void setPlaceholderSuffix(String placeholderSuffix) {
-		this.placeholderSuffix = placeholderSuffix;
-	}
-
-	/**
-	 * {@inheritDoc} The default is ":".
-	 * @see org.springframework.util.SystemPropertyUtils#VALUE_SEPARATOR
-	 */
-	public void setValueSeparator(String valueSeparator) {
-		this.valueSeparator = valueSeparator;
-	}
-
 	public String resolvePlaceholders(String text) {
-		if (nonStrictHelper == null) {
-			nonStrictHelper = createPlaceholderHelper(true);
+		if (this.nonStrictHelper == null) {
+			this.nonStrictHelper = createPlaceholderHelper(true);
 		}
-		return doResolvePlaceholders(text, nonStrictHelper);
+		return doResolvePlaceholders(text, this.nonStrictHelper);
 	}
 
 	public String resolveRequiredPlaceholders(String text) throws IllegalArgumentException {
-		if (strictHelper == null) {
-			strictHelper = createPlaceholderHelper(false);
+		if (this.strictHelper == null) {
+			this.strictHelper = createPlaceholderHelper(false);
 		}
-		return doResolvePlaceholders(text, strictHelper);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>The default value for this implementation is {@code false}.
-	 * @since 3.2
-	 */
-	public void setIgnoreUnresolvableNestedPlaceholders(boolean ignoreUnresolvableNestedPlaceholders) {
-		this.ignoreUnresolvableNestedPlaceholders = ignoreUnresolvableNestedPlaceholders;
+		return doResolvePlaceholders(text, this.strictHelper);
 	}
 
 	/**
 	 * Resolve placeholders within the given string, deferring to the value of
-	 * {@link #setIgnoreUnresolvableNestedPlaceholders(boolean)} to determine whether any
+	 * {@link #setIgnoreUnresolvableNestedPlaceholders} to determine whether any
 	 * unresolvable placeholders should raise an exception or be ignored.
+	 * <p>Invoked from {@link #getProperty} and its variants, implicitly resolving
+	 * nested placeholders. In contrast, {@link #resolvePlaceholders} and
+	 * {@link #resolveRequiredPlaceholders} do <emphasis>not</emphasis> delegate
+	 * to this method but rather perform their own handling of unresolvable
+	 * placeholders, as specified by each of those methods.
 	 * @since 3.2
-	 * @see #setIgnoreUnresolvableNestedPlaceholders(boolean)
+	 * @see #setIgnoreUnresolvableNestedPlaceholders
 	 */
 	protected String resolveNestedPlaceholders(String value) {
-		return this.ignoreUnresolvableNestedPlaceholders ?
-				this.resolvePlaceholders(value) :
-				this.resolveRequiredPlaceholders(value);
+		return (this.ignoreUnresolvableNestedPlaceholders ?
+				resolvePlaceholders(value) : resolveRequiredPlaceholders(value));
 	}
 
 	private PropertyPlaceholderHelper createPlaceholderHelper(boolean ignoreUnresolvablePlaceholders) {
@@ -171,11 +187,20 @@ private PropertyPlaceholderHelper createPlaceholderHelper(boolean ignoreUnresolv
 	}
 
 	private String doResolvePlaceholders(String text, PropertyPlaceholderHelper helper) {
-		return helper.replacePlaceholders(text, new PlaceholderResolver() {
+		return helper.replacePlaceholders(text, new PropertyPlaceholderHelper.PlaceholderResolver() {
 			public String resolvePlaceholder(String placeholderName) {
-				return getProperty(placeholderName);
+				return getPropertyAsRawString(placeholderName);
 			}
 		});
 	}
 
+
+	/**
+	 * Retrieve the specified property as a raw String,
+	 * i.e. without resolution of nested placeholders.
+	 * @param key the property name to resolve
+	 * @return the property value or {@code null} if none found
+	 */
+	protected abstract String getPropertyAsRawString(String key);
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
index ba7d8c7074..575cd359a4 100644
--- a/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -193,35 +193,37 @@ public abstract class CommandLinePropertySource<T> extends PropertySource<T> {
 	/** The default name of the property representing non-option arguments: {@value} */
 	public static final String DEFAULT_NON_OPTION_ARGS_PROPERTY_NAME = "nonOptionArgs";
 
+
 	private String nonOptionArgsPropertyName = DEFAULT_NON_OPTION_ARGS_PROPERTY_NAME;
 
+
 	/**
-	 * Create a new {@code CommandLinePropertySource} having the default name {@value
-	 * #COMMAND_LINE_PROPERTY_SOURCE_NAME} and backed by the given source object.
+	 * Create a new {@code CommandLinePropertySource} having the default name
+	 * {@value #COMMAND_LINE_PROPERTY_SOURCE_NAME} and backed by the given source object.
 	 */
 	public CommandLinePropertySource(T source) {
 		super(COMMAND_LINE_PROPERTY_SOURCE_NAME, source);
 	}
 
 	/**
-	 * Create a new {@link CommandLinePropertySource} having the given name and backed by
-	 * the given source object.
+	 * Create a new {@link CommandLinePropertySource} having the given name
+	 * and backed by the given source object.
 	 */
 	public CommandLinePropertySource(String name, T source) {
 		super(name, source);
 	}
 
+
 	/**
-	 * Specify the name of the special "non-option arguments" property. The default is
-	 * {@value #DEFAULT_NON_OPTION_ARGS_PROPERTY_NAME}.
+	 * Specify the name of the special "non-option arguments" property.
+	 * The default is {@value #DEFAULT_NON_OPTION_ARGS_PROPERTY_NAME}.
 	 */
 	public void setNonOptionArgsPropertyName(String nonOptionArgsPropertyName) {
 		this.nonOptionArgsPropertyName = nonOptionArgsPropertyName;
 	}
 
 	/**
-	 * Return whether this {@code PropertySource} contains a property with the given name.
-	 * <p>This implementation first checks to see if the name specified is the special
+	 * This implementation first checks to see if the name specified is the special
 	 * {@linkplain #setNonOptionArgsPropertyName(String) "non-option arguments" property},
 	 * and if so delegates to the abstract {@link #getNonOptionArgs()} method
 	 * checking to see whether it returns an empty collection. Otherwise delegates to and
@@ -236,8 +238,7 @@ public final boolean containsProperty(String name) {
 	}
 
 	/**
-	 * {@inheritDoc}
-	 * <p>This implementation first checks to see if the name specified is the special
+	 * This implementation first checks to see if the name specified is the special
 	 * {@linkplain #setNonOptionArgsPropertyName(String) "non-option arguments" property},
 	 * and if so delegates to the abstract {@link #getNonOptionArgs()} method. If so
 	 * and the collection of non-option arguments is empty, this method returns {@code
@@ -265,6 +266,7 @@ public final String getProperty(String name) {
 		}
 	}
 
+
 	/**
 	 * Return whether the set of option arguments parsed from the command line contains
 	 * an option with the given name.
@@ -288,8 +290,8 @@ public final String getProperty(String name) {
 	protected abstract List<String> getOptionValues(String name);
 
 	/**
-	 * Return the collection of non-option arguments parsed from the command line. Never
-	 * {@code null}.
+	 * Return the collection of non-option arguments parsed from the command line.
+	 * Never {@code null}.
 	 */
 	protected abstract List<String> getNonOptionArgs();
 
diff --git a/spring-core/src/main/java/org/springframework/core/env/CompositePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/CompositePropertySource.java
index 229c9cd228..f05d0ce4cd 100644
--- a/spring-core/src/main/java/org/springframework/core/env/CompositePropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/CompositePropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,12 +29,11 @@
  */
 public class CompositePropertySource extends PropertySource<Object> {
 
-	private Set<PropertySource<?>> propertySources = new LinkedHashSet<PropertySource<?>>();
+	private final Set<PropertySource<?>> propertySources = new LinkedHashSet<PropertySource<?>>();
 
 
 	/**
 	 * Create a new {@code CompositePropertySource}.
-	 *
 	 * @param name the name of the property source
 	 */
 	public CompositePropertySource(String name) {
@@ -60,6 +59,7 @@ public void addPropertySource(PropertySource<?> propertySource) {
 	@Override
 	public String toString() {
 		return String.format("%s [name='%s', propertySources=%s]",
-				this.getClass().getSimpleName(), this.name, this.propertySources);
+				getClass().getSimpleName(), this.name, this.propertySources);
 	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java
index 9e7cb58e7d..5ba0763ac5 100644
--- a/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,24 +35,24 @@
  *
  * <h4>Example: adding a new property source with highest search priority</h4>
  * <pre class="code">
- *   ConfigurableEnvironment environment = new StandardEnvironment();
- *   MutablePropertySources propertySources = environment.getPropertySources();
- *   Map<String, String> myMap = new HashMap<String, String>();
- *   myMap.put("xyz", "myValue");
- *   propertySources.addFirst(new MapPropertySource("MY_MAP", myMap));
+ * ConfigurableEnvironment environment = new StandardEnvironment();
+ * MutablePropertySources propertySources = environment.getPropertySources();
+ * Map<String, String> myMap = new HashMap<String, String>();
+ * myMap.put("xyz", "myValue");
+ * propertySources.addFirst(new MapPropertySource("MY_MAP", myMap));
  * </pre>
  *
  * <h4>Example: removing the default system properties property source</h4>
  * <pre class="code">
- *   MutablePropertySources propertySources = environment.getPropertySources();
- *   propertySources.remove(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME)
+ * MutablePropertySources propertySources = environment.getPropertySources();
+ * propertySources.remove(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME)
  * </pre>
  *
  * <h4>Example: mocking the system environment for testing purposes</h4>
  * <pre class="code">
- *   MutablePropertySources propertySources = environment.getPropertySources();
- *   MockPropertySource mockEnvVars = new MockPropertySource().withProperty("xyz", "myValue");
- *   propertySources.replace(StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME, mockEnvVars);
+ * MutablePropertySources propertySources = environment.getPropertySources();
+ * MockPropertySource mockEnvVars = new MockPropertySource().withProperty("xyz", "myValue");
+ * propertySources.replace(StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME, mockEnvVars);
  * </pre>
  *
  * When an {@link Environment} is being used by an {@code ApplicationContext}, it is
@@ -64,7 +64,6 @@
  * org.springframework.context.support.PropertySourcesPlaceholderConfigurer property
  * placeholder configurers}.
  *
- *
  * @author Chris Beams
  * @since 3.1
  * @see StandardEnvironment
diff --git a/spring-core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java b/spring-core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java
index 823ae43863..bc626d6431 100644
--- a/spring-core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@
 import org.springframework.core.convert.support.ConfigurableConversionService;
 
 /**
- * Configuration interface to be implemented by most if not all {@link PropertyResolver
- * PropertyResolver} types. Provides facilities for accessing and customizing the
- * {@link org.springframework.core.convert.ConversionService ConversionService} used when
- * converting property values from one type to another.
+ * Configuration interface to be implemented by most if not all {@link PropertyResolver}
+ * types. Provides facilities for accessing and customizing the
+ * {@link org.springframework.core.convert.ConversionService ConversionService}
+ * used when converting property values from one type to another.
  *
  * @author Chris Beams
  * @since 3.1
@@ -30,7 +30,7 @@
 public interface ConfigurablePropertyResolver extends PropertyResolver {
 
 	/**
-	 * @return the {@link ConfigurableConversionService} used when performing type
+	 * Return the {@link ConfigurableConversionService} used when performing type
 	 * conversions on properties.
 	 * <p>The configurable nature of the returned conversion service allows for
 	 * the convenient addition and removal of individual {@code Converter} instances:
@@ -46,10 +46,10 @@ public interface ConfigurablePropertyResolver extends PropertyResolver {
 	/**
 	 * Set the {@link ConfigurableConversionService} to be used when performing type
 	 * conversions on properties.
-	 * <p><strong>Note:</strong> as an alternative to fully replacing the {@code
-	 * ConversionService}, consider adding or removing individual {@code Converter}
-	 * instances by drilling into {@link #getConversionService()} and calling methods
-	 * such as {@code #addConverter}.
+	 * <p><strong>Note:</strong> as an alternative to fully replacing the
+	 * {@code ConversionService}, consider adding or removing individual
+	 * {@code Converter} instances by drilling into {@link #getConversionService()}
+	 * and calling methods such as {@code #addConverter}.
 	 * @see PropertyResolver#getProperty(String, Class)
 	 * @see #getConversionService()
 	 * @see org.springframework.core.convert.converter.ConverterRegistry#addConverter
@@ -73,6 +73,19 @@ public interface ConfigurablePropertyResolver extends PropertyResolver {
 	 */
 	void setValueSeparator(String valueSeparator);
 
+	/**
+	 * Set whether to throw an exception when encountering an unresolvable placeholder
+	 * nested within the value of a given property. A {@code false} value indicates strict
+	 * resolution, i.e. that an exception will be thrown. A {@code true} value indicates
+	 * that unresolvable nested placeholders should be passed through in their unresolved
+	 * ${...} form.
+	 * <p>Implementations of {@link #getProperty(String)} and its variants must inspect
+	 * the value set here to determine correct behavior when property values contain
+	 * unresolvable placeholders.
+	 * @since 3.2
+	 */
+	void setIgnoreUnresolvableNestedPlaceholders(boolean ignoreUnresolvableNestedPlaceholders);
+
 	/**
 	 * Specify which properties must be present, to be verified by
 	 * {@link #validateRequiredProperties()}.
@@ -88,16 +101,4 @@ public interface ConfigurablePropertyResolver extends PropertyResolver {
 	 */
 	void validateRequiredProperties() throws MissingRequiredPropertiesException;
 
-	/**
-	 * Set whether to throw an exception when encountering an unresolvable placeholder
-	 * nested within the value of a given property. A {@code false} value indicates strict
-	 * resolution, i.e. that an exception will be thrown. A {@code true} value indicates
-	 * that unresolvable nested placeholders should be passed through in their unresolved
-	 * ${...} form.
-	 * <p>Implementations of {@link #getProperty(String)} and its variants must inspect
-	 * the value set here to determine correct behavior when property values contain
-	 * unresolvable placeholders.
-	 * @since 3.2
-	 */
-	void setIgnoreUnresolvableNestedPlaceholders(boolean ignoreUnresolvableNestedPlaceholders);
 }
diff --git a/spring-core/src/main/java/org/springframework/core/env/EnumerablePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/EnumerablePropertySource.java
index a8767da54e..c674202519 100644
--- a/spring-core/src/main/java/org/springframework/core/env/EnumerablePropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/EnumerablePropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.util.Assert;
 
 /**
@@ -40,10 +41,12 @@
  * or not.
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  * @since 3.1
  */
 public abstract class EnumerablePropertySource<T> extends PropertySource<T> {
 
+	@Deprecated
 	protected static final String[] EMPTY_NAMES_ARRAY = new String[0];
 
 	protected final Log logger = LogFactory.getLog(getClass());
@@ -53,21 +56,16 @@ public EnumerablePropertySource(String name, T source) {
 		super(name, source);
 	}
 
-	/**
-	 * Return the names of all properties contained by the {@linkplain #getSource()
-	 * source} object (never {@code null}).
-	 */
-	public abstract String[] getPropertyNames();
 
 	/**
 	 * Return whether this {@code PropertySource} contains a property with the given name.
-	 * <p>This implementation checks for the presence of the given name within
-	 * the {@link #getPropertyNames()} array.
-	 * @param name the property to find
+	 * <p>This implementation checks for the presence of the given name within the
+	 * {@link #getPropertyNames()} array.
+	 * @param name the name of the property to find
 	 */
 	public boolean containsProperty(String name) {
-		Assert.notNull(name, "property name must not be null");
-		for (String candidate : this.getPropertyNames()) {
+		Assert.notNull(name, "Property name must not be null");
+		for (String candidate : getPropertyNames()) {
 			if (candidate.equals(name)) {
 				if (logger.isDebugEnabled()) {
 					logger.debug(String.format("PropertySource [%s] contains '%s'", getName(), name));
@@ -81,4 +79,10 @@ public boolean containsProperty(String name) {
 		return false;
 	}
 
+	/**
+	 * Return the names of all properties contained by the
+	 * {@linkplain #getSource() source} object (never {@code null}).
+	 */
+	public abstract String[] getPropertyNames();
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/env/Environment.java b/spring-core/src/main/java/org/springframework/core/env/Environment.java
index 3f9ee725e2..52c8717e94 100644
--- a/spring-core/src/main/java/org/springframework/core/env/Environment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/Environment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,10 +77,8 @@ public interface Environment extends PropertyResolver {
 	 * activated by setting {@linkplain AbstractEnvironment#ACTIVE_PROFILES_PROPERTY_NAME
 	 * "spring.profiles.active"} as a system property or by calling
 	 * {@link ConfigurableEnvironment#setActiveProfiles(String...)}.
-	 *
-	 * <p>If no profiles have explicitly been specified as active, then any {@linkplain
-	 * #getDefaultProfiles() default profiles} will automatically be activated.
-	 *
+	 * <p>If no profiles have explicitly been specified as active, then any
+	 * {@linkplain #getDefaultProfiles() default profiles} will automatically be activated.
 	 * @see #getDefaultProfiles
 	 * @see ConfigurableEnvironment#setActiveProfiles
 	 * @see AbstractEnvironment#ACTIVE_PROFILES_PROPERTY_NAME
@@ -90,7 +88,6 @@ public interface Environment extends PropertyResolver {
 	/**
 	 * Return the set of profiles to be active by default when no active profiles have
 	 * been set explicitly.
-	 *
 	 * @see #getActiveProfiles
 	 * @see ConfigurableEnvironment#setDefaultProfiles
 	 * @see AbstractEnvironment#DEFAULT_PROFILES_PROPERTY_NAME
@@ -101,11 +98,11 @@ public interface Environment extends PropertyResolver {
 	 * Return whether one or more of the given profiles is active or, in the case of no
 	 * explicit active profiles, whether one or more of the given profiles is included in
 	 * the set of default profiles. If a profile begins with '!' the logic is inverted,
-	 * i.e. the method will return true if the given profile is <em>not</em> active. For
-	 * example, <pre>env.acceptsProfiles("p1", "!p2")</pre> will return true if profile
-	 * 'p1' is active or 'p2' is not active.
+	 * i.e. the method will return true if the given profile is <em>not</em> active.
+	 * For example, <pre class="code">env.acceptsProfiles("p1", "!p2")</pre> will
+	 * return {@code true} if profile 'p1' is active or 'p2' is not active.
 	 * @throws IllegalArgumentException if called with zero arguments
-	 * @throws IllegalArgumentException if any profile is null, empty or whitespace-only
+	 * or if any profile is {@code null}, empty or whitespace-only
 	 * @see #getActiveProfiles
 	 * @see #getDefaultProfiles
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/env/EnvironmentCapable.java b/spring-core/src/main/java/org/springframework/core/env/EnvironmentCapable.java
index e95528fa35..7d6ca3875f 100644
--- a/spring-core/src/main/java/org/springframework/core/env/EnvironmentCapable.java
+++ b/spring-core/src/main/java/org/springframework/core/env/EnvironmentCapable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,8 @@
 
 package org.springframework.core.env;
 
-
 /**
- * Interface indicating a component contains and makes available an {@link Environment} object.
+ * Interface indicating a component that contains and exposes an {@link Environment} reference.
  *
  * <p>All Spring application contexts are EnvironmentCapable, and the interface is used primarily
  * for performing {@code instanceof} checks in framework methods that accept BeanFactory
@@ -29,20 +28,20 @@
  * extends EnvironmentCapable, and thus exposes a {@link #getEnvironment()} method; however,
  * {@link org.springframework.context.ConfigurableApplicationContext ConfigurableApplicationContext}
  * redefines {@link org.springframework.context.ConfigurableApplicationContext#getEnvironment
- * getEnvironment()} and narrows the signature to return a {@link ConfigurableEnvironment}. The effect
- * is that an Environment object is 'read-only' until it accessed from a ConfigurableApplicationContext,
- * at which point it too may be configured.
+ * getEnvironment()} and narrows the signature to return a {@link ConfigurableEnvironment}.
+ * The effect is that an Environment object is 'read-only' until it is being accessed from
+ * a ConfigurableApplicationContext, at which point it too may be configured.
  *
  * @author Chris Beams
  * @since 3.1
  * @see Environment
  * @see ConfigurableEnvironment
- * @see org.springframework.context.ConfigurableApplicationContext#getEnvironment
+ * @see org.springframework.context.ConfigurableApplicationContext#getEnvironment()
  */
 public interface EnvironmentCapable {
 
 	/**
-	 * Return the Environment for this object
+	 * Return the {@link Environment} associated with this component.
 	 */
 	Environment getEnvironment();
 
diff --git a/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
index 154c34d623..61ed06a6d0 100644
--- a/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,8 @@
 
 import joptsimple.OptionSet;
 
+import org.springframework.util.Assert;
+
 /**
  * {@link CommandLinePropertySource} implementation backed by a JOpt {@link OptionSet}.
  *
@@ -41,12 +43,10 @@
  *
  * See {@link CommandLinePropertySource} for complete general usage examples.
  *
- * <h3>Requirements</h3>
- *
- * <p>Use of this class requires adding the jopt-simple JAR to your application classpath.
- * Versions 3.0 and better are supported.
+ * <p>Requires JOpt version 3.0 or higher. Tested against JOpt up until 4.6.
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  * @since 3.1
  * @see CommandLinePropertySource
  * @see joptsimple.OptionParser
@@ -72,6 +72,7 @@ public JOptCommandLinePropertySource(String name, OptionSet options) {
 		super(name, options);
 	}
 
+
 	@Override
 	protected boolean containsOption(String name) {
 		return this.source.has(name);
@@ -81,26 +82,26 @@ protected boolean containsOption(String name) {
 	public List<String> getOptionValues(String name) {
 		List<?> argValues = this.source.valuesOf(name);
 		List<String> stringArgValues = new ArrayList<String>();
-		for(Object argValue : argValues) {
-			if (!(argValue instanceof String)) {
-				throw new IllegalArgumentException("argument values must be of type String");
-			}
-			stringArgValues.add((String)argValue);
+		for (Object argValue : argValues) {
+			Assert.isInstanceOf(String.class, argValue, "Argument values must be of type String");
+			stringArgValues.add((String) argValue);
 		}
-		if (stringArgValues.size() == 0) {
-			if (this.source.has(name)) {
-				return Collections.emptyList();
-			}
-			else {
-				return null;
-			}
+		if (stringArgValues.isEmpty()) {
+			return (this.source.has(name) ? Collections.<String>emptyList() : null);
 		}
 		return Collections.unmodifiableList(stringArgValues);
 	}
 
 	@Override
 	protected List<String> getNonOptionArgs() {
-		return this.source.nonOptionArguments();
+		List<?> argValues = this.source.nonOptionArguments();
+		List<String> stringArgValues = new ArrayList<String>();
+		for (Object argValue : argValues) {
+			Assert.isInstanceOf(String.class, argValue, "Argument values must be of type String");
+			stringArgValues.add((String) argValue);
+		}
+		return (stringArgValues.isEmpty() ? Collections.<String>emptyList() :
+				Collections.unmodifiableList(stringArgValues));
 	}
 
 }
diff --git a/spring-core/src/main/java/org/springframework/core/env/MapPropertySource.java b/spring-core/src/main/java/org/springframework/core/env/MapPropertySource.java
index b8b62706c1..3bcd2fedbe 100644
--- a/spring-core/src/main/java/org/springframework/core/env/MapPropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/MapPropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 
 import java.util.Map;
 
+import org.springframework.util.StringUtils;
+
 /**
  * {@link PropertySource} that reads keys and values from a {@code Map} object.
  *
@@ -31,6 +33,7 @@ public MapPropertySource(String name, Map<String, Object> source) {
 		super(name, source);
 	}
 
+
 	@Override
 	public Object getProperty(String name) {
 		return this.source.get(name);
@@ -38,7 +41,7 @@ public Object getProperty(String name) {
 
 	@Override
 	public String[] getPropertyNames() {
-		return this.source.keySet().toArray(EMPTY_NAMES_ARRAY);
+		return StringUtils.toStringArray(this.source.keySet());
 	}
 
 }
diff --git a/spring-core/src/main/java/org/springframework/core/env/MutablePropertySources.java b/spring-core/src/main/java/org/springframework/core/env/MutablePropertySources.java
index b085d09afd..507704bda8 100644
--- a/spring-core/src/main/java/org/springframework/core/env/MutablePropertySources.java
+++ b/spring-core/src/main/java/org/springframework/core/env/MutablePropertySources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -66,7 +67,7 @@ public MutablePropertySources(PropertySources propertySources) {
 	}
 
 	/**
-	 * Create a new {@link MutablePropertySources} object and inheriting the given logger,
+	 * Create a new {@link MutablePropertySources} object and inherit the given logger,
 	 * usually from an enclosing {@link Environment}.
 	 */
 	MutablePropertySources(Log logger) {
@@ -127,7 +128,7 @@ public void addBefore(String relativePropertySourceName, PropertySource<?> prope
 	}
 
 	/**
-	 * Add the given property source object with precedence immediately lower than
+	 * Add the given property source object with precedence immediately lower
 	 * than the named relative property source.
 	 */
 	public void addAfter(String relativePropertySourceName, PropertySource<?> propertySource) {
@@ -184,7 +185,7 @@ public int size() {
 	}
 
 	@Override
-	public synchronized String toString() {
+	public String toString() {
 		String[] names = new String[this.size()];
 		for (int i=0; i < size(); i++) {
 			names[i] = this.propertySourceList.get(i).getName();
@@ -202,7 +203,7 @@ protected void assertLegalRelativeAddition(String relativePropertySourceName, Pr
 	}
 
 	/**
-	 * Log the removal of the given propertySource if it is present.
+	 * Remove the given property source if it is present.
 	 */
 	protected void removeIfPresent(PropertySource<?> propertySource) {
 		if (this.propertySourceList.contains(propertySource)) {
diff --git a/spring-core/src/main/java/org/springframework/core/env/PropertyResolver.java b/spring-core/src/main/java/org/springframework/core/env/PropertyResolver.java
index cf94472c0c..b3ce15b6f6 100644
--- a/spring-core/src/main/java/org/springframework/core/env/PropertyResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/env/PropertyResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,8 +74,9 @@ public interface PropertyResolver {
 	/**
 	 * Convert the property value associated with the given key to a {@code Class}
 	 * of type {@code T} or {@code null} if the key cannot be resolved.
-	 * @throws ConversionException if class specified by property value cannot be found
-	 * or loaded or if targetType is not assignable from class specified by property value
+	 * @throws org.springframework.core.convert.ConversionException if class specified
+	 * by property value cannot be found  or loaded or if targetType is not assignable
+	 * from class specified by property value
 	 * @see #getProperty(String, Class)
 	 */
 	<T> Class<T> getPropertyAsClass(String key, Class<T> targetType);
@@ -113,8 +114,9 @@ public interface PropertyResolver {
 	 * no default value will cause an IllegalArgumentException to be thrown.
 	 * @return the resolved String (never {@code null})
 	 * @throws IllegalArgumentException if given text is {@code null}
-	 * @throws IllegalArgumentException if any placeholders are unresolvable
+	 * or if any placeholders are unresolvable
 	 * @see org.springframework.util.SystemPropertyUtils#resolvePlaceholders(String, boolean)
 	 */
 	String resolveRequiredPlaceholders(String text) throws IllegalArgumentException;
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/env/PropertySource.java b/spring-core/src/main/java/org/springframework/core/env/PropertySource.java
index aab278b895..3fbdd045c7 100644
--- a/spring-core/src/main/java/org/springframework/core/env/PropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/PropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Abstract base class representing a source of name/value property pairs. The underlying
@@ -55,12 +57,13 @@
  */
 public abstract class PropertySource<T> {
 
-	protected final Log logger = LogFactory.getLog(this.getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
 	protected final String name;
 
 	protected final T source;
 
+
 	/**
 	 * Create a new {@code PropertySource} with the given name and source object.
 	 */
@@ -74,15 +77,15 @@ public PropertySource(String name, T source) {
 	/**
 	 * Create a new {@code PropertySource} with the given name and with a new {@code Object}
 	 * instance as the underlying source.
-	 * <p>Often useful in testing scenarios when creating
-	 * anonymous implementations that never query an actual source, but rather return
-	 * hard-coded values.
+	 * <p>Often useful in testing scenarios when creating anonymous implementations that
+	 * never query an actual source but rather return hard-coded values.
 	 */
 	@SuppressWarnings("unchecked")
 	public PropertySource(String name) {
 		this(name, (T) new Object());
 	}
 
+
 	/**
 	 * Return the name of this {@code PropertySource}
 	 */
@@ -94,91 +97,75 @@ public String getName() {
 	 * Return the underlying source object for this {@code PropertySource}.
 	 */
 	public T getSource() {
-		return source;
+		return this.source;
 	}
 
 	/**
 	 * Return whether this {@code PropertySource} contains the given name.
-	 * <p>This implementation simply checks for a null return value
-	 * from {@link #getProperty(String)}. Subclasses may wish to
-	 * implement a more efficient algorithm if possible.
+	 * <p>This implementation simply checks for a {@code null} return value
+	 * from {@link #getProperty(String)}. Subclasses may wish to implement
+	 * a more efficient algorithm if possible.
 	 * @param name the property name to find
 	 */
 	public boolean containsProperty(String name) {
-		return this.getProperty(name) != null;
+		return (getProperty(name) != null);
 	}
 
 	/**
-	 * Return the value associated with the given name, {@code null} if not found.
+	 * Return the value associated with the given name,
+	 * or {@code null} if not found.
 	 * @param name the property to find
 	 * @see PropertyResolver#getRequiredProperty(String)
 	 */
 	public abstract Object getProperty(String name);
 
-	/**
-	 * Return a hashcode derived from the {@code name} property of this {@code PropertySource}
-	 * object.
-	 */
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((this.name == null) ? 0 : this.name.hashCode());
-		return result;
-	}
 
 	/**
 	 * This {@code PropertySource} object is equal to the given object if:
 	 * <ul>
-	 *   <li>they are the same instance
-	 *   <li>the {@code name} properties for both objects are equal
+	 * <li>they are the same instance
+	 * <li>the {@code name} properties for both objects are equal
 	 * </ul>
-	 *
-	 * <P>No properties other than {@code name} are evaluated.
+	 * <p>No properties other than {@code name} are evaluated.
 	 */
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (!(obj instanceof PropertySource))
-			return false;
-		PropertySource<?> other = (PropertySource<?>) obj;
-		if (this.name == null) {
-			if (other.name != null)
-				return false;
-		} else if (!this.name.equals(other.name))
-			return false;
-		return true;
+		return (this == obj || (obj instanceof PropertySource &&
+				ObjectUtils.nullSafeEquals(this.name, ((PropertySource<?>) obj).name)));
+	}
+
+	/**
+	 * Return a hash code derived from the {@code name} property
+	 * of this {@code PropertySource} object.
+	 */
+	@Override
+	public int hashCode() {
+		return ObjectUtils.nullSafeHashCode(this.name);
 	}
 
 	/**
 	 * Produce concise output (type and name) if the current log level does not include
-	 * debug. If debug is enabled, produce verbose output including hashcode of the
+	 * debug. If debug is enabled, produce verbose output including the hash code of the
 	 * PropertySource instance and every name/value property pair.
-	 *
-	 * This variable verbosity is useful as a property source such as system properties
+	 * <p>This variable verbosity is useful as a property source such as system properties
 	 * or environment variables may contain an arbitrary number of property pairs,
 	 * potentially leading to difficult to read exception and log messages.
-	 *
 	 * @see Log#isDebugEnabled()
 	 */
 	@Override
 	public String toString() {
 		if (logger.isDebugEnabled()) {
 			return String.format("%s@%s [name='%s', properties=%s]",
-					this.getClass().getSimpleName(), System.identityHashCode(this), this.name, this.source);
+					getClass().getSimpleName(), System.identityHashCode(this), this.name, this.source);
+		}
+		else {
+			return String.format("%s [name='%s']", getClass().getSimpleName(), this.name);
 		}
-
-		return String.format("%s [name='%s']",
-				this.getClass().getSimpleName(), this.name);
 	}
 
 
 	/**
 	 * Return a {@code PropertySource} implementation intended for collection comparison purposes only.
-	 *
 	 * <p>Primarily for internal use, but given a collection of {@code PropertySource} objects, may be
 	 * used as follows:
 	 * <pre class="code">
@@ -189,11 +176,9 @@ public String toString() {
 	 * assert sources.contains(PropertySource.named("sourceB"));
 	 * assert !sources.contains(PropertySource.named("sourceC"));
 	 * }</pre>
-	 *
 	 * The returned {@code PropertySource} will throw {@code UnsupportedOperationException}
 	 * if any methods other than {@code equals(Object)}, {@code hashCode()}, and {@code toString()}
 	 * are called.
-	 *
 	 * @param name the name of the comparison {@code PropertySource} to be created and returned.
 	 */
 	public static PropertySource<?> named(String name) {
@@ -209,7 +194,6 @@ public static PropertySource<?> named(String name) {
 	 * {@code ApplicationContext}.  In such cases, a stub should be used to hold the
 	 * intended default position/order of the property source, then be replaced
 	 * during context refresh.
-	 *
 	 * @see org.springframework.context.support.AbstractApplicationContext#initPropertySources()
 	 * @see org.springframework.web.context.support.StandardServletEnvironment
 	 * @see org.springframework.web.context.support.ServletContextPropertySource
@@ -221,7 +205,7 @@ public StubPropertySource(String name) {
 		}
 
 		/**
-		 * Always return {@code null}.
+		 * Always returns {@code null}.
 		 */
 		@Override
 		public String getProperty(String name) {
@@ -236,8 +220,7 @@ public String getProperty(String name) {
 	static class ComparisonPropertySource extends StubPropertySource {
 
 		private static final String USAGE_ERROR =
-			"ComparisonPropertySource instances are for collection comparison " +
-			"use only";
+				"ComparisonPropertySource instances are for use with collection comparison only";
 
 		public ComparisonPropertySource(String name) {
 			super(name);
diff --git a/spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java b/spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java
index f761527437..9e33628448 100644
--- a/spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.core.env;
 
-import static java.lang.String.format;
-
 import org.springframework.core.convert.ConversionException;
 import org.springframework.util.ClassUtils;
 
@@ -35,6 +33,7 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
 
 	private final PropertySources propertySources;
 
+
 	/**
 	 * Create a new resolver against the given property sources.
 	 * @param propertySources the set of {@link PropertySource} objects to use
@@ -43,106 +42,119 @@ public PropertySourcesPropertyResolver(PropertySources propertySources) {
 		this.propertySources = propertySources;
 	}
 
+
+	@Override
 	public boolean containsProperty(String key) {
-		for (PropertySource<?> propertySource : this.propertySources) {
-			if (propertySource.containsProperty(key)) {
-				return true;
+		if (this.propertySources != null) {
+			for (PropertySource<?> propertySource : this.propertySources) {
+				if (propertySource.containsProperty(key)) {
+					return true;
+				}
 			}
 		}
 		return false;
 	}
 
+	@Override
 	public String getProperty(String key) {
-		if (logger.isTraceEnabled()) {
-			logger.trace(format("getProperty(\"%s\") (implicit targetType [String])", key));
-		}
-		return this.getProperty(key, String.class);
+		return getProperty(key, String.class, true);
 	}
 
+	@Override
 	public <T> T getProperty(String key, Class<T> targetValueType) {
+		return getProperty(key, targetValueType, true);
+	}
+
+	@Override
+	protected String getPropertyAsRawString(String key) {
+		return getProperty(key, String.class, false);
+	}
+
+	protected <T> T getProperty(String key, Class<T> targetValueType, boolean resolveNestedPlaceholders) {
 		boolean debugEnabled = logger.isDebugEnabled();
 		if (logger.isTraceEnabled()) {
-			logger.trace(format("getProperty(\"%s\", %s)", key, targetValueType.getSimpleName()));
+			logger.trace(String.format("getProperty(\"%s\", %s)", key, targetValueType.getSimpleName()));
 		}
-
-		for (PropertySource<?> propertySource : this.propertySources) {
-			if (debugEnabled) {
-				logger.debug(format("Searching for key '%s' in [%s]", key, propertySource.getName()));
-			}
-			Object value;
-			if ((value = propertySource.getProperty(key)) != null) {
-				Class<?> valueType = value.getClass();
-				if (String.class.equals(valueType)) {
-					value = this.resolveNestedPlaceholders((String) value);
-				}
+		if (this.propertySources != null) {
+			for (PropertySource<?> propertySource : this.propertySources) {
 				if (debugEnabled) {
-					logger.debug(
-							format("Found key '%s' in [%s] with type [%s] and value '%s'",
-									key, propertySource.getName(), valueType.getSimpleName(), value));
+					logger.debug(String.format("Searching for key '%s' in [%s]", key, propertySource.getName()));
 				}
-				if (!this.conversionService.canConvert(valueType, targetValueType)) {
-					throw new IllegalArgumentException(
-							format("Cannot convert value [%s] from source type [%s] to target type [%s]",
-									value, valueType.getSimpleName(), targetValueType.getSimpleName()));
+				Object value;
+				if ((value = propertySource.getProperty(key)) != null) {
+					Class<?> valueType = value.getClass();
+					if (resolveNestedPlaceholders && value instanceof String) {
+						value = resolveNestedPlaceholders((String) value);
+					}
+					if (debugEnabled) {
+						logger.debug(String.format("Found key '%s' in [%s] with type [%s] and value '%s'",
+								key, propertySource.getName(), valueType.getSimpleName(), value));
+					}
+					if (!this.conversionService.canConvert(valueType, targetValueType)) {
+						throw new IllegalArgumentException(String.format(
+								"Cannot convert value [%s] from source type [%s] to target type [%s]",
+								value, valueType.getSimpleName(), targetValueType.getSimpleName()));
+					}
+					return this.conversionService.convert(value, targetValueType);
 				}
-				return conversionService.convert(value, targetValueType);
 			}
 		}
-
 		if (debugEnabled) {
-			logger.debug(format("Could not find key '%s' in any property source. Returning [null]", key));
+			logger.debug(String.format("Could not find key '%s' in any property source. Returning [null]", key));
 		}
 		return null;
 	}
 
+	@Override
 	public <T> Class<T> getPropertyAsClass(String key, Class<T> targetValueType) {
 		boolean debugEnabled = logger.isDebugEnabled();
 		if (logger.isTraceEnabled()) {
-			logger.trace(format("getPropertyAsClass(\"%s\", %s)", key, targetValueType.getSimpleName()));
+			logger.trace(String.format("getPropertyAsClass(\"%s\", %s)", key, targetValueType.getSimpleName()));
 		}
-
-		for (PropertySource<?> propertySource : this.propertySources) {
-			if (debugEnabled) {
-				logger.debug(format("Searching for key '%s' in [%s]", key, propertySource.getName()));
-			}
-			Object value;
-			if ((value = propertySource.getProperty(key)) != null) {
+		if (this.propertySources != null) {
+			for (PropertySource<?> propertySource : this.propertySources) {
 				if (debugEnabled) {
-					logger.debug(
-							format("Found key '%s' in [%s] with value '%s'", key, propertySource.getName(), value));
+					logger.debug(String.format("Searching for key '%s' in [%s]", key, propertySource.getName()));
 				}
-
-				Class<?> clazz;
-				if (value instanceof String) {
-					try {
-						clazz = ClassUtils.forName((String)value, null);
-					} catch (Exception ex) {
-						throw new ClassConversionException((String)value, targetValueType, ex);
+				Object value = propertySource.getProperty(key);
+				if (value != null) {
+					if (debugEnabled) {
+						logger.debug(String.format("Found key '%s' in [%s] with value '%s'", key, propertySource.getName(), value));
 					}
+					Class<?> clazz;
+					if (value instanceof String) {
+						try {
+							clazz = ClassUtils.forName((String) value, null);
+						}
+						catch (Exception ex) {
+							throw new ClassConversionException((String) value, targetValueType, ex);
+						}
+					}
+					else if (value instanceof Class) {
+						clazz = (Class<?>)value;
+					}
+					else {
+						clazz = value.getClass();
+					}
+					if (!targetValueType.isAssignableFrom(clazz)) {
+						throw new ClassConversionException(clazz, targetValueType);
+					}
+					@SuppressWarnings("unchecked")
+					Class<T> targetClass = (Class<T>) clazz;
+					return targetClass;
 				}
-				else if (value instanceof Class) {
-					clazz = (Class<?>)value;
-				} else {
-					clazz = value.getClass();
-				}
-
-				if (!targetValueType.isAssignableFrom(clazz)) {
-					throw new ClassConversionException(clazz, targetValueType);
-				}
-				@SuppressWarnings("unchecked")
-				Class<T> targetClass = (Class<T>)clazz;
-				return targetClass;
 			}
 		}
-
 		if (debugEnabled) {
-			logger.debug(format("Could not find key '%s' in any property source. Returning [null]", key));
+			logger.debug(String.format("Could not find key '%s' in any property source. Returning [null]", key));
 		}
 		return null;
 	}
 
+
 	@SuppressWarnings("serial")
-	static class ClassConversionException extends ConversionException {
+	private static class ClassConversionException extends ConversionException {
+
 		public ClassConversionException(Class<?> actual, Class<?> expected) {
 			super(String.format("Actual type %s is not assignable to expected type %s", actual.getName(), expected.getName()));
 		}
@@ -151,4 +163,5 @@ public ClassConversionException(String actual, Class<?> expected, Exception ex)
 			super(String.format("Could not find/load class %s during attempt to convert to %s", actual, expected.getName()), ex);
 		}
 	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java b/spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java
index 5ded8cbbc5..2f77027710 100644
--- a/spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java
+++ b/spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java
@@ -40,7 +40,7 @@
 abstract class ReadOnlySystemAttributesMap implements Map<String, String> {
 
 	public boolean containsKey(Object key) {
-		return get(key) != null;
+		return (get(key) != null);
 	}
 
 	/**
@@ -49,9 +49,7 @@ public boolean containsKey(Object key) {
 	 */
 	public String get(Object key) {
 		Assert.isInstanceOf(String.class, key,
-			String.format("expected key [%s] to be of type String, got %s",
-					key, key.getClass().getName()));
-
+				String.format("Expected key [%s] to be of type String, got %s", key, key.getClass().getName()));
 		return this.getSystemAttribute((String) key);
 	}
 
@@ -61,11 +59,11 @@ public boolean isEmpty() {
 
 	/**
 	 * Template method that returns the underlying system attribute.
-	 *
 	 * <p>Implementations typically call {@link System#getProperty(String)} or {@link System#getenv(String)} here.
 	 */
 	protected abstract String getSystemAttribute(String attributeName);
 
+
 	// Unsupported
 
 	public int size() {
@@ -92,7 +90,7 @@ public Set<String> keySet() {
 		return Collections.emptySet();
 	}
 
-	public void putAll(Map<? extends String, ? extends String> m) {
+	public void putAll(Map<? extends String, ? extends String> map) {
 		throw new UnsupportedOperationException();
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLineArgsParser.java b/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLineArgsParser.java
index b7ad3c42d9..b249faf0ac 100644
--- a/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLineArgsParser.java
+++ b/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLineArgsParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,9 +52,9 @@
 class SimpleCommandLineArgsParser {
 
 	/**
-	 * Parse the given {@code String} array based on the rules described {@linkplain
-	 * SimpleCommandLineArgsParser above}, returning a fully-populated
-	 * {@link CommandLineArgs} object.
+	 * Parse the given {@code String} array based on the rules described
+	 * {@linkplain SimpleCommandLineArgsParser above}, returning a
+	 * fully-populated {@link CommandLineArgs} object.
 	 * @param args command line arguments, typically from a {@code main()} method
 	 */
 	public CommandLineArgs parse(String... args) {
@@ -65,13 +65,13 @@ public CommandLineArgs parse(String... args) {
 				String optionName;
 				String optionValue = null;
 				if (optionText.contains("=")) {
-					optionName = optionText.substring(0, optionText.indexOf("="));
-					optionValue = optionText.substring(optionText.indexOf("=")+1, optionText.length());
+					optionName = optionText.substring(0, optionText.indexOf('='));
+					optionValue = optionText.substring(optionText.indexOf('=') + 1, optionText.length());
 				}
 				else {
 					optionName = optionText;
 				}
-				if (optionName.isEmpty() || (optionValue != null && optionValue.isEmpty())) {
+				if (optionName.length() == 0 || (optionValue != null && optionValue.length() == 0)) {
 					throw new IllegalArgumentException("Invalid argument syntax: " + arg);
 				}
 				commandLineArgs.addOptionArg(optionName, optionValue);
diff --git a/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java
index 35b97e5b85..9437134f91 100644
--- a/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java
+++ b/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@
  * property resolution and profile-related operations, this implementation configures two
  * default property sources, to be searched in the following order:
  * <ul>
- *   <li>{@linkplain AbstractEnvironment#getSystemProperties() system properties}
- *   <li>{@linkplain AbstractEnvironment#getSystemEnvironment() system environment variables}
+ * <li>{@linkplain AbstractEnvironment#getSystemProperties() system properties}
+ * <li>{@linkplain AbstractEnvironment#getSystemEnvironment() system environment variables}
  * </ul>
  *
  * That is, if the key "xyz" is present both in the JVM system properties as well as in
@@ -41,7 +41,7 @@
  * instance available from {@link #getPropertySources()}. See
  * {@link ConfigurableEnvironment} Javadoc for usage examples.
  *
- * <p>See {@link SystemEnvironmentPropertySource} Javadoc for details on special handling
+ * <p>See {@link SystemEnvironmentPropertySource} javadoc for details on special handling
  * of property names in shell environments (e.g. Bash) that disallow period characters in
  * variable names.
  *
@@ -61,8 +61,8 @@ public class StandardEnvironment extends AbstractEnvironment {
 
 
 	/**
-	 * Customize the set of property sources with those appropriate for any standard Java
-	 * environment:
+	 * Customize the set of property sources with those appropriate for any standard
+	 * Java environment:
 	 * <ul>
 	 * <li>{@value #SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME}
 	 * <li>{@value #SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME}
diff --git a/spring-core/src/main/java/org/springframework/core/env/SystemEnvironmentPropertySource.java b/spring-core/src/main/java/org/springframework/core/env/SystemEnvironmentPropertySource.java
index 0baba6a8c1..b0ca4dc3de 100644
--- a/spring-core/src/main/java/org/springframework/core/env/SystemEnvironmentPropertySource.java
+++ b/spring-core/src/main/java/org/springframework/core/env/SystemEnvironmentPropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,19 +40,19 @@
  * {@code true} if any of the above properties are present, otherwise {@code false}.
  *
  * <p>This feature is particularly useful when specifying active or default profiles as
- * environment variables. The following is not allowable under Bash
+ * environment variables. The following is not allowable under Bash:
  *
  * <pre class="code">spring.profiles.active=p1 java -classpath ... MyApp</pre>
  *
- * However, the following syntax is permitted and is also more conventional.
+ * However, the following syntax is permitted and is also more conventional:
  *
  * <pre class="code">SPRING_PROFILES_ACTIVE=p1 java -classpath ... MyApp</pre>
  *
  * <p>Enable debug- or trace-level logging for this class (or package) for messages
  * explaining when these 'property name resolutions' occur.
  *
- * <p>This property source is included by default in {@link StandardEnvironment} and all
- * its subclasses.
+ * <p>This property source is included by default in {@link StandardEnvironment}
+ * and all its subclasses.
  *
  * @author Chris Beams
  * @since 3.1
@@ -70,28 +70,26 @@ public SystemEnvironmentPropertySource(String name, Map<String, Object> source)
 		super(name, source);
 	}
 
+
 	/**
-	 * Return true if a property with the given name or any underscore/uppercase variant
+	 * Return {@code true} if a property with the given name or any underscore/uppercase variant
 	 * thereof exists in this property source.
 	 */
 	@Override
 	public boolean containsProperty(String name) {
-		return getProperty(name) != null;
+		return (getProperty(name) != null);
 	}
 
 	/**
-	 * {@inheritDoc}
-	 * <p>This implementation returns {@code true} if a property with the given name or
+	 * This implementation returns {@code true} if a property with the given name or
 	 * any underscore/uppercase variant thereof exists in this property source.
 	 */
 	@Override
 	public Object getProperty(String name) {
-		Assert.notNull(name, "property name must not be null");
 		String actualName = resolvePropertyName(name);
 		if (logger.isDebugEnabled() && !name.equals(actualName)) {
-			logger.debug(String.format(
-					"PropertySource [%s] does not contain '%s', but found equivalent '%s'",
-					this.getName(), name, actualName));
+			logger.debug(String.format("PropertySource [%s] does not contain '%s', but found equivalent '%s'",
+					getName(), name, actualName));
 		}
 		return super.getProperty(actualName);
 	}
@@ -102,6 +100,7 @@ public Object getProperty(String name) {
 	 * found or otherwise the original name. Never returns {@code null}.
 	 */
 	private String resolvePropertyName(String name) {
+		Assert.notNull(name, "Property name must not be null");
 		if (super.containsProperty(name)) {
 			return name;
 		}
@@ -115,7 +114,8 @@ private String resolvePropertyName(String name) {
 		if (!name.equals(ucName)) {
 			if (super.containsProperty(ucName)) {
 				return ucName;
-			} else {
+			}
+			else {
 				String usUcName = ucName.replace('.', '_');
 				if (!ucName.equals(usUcName) && super.containsProperty(usUcName)) {
 					return usUcName;
@@ -125,4 +125,5 @@ private String resolvePropertyName(String name) {
 
 		return name;
 	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java b/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
index e1f796847a..450e59703c 100644
--- a/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ protected File getFileForLastModifiedCheck() throws IOException {
 	}
 
 	/**
-	 * This implementation returns a File reference for the underlying class path
+	 * This implementation returns a File reference for the given URI-identified
 	 * resource, provided that it refers to a file in the file system.
 	 * @see org.springframework.util.ResourceUtils#getFile(java.net.URI, String)
 	 */
@@ -95,11 +95,10 @@ public boolean exists() {
 			else {
 				// Try a URL connection content-length header...
 				URLConnection con = url.openConnection();
-				ResourceUtils.useCachesIfNecessary(con);
+				customizeConnection(con);
 				HttpURLConnection httpCon =
 						(con instanceof HttpURLConnection ? (HttpURLConnection) con : null);
 				if (httpCon != null) {
-					httpCon.setRequestMethod("HEAD");
 					int code = httpCon.getResponseCode();
 					if (code == HttpURLConnection.HTTP_OK) {
 						return true;
@@ -157,10 +156,7 @@ public long contentLength() throws IOException {
 		else {
 			// Try a URL connection content-length header...
 			URLConnection con = url.openConnection();
-			ResourceUtils.useCachesIfNecessary(con);
-			if (con instanceof HttpURLConnection) {
-				((HttpURLConnection) con).setRequestMethod("HEAD");
-			}
+			customizeConnection(con);
 			return con.getContentLength();
 		}
 	}
@@ -175,15 +171,40 @@ public long lastModified() throws IOException {
 		else {
 			// Try a URL connection last-modified header...
 			URLConnection con = url.openConnection();
-			ResourceUtils.useCachesIfNecessary(con);
-			if (con instanceof HttpURLConnection) {
-				((HttpURLConnection) con).setRequestMethod("HEAD");
-			}
+			customizeConnection(con);
 			return con.getLastModified();
 		}
 	}
 
 
+	/**
+	 * Customize the given {@link URLConnection}, obtained in the course of an
+	 * {@link #exists()}, {@link #contentLength()} or {@link #lastModified()} call.
+	 * <p>Calls {@link ResourceUtils#useCachesIfNecessary(URLConnection)} and
+	 * delegates to {@link #customizeConnection(HttpURLConnection)} if possible.
+	 * Can be overridden in subclasses.
+	 * @param con the URLConnection to customize
+	 * @throws IOException if thrown from URLConnection methods
+	 */
+	protected void customizeConnection(URLConnection con) throws IOException {
+		ResourceUtils.useCachesIfNecessary(con);
+		if (con instanceof HttpURLConnection) {
+			customizeConnection((HttpURLConnection) con);
+		}
+	}
+
+	/**
+	 * Customize the given {@link HttpURLConnection}, obtained in the course of an
+	 * {@link #exists()}, {@link #contentLength()} or {@link #lastModified()} call.
+	 * <p>Sets request method "HEAD" by default. Can be overridden in subclasses.
+	 * @param con the HttpURLConnection to customize
+	 * @throws IOException if thrown from HttpURLConnection methods
+	 */
+	protected void customizeConnection(HttpURLConnection con) throws IOException {
+		con.setRequestMethod("HEAD");
+	}
+
+
 	/**
 	 * Inner delegate class, avoiding a hard JBoss VFS API dependency at runtime.
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java b/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java
index b035c9ef53..91ea12887a 100644
--- a/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/AbstractResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -122,7 +122,7 @@ public long contentLength() throws IOException {
 			long size = 0;
 			byte[] buf = new byte[255];
 			int read;
-			while((read = is.read(buf)) != -1) {
+			while ((read = is.read(buf)) != -1) {
 				size += read;
 			}
 			return size;
diff --git a/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java b/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
index 3e8467178d..b1d2998ed1 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,9 +50,9 @@ public class ClassPathResource extends AbstractFileResolvingResource {
 
 
 	/**
-	 * Create a new ClassPathResource for ClassLoader usage.
-	 * A leading slash will be removed, as the ClassLoader
-	 * resource access methods will not accept it.
+	 * Create a new {@code ClassPathResource} for {@code ClassLoader} usage.
+	 * A leading slash will be removed, as the ClassLoader resource access
+	 * methods will not accept it.
 	 * <p>The thread context class loader will be used for
 	 * loading the resource.
 	 * @param path the absolute path within the class path
@@ -64,9 +64,9 @@ public ClassPathResource(String path) {
 	}
 
 	/**
-	 * Create a new ClassPathResource for ClassLoader usage.
-	 * A leading slash will be removed, as the ClassLoader
-	 * resource access methods will not accept it.
+	 * Create a new {@code ClassPathResource} for {@code ClassLoader} usage.
+	 * A leading slash will be removed, as the ClassLoader resource access
+	 * methods will not accept it.
 	 * @param path the absolute path within the classpath
 	 * @param classLoader the class loader to load the resource with,
 	 * or {@code null} for the thread context class loader
@@ -83,9 +83,9 @@ public ClassPathResource(String path, ClassLoader classLoader) {
 	}
 
 	/**
-	 * Create a new ClassPathResource for Class usage.
-	 * The path can be relative to the given class,
-	 * or absolute within the classpath via a leading slash.
+	 * Create a new {@code ClassPathResource} for {@code Class} usage.
+	 * The path can be relative to the given class, or absolute within
+	 * the classpath via a leading slash.
 	 * @param path relative or absolute path within the class path
 	 * @param clazz the class to load resources with
 	 * @see java.lang.Class#getResourceAsStream
@@ -97,8 +97,8 @@ public ClassPathResource(String path, Class<?> clazz) {
 	}
 
 	/**
-	 * Create a new ClassPathResource with optional ClassLoader and Class.
-	 * Only for internal usage.
+	 * Create a new {@code ClassPathResource} with optional {@code ClassLoader}
+	 * and {@code Class}. Only for internal usage.
 	 * @param path relative or absolute path within the classpath
 	 * @param classLoader the class loader to load the resource with, if any
 	 * @param clazz the class to load resources with, if any
@@ -109,6 +109,7 @@ protected ClassPathResource(String path, ClassLoader classLoader, Class<?> clazz
 		this.clazz = clazz;
 	}
 
+
 	/**
 	 * Return the path for this resource (as resource path within the class path).
 	 */
@@ -120,9 +121,10 @@ public final String getPath() {
 	 * Return the ClassLoader that this resource will be obtained from.
 	 */
 	public final ClassLoader getClassLoader() {
-		return (this.classLoader != null ? this.classLoader : this.clazz.getClassLoader());
+		return (this.clazz != null ? this.clazz.getClassLoader() : this.classLoader);
 	}
 
+
 	/**
 	 * This implementation checks for the resolution of a resource URL.
 	 * @see java.lang.ClassLoader#getResource(String)
@@ -130,14 +132,23 @@ public final ClassLoader getClassLoader() {
 	 */
 	@Override
 	public boolean exists() {
-		URL url;
+		return (resolveURL() != null);
+	}
+
+	/**
+	 * Resolves a URL for the underlying class path resource.
+	 * @return the resolved URL, or {@code null} if not resolvable
+	 */
+	protected URL resolveURL() {
 		if (this.clazz != null) {
-			url = this.clazz.getResource(this.path);
+			return this.clazz.getResource(this.path);
+		}
+		else if (this.classLoader != null) {
+			return this.classLoader.getResource(this.path);
 		}
 		else {
-			url = this.classLoader.getResource(this.path);
+			return ClassLoader.getSystemResource(this.path);
 		}
-		return (url != null);
 	}
 
 	/**
@@ -150,9 +161,12 @@ public InputStream getInputStream() throws IOException {
 		if (this.clazz != null) {
 			is = this.clazz.getResourceAsStream(this.path);
 		}
-		else {
+		else if (this.classLoader != null) {
 			is = this.classLoader.getResourceAsStream(this.path);
 		}
+		else {
+			is = ClassLoader.getSystemResourceAsStream(this.path);
+		}
 		if (is == null) {
 			throw new FileNotFoundException(getDescription() + " cannot be opened because it does not exist");
 		}
@@ -160,19 +174,14 @@ public InputStream getInputStream() throws IOException {
 	}
 
 	/**
-	 * This implementation returns a URL for the underlying class path resource.
+	 * This implementation returns a URL for the underlying class path resource,
+	 * if available.
 	 * @see java.lang.ClassLoader#getResource(String)
 	 * @see java.lang.Class#getResource(String)
 	 */
 	@Override
 	public URL getURL() throws IOException {
-		URL url;
-		if (this.clazz != null) {
-			url = this.clazz.getResource(this.path);
-		}
-		else {
-			url = this.classLoader.getResource(this.path);
-		}
+		URL url = resolveURL();
 		if (url == null) {
 			throw new FileNotFoundException(getDescription() + " cannot be resolved to URL because it does not exist");
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java b/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java
index 57da655a5d..d2e8f740d4 100644
--- a/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 
 /**
  * {@link Resource} implementation for {@code java.io.File} handles.
- * Obviously supports resolution as File, and also as URL.
+ * Supports resolution as a {@code File} and also as a {@code URL}.
  * Implements the extended {@link WritableResource} interface.
  *
  * @author Juergen Hoeller
@@ -45,7 +45,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso
 
 
 	/**
-	 * Create a new FileSystemResource from a File handle.
+	 * Create a new {@code FileSystemResource} from a {@link File} handle.
 	 * <p>Note: When building relative resources via {@link #createRelative},
 	 * the relative path will apply <i>at the same directory level</i>:
 	 * e.g. new File("C:/dir1"), relative path "dir2" -> "C:/dir2"!
@@ -62,7 +62,7 @@ public FileSystemResource(File file) {
 	}
 
 	/**
-	 * Create a new FileSystemResource from a file path.
+	 * Create a new {@code FileSystemResource} from a file path.
 	 * <p>Note: When building relative resources via {@link #createRelative},
 	 * it makes a difference whether the specified resource base path here
 	 * ends with a slash or not. In the case of "C:/dir1/", relative paths
@@ -77,6 +77,7 @@ public FileSystemResource(String path) {
 		this.path = StringUtils.cleanPath(path);
 	}
 
+
 	/**
 	 * Return the file path for this resource.
 	 */
@@ -84,7 +85,6 @@ public final String getPath() {
 		return this.path;
 	}
 
-
 	/**
 	 * This implementation returns whether the underlying file exists.
 	 * @see java.io.File#exists()
diff --git a/spring-core/src/main/java/org/springframework/core/io/Resource.java b/spring-core/src/main/java/org/springframework/core/io/Resource.java
index cc6eef308f..27bf514260 100644
--- a/spring-core/src/main/java/org/springframework/core/io/Resource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/Resource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,25 +37,25 @@
  * @see #getFile()
  * @see WritableResource
  * @see ContextResource
- * @see FileSystemResource
- * @see ClassPathResource
  * @see UrlResource
+ * @see ClassPathResource
+ * @see FileSystemResource
  * @see ByteArrayResource
  * @see InputStreamResource
  */
 public interface Resource extends InputStreamSource {
 
 	/**
-	 * Return whether this resource actually exists in physical form.
+	 * Determine whether this resource actually exists in physical form.
 	 * <p>This method performs a definitive existence check, whereas the
-	 * existence of a {@code Resource} handle only guarantees a
-	 * valid descriptor handle.
+	 * existence of a {@code Resource} handle only guarantees a valid
+	 * descriptor handle.
 	 */
 	boolean exists();
 
 	/**
-	 * Return whether the contents of this resource can be read,
-	 * e.g. via {@link #getInputStream()} or {@link #getFile()}.
+	 * Indicate whether the contents of this resource can be read via
+	 * {@link #getInputStream()}.
 	 * <p>Will be {@code true} for typical resource descriptors;
 	 * note that actual content reading may still fail when attempted.
 	 * However, a value of {@code false} is a definitive indication
@@ -65,8 +65,8 @@ public interface Resource extends InputStreamSource {
 	boolean isReadable();
 
 	/**
-	 * Return whether this resource represents a handle with an open
-	 * stream. If true, the InputStream cannot be read multiple times,
+	 * Indicate whether this resource represents a handle with an open stream.
+	 * If {@code true}, the InputStream cannot be read multiple times,
 	 * and must be read and closed to avoid resource leaks.
 	 * <p>Will be {@code false} for typical resource descriptors.
 	 */
@@ -83,6 +83,7 @@ public interface Resource extends InputStreamSource {
 	 * Return a URI handle for this resource.
 	 * @throws IOException if the resource cannot be resolved as URI,
 	 * i.e. if the resource is not available as descriptor
+	 * @since 2.5
 	 */
 	URI getURI() throws IOException;
 
diff --git a/spring-core/src/main/java/org/springframework/core/io/ResourceEditor.java b/spring-core/src/main/java/org/springframework/core/io/ResourceEditor.java
index 0f86c14683..a01d5f7f28 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ResourceEditor.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ResourceEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,11 @@
 import java.beans.PropertyEditorSupport;
 import java.io.IOException;
 
-import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.env.PropertyResolver;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-
 /**
  * {@link java.beans.PropertyEditor Editor} for {@link Resource}
  * descriptors, to automatically convert {@code String} locations
@@ -51,7 +50,7 @@ public class ResourceEditor extends PropertyEditorSupport {
 
 	private final ResourceLoader resourceLoader;
 
-	private final PropertyResolver propertyResolver;
+	private PropertyResolver propertyResolver;
 
 	private final boolean ignoreUnresolvablePlaceholders;
 
@@ -61,7 +60,7 @@ public class ResourceEditor extends PropertyEditorSupport {
 	 * using a {@link DefaultResourceLoader} and {@link StandardEnvironment}.
 	 */
 	public ResourceEditor() {
-		this(new DefaultResourceLoader(), new StandardEnvironment());
+		this(new DefaultResourceLoader(), null);
 	}
 
 	/**
@@ -73,17 +72,7 @@ public ResourceEditor() {
 	 */
 	@Deprecated
 	public ResourceEditor(ResourceLoader resourceLoader) {
-		this(resourceLoader, new StandardEnvironment(), true);
-	}
-
-	/**
-	 * Create a new instance of the {@link ResourceEditor} class
-	 * using the given {@link ResourceLoader} and {@link PropertyResolver}.
-	 * @param resourceLoader the {@code ResourceLoader} to use
-	 * @param propertyResolver the {@code PropertyResolver} to use
-	 */
-	public ResourceEditor(ResourceLoader resourceLoader, PropertyResolver propertyResolver) {
-		this(resourceLoader, propertyResolver, true);
+		this(resourceLoader, null, true);
 	}
 
 	/**
@@ -97,7 +86,17 @@ public ResourceEditor(ResourceLoader resourceLoader, PropertyResolver propertyRe
 	 */
 	@Deprecated
 	public ResourceEditor(ResourceLoader resourceLoader, boolean ignoreUnresolvablePlaceholders) {
-		this(resourceLoader, new StandardEnvironment(), ignoreUnresolvablePlaceholders);
+		this(resourceLoader, null, ignoreUnresolvablePlaceholders);
+	}
+
+	/**
+	 * Create a new instance of the {@link ResourceEditor} class
+	 * using the given {@link ResourceLoader} and {@link PropertyResolver}.
+	 * @param resourceLoader the {@code ResourceLoader} to use
+	 * @param propertyResolver the {@code PropertyResolver} to use
+	 */
+	public ResourceEditor(ResourceLoader resourceLoader, PropertyResolver propertyResolver) {
+		this(resourceLoader, propertyResolver, true);
 	}
 
 	/**
@@ -110,7 +109,6 @@ public ResourceEditor(ResourceLoader resourceLoader, boolean ignoreUnresolvableP
 	 */
 	public ResourceEditor(ResourceLoader resourceLoader, PropertyResolver propertyResolver, boolean ignoreUnresolvablePlaceholders) {
 		Assert.notNull(resourceLoader, "ResourceLoader must not be null");
-		Assert.notNull(propertyResolver, "PropertyResolver must not be null");
 		this.resourceLoader = resourceLoader;
 		this.propertyResolver = propertyResolver;
 		this.ignoreUnresolvablePlaceholders = ignoreUnresolvablePlaceholders;
@@ -137,9 +135,11 @@ public void setAsText(String text) {
 	 * @see PropertyResolver#resolveRequiredPlaceholders
 	 */
 	protected String resolvePath(String path) {
-		return this.ignoreUnresolvablePlaceholders ?
-				this.propertyResolver.resolvePlaceholders(path) :
-				this.propertyResolver.resolveRequiredPlaceholders(path);
+		if (this.propertyResolver == null) {
+			this.propertyResolver = new StandardEnvironment();
+		}
+		return (this.ignoreUnresolvablePlaceholders ? this.propertyResolver.resolvePlaceholders(path) :
+				this.propertyResolver.resolveRequiredPlaceholders(path));
 	}
 
 
diff --git a/spring-core/src/main/java/org/springframework/core/io/ResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/ResourceLoader.java
index 958746178f..b753535ab0 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ResourceLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ResourceLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,7 +70,9 @@ public interface ResourceLoader {
 	 * <p>Clients which need to access the ClassLoader directly can do so
 	 * in a uniform manner with the ResourceLoader, rather than relying
 	 * on the thread context ClassLoader.
-	 * @return the ClassLoader (never {@code null})
+	 * @return the ClassLoader (only {@code null} if even the system
+	 * ClassLoader isn't accessible)
+	 * @see org.springframework.util.ClassUtils#getDefaultClassLoader()
 	 */
 	ClassLoader getClassLoader();
 
diff --git a/spring-core/src/main/java/org/springframework/core/io/UrlResource.java b/spring-core/src/main/java/org/springframework/core/io/UrlResource.java
index 5c37b0b448..84a07396d3 100644
--- a/spring-core/src/main/java/org/springframework/core/io/UrlResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/UrlResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 
@@ -31,8 +32,8 @@
 
 /**
  * {@link Resource} implementation for {@code java.net.URL} locators.
- * Obviously supports resolution as URL, and also as File in case of
- * the "file:" protocol.
+ * Supports resolution as a {@code URL} and also as a {@code File} in
+ * case of the {@code "file:"} protocol.
  *
  * @author Juergen Hoeller
  * @since 28.12.2003
@@ -40,6 +41,11 @@
  */
 public class UrlResource extends AbstractFileResolvingResource {
 
+	/**
+	 * Original URI, if available; used for URI and File access.
+	 */
+	private final URI uri;
+
 	/**
 	 * Original URL, used for actual access.
 	 */
@@ -50,14 +56,22 @@ public class UrlResource extends AbstractFileResolvingResource {
 	 */
 	private final URL cleanedUrl;
 
+
 	/**
-	 * Original URI, if available; used for URI and File access.
+	 * Create a new {@code UrlResource} based on the given URI object.
+	 * @param uri a URI
+	 * @throws MalformedURLException if the given URL path is not valid
+	 * @since 2.5
 	 */
-	private final URI uri;
-
+	public UrlResource(URI uri) throws MalformedURLException {
+		Assert.notNull(uri, "URI must not be null");
+		this.uri = uri;
+		this.url = uri.toURL();
+		this.cleanedUrl = getCleanedUrl(this.url, uri.toString());
+	}
 
 	/**
-	 * Create a new UrlResource.
+	 * Create a new {@code UrlResource} based on the given URL object.
 	 * @param url a URL
 	 */
 	public UrlResource(URL url) {
@@ -68,29 +82,59 @@ public UrlResource(URL url) {
 	}
 
 	/**
-	 * Create a new UrlResource.
-	 * @param uri a URI
-	 * @throws MalformedURLException if the given URL path is not valid
-	 */
-	public UrlResource(URI uri) throws MalformedURLException {
-		Assert.notNull(uri, "URI must not be null");
-		this.url = uri.toURL();
-		this.cleanedUrl = getCleanedUrl(this.url, uri.toString());
-		this.uri = uri;
-	}
-
-	/**
-	 * Create a new UrlResource.
+	 * Create a new {@code UrlResource} based on a URL path.
+	 * <p>Note: The given path needs to be pre-encoded if necessary.
 	 * @param path a URL path
 	 * @throws MalformedURLException if the given URL path is not valid
+	 * @see java.net.URL#URL(String)
 	 */
 	public UrlResource(String path) throws MalformedURLException {
 		Assert.notNull(path, "Path must not be null");
+		this.uri = null;
 		this.url = new URL(path);
 		this.cleanedUrl = getCleanedUrl(this.url, path);
-		this.uri = null;
 	}
 
+	/**
+	 * Create a new {@code UrlResource} based on a URI specification.
+	 * <p>The given parts will automatically get encoded if necessary.
+	 * @param protocol the URL protocol to use (e.g. "jar" or "file" - without colon);
+	 * also known as "scheme"
+	 * @param location the location (e.g. the file path within that protocol);
+	 * also known as "scheme-specific part"
+	 * @throws MalformedURLException if the given URL specification is not valid
+	 * @see java.net.URI#URI(String, String, String)
+	 */
+	public UrlResource(String protocol, String location) throws MalformedURLException  {
+		this(protocol, location, null);
+	}
+
+	/**
+	 * Create a new {@code UrlResource} based on a URI specification.
+	 * <p>The given parts will automatically get encoded if necessary.
+	 * @param protocol the URL protocol to use (e.g. "jar" or "file" - without colon);
+	 * also known as "scheme"
+	 * @param location the location (e.g. the file path within that protocol);
+	 * also known as "scheme-specific part"
+	 * @param fragment the fragment within that location (e.g. anchor on an HTML page,
+	 * as following after a "#" separator)
+	 * @throws MalformedURLException if the given URL specification is not valid
+	 * @see java.net.URI#URI(String, String, String)
+	 */
+	public UrlResource(String protocol, String location, String fragment) throws MalformedURLException  {
+		try {
+			this.uri = new URI(protocol, location, fragment);
+			this.url = this.uri.toURL();
+			this.cleanedUrl = getCleanedUrl(this.url, this.uri.toString());
+		}
+		catch (URISyntaxException ex) {
+			MalformedURLException exToThrow = new MalformedURLException(ex.getMessage());
+			exToThrow.initCause(ex);
+			throw exToThrow;
+		}
+	}
+
+
 	/**
 	 * Determine a cleaned URL for the given original URL.
 	 * @param originalUrl the original URL
@@ -109,10 +153,9 @@ private URL getCleanedUrl(URL originalUrl, String originalPath) {
 		}
 	}
 
-
 	/**
 	 * This implementation opens an InputStream for the given URL.
-	 * It sets the "UseCaches" flag to {@code false},
+	 * <p>It sets the {@code useCaches} flag to {@code false},
 	 * mainly to avoid jar file locking on Windows.
 	 * @see java.net.URL#openConnection()
 	 * @see java.net.URLConnection#setUseCaches(boolean)
@@ -171,7 +214,7 @@ public File getFile() throws IOException {
 	}
 
 	/**
-	 * This implementation creates a UrlResource, applying the given path
+	 * This implementation creates a {@code UrlResource}, applying the given path
 	 * relative to the path of the underlying URL of this resource descriptor.
 	 * @see java.net.URL#URL(java.net.URL, String)
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java b/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java
index 04a173836c..c7cbc6b81b 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,69 +27,75 @@
 import org.springframework.util.ObjectUtils;
 
 /**
- * Holder that combines a {@link org.springframework.core.io.Resource}
- * with a specific encoding to be used for reading from the resource.
+ * Holder that combines a {@link Resource} descriptor with a specific encoding
+ * or {@code Charset} to be used for reading from the resource.
  *
- * <p>Used as argument for operations that support to read content with
- * a specific encoding (usually through a {@code java.io.Reader}.
+ * <p>Used as an argument for operations that support reading content with
+ * a specific encoding, typically via a {@code java.io.Reader}.
  *
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 1.2.6
+ * @see Resource#getInputStream()
  * @see java.io.Reader
+ * @see java.nio.charset.Charset
  */
 public class EncodedResource {
 
 	private final Resource resource;
 
-	private String encoding;
+	private final String encoding;
 
-	private Charset charset;
+	private final Charset charset;
 
 
 	/**
-	 * Create a new EncodedResource for the given Resource,
-	 * not specifying a specific encoding.
-	 * @param resource the Resource to hold
+	 * Create a new {@code EncodedResource} for the given {@code Resource},
+	 * not specifying an explicit encoding or {@code Charset}.
+	 * @param resource the {@code Resource} to hold (never {@code null})
 	 */
 	public EncodedResource(Resource resource) {
-		Assert.notNull(resource, "Resource must not be null");
-		this.resource = resource;
+		this(resource, null, null);
 	}
 
 	/**
-	 * Create a new EncodedResource for the given Resource,
-	 * using the specified encoding.
-	 * @param resource the Resource to hold
+	 * Create a new {@code EncodedResource} for the given {@code Resource},
+	 * using the specified {@code encoding}.
+	 * @param resource the {@code Resource} to hold (never {@code null})
 	 * @param encoding the encoding to use for reading from the resource
 	 */
 	public EncodedResource(Resource resource, String encoding) {
-		Assert.notNull(resource, "Resource must not be null");
-		this.resource = resource;
-		this.encoding = encoding;
+		this(resource, encoding, null);
 	}
 
 	/**
-	 * Create a new EncodedResource for the given Resource,
-	 * using the specified encoding.
-	 * @param resource the Resource to hold
-	 * @param charset the charset to use for reading from the resource
+	 * Create a new {@code EncodedResource} for the given {@code Resource},
+	 * using the specified {@code Charset}.
+	 * @param resource the {@code Resource} to hold (never {@code null})
+	 * @param charset the {@code Charset} to use for reading from the resource
 	 */
 	public EncodedResource(Resource resource, Charset charset) {
+		this(resource, null, charset);
+	}
+
+	private EncodedResource(Resource resource, String encoding, Charset charset) {
+		super();
 		Assert.notNull(resource, "Resource must not be null");
 		this.resource = resource;
+		this.encoding = encoding;
 		this.charset = charset;
 	}
 
 
 	/**
-	 * Return the Resource held.
+	 * Return the {@code Resource} held by this {@code EncodedResource}.
 	 */
 	public final Resource getResource() {
 		return this.resource;
 	}
 
 	/**
-	 * Return the encoding to use for reading from the resource,
+	 * Return the encoding to use for reading from the {@linkplain #getResource() resource},
 	 * or {@code null} if none specified.
 	 */
 	public final String getEncoding() {
@@ -97,17 +103,17 @@ public final String getEncoding() {
 	}
 
 	/**
-	 * Return the charset to use for reading from the resource,
+	 * Return the {@code Charset} to use for reading from the {@linkplain #getResource() resource},
 	 * or {@code null} if none specified.
 	 */
 	public final Charset getCharset() {
 		return this.charset;
 	}
 
-
 	/**
 	 * Determine whether a {@link Reader} is required as opposed to an {@link InputStream},
-	 * i.e. whether an encoding or a charset has been specified.
+	 * i.e. whether an {@linkplain #getEncoding() encoding} or a {@link #getCharset() Charset}
+	 * has been specified.
 	 * @see #getReader()
 	 * @see #getInputStream()
 	 */
@@ -116,10 +122,12 @@ public boolean requiresReader() {
 	}
 
 	/**
-	 * Open a {@code java.io.Reader} for the specified resource,
-	 * using the specified encoding (if any).
+	 * Open a {@code java.io.Reader} for the specified resource, using the specified
+	 * {@link #getCharset() Charset} or {@linkplain #getEncoding() encoding}
+	 * (if any).
 	 * @throws IOException if opening the Reader failed
 	 * @see #requiresReader()
+	 * @see #getInputStream()
 	 */
 	public Reader getReader() throws IOException {
 		if (this.charset != null) {
@@ -134,10 +142,11 @@ else if (this.encoding != null) {
 	}
 
 	/**
-	 * Open an {@code java.io.InputStream} for the specified resource,
-	 * typically assuming that there is no specific encoding to use.
+	 * Open an {@code InputStream} for the specified resource, ignoring any specified
+	 * {@link #getCharset() Charset} or {@linkplain #getEncoding() encoding}.
 	 * @throws IOException if opening the InputStream failed
 	 * @see #requiresReader()
+	 * @see #getReader()
 	 */
 	public InputStream getInputStream() throws IOException {
 		return this.resource.getInputStream();
@@ -145,16 +154,17 @@ public InputStream getInputStream() throws IOException {
 
 
 	@Override
-	public boolean equals(Object obj) {
-		if (obj == this) {
+	public boolean equals(Object other) {
+		if (this == other) {
 			return true;
 		}
-		if (obj instanceof EncodedResource) {
-			EncodedResource otherRes = (EncodedResource) obj;
-			return (this.resource.equals(otherRes.resource) &&
-					ObjectUtils.nullSafeEquals(this.encoding, otherRes.encoding));
+		if (!(other instanceof EncodedResource)) {
+			return false;
 		}
-		return false;
+		EncodedResource otherResource = (EncodedResource) other;
+		return (this.resource.equals(otherResource.resource) &&
+				ObjectUtils.nullSafeEquals(this.charset, otherResource.charset) &&
+				ObjectUtils.nullSafeEquals(this.encoding, otherResource.encoding));
 	}
 
 	@Override
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java b/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
index 89e8b69be4..72b0c48115 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@
 import org.springframework.core.io.VfsResource;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.PathMatcher;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.ResourceUtils;
@@ -72,7 +73,7 @@
  * <p><b>Ant-style Patterns:</b>
  *
  * <p>When the path location contains an Ant-style pattern, e.g.:
- * <pre>
+ * <pre class="code">
  * /WEB-INF/*-context.xml
  * com/mycompany/**&#47;applicationContext.xml
  * file:C:/some/path/*-context.xml
@@ -143,11 +144,15 @@
  *
  * <p><b>WARNING:</b> Ant-style patterns with "classpath:" resources are not
  * guaranteed to find matching resources if the root package to search is available
- * in multiple class path locations. This is because a resource such as<pre>
+ * in multiple class path locations. This is because a resource such as
+ * <pre class="code">
  *     com/mycompany/package1/service-context.xml
- * </pre>may be in only one location, but when a path such as<pre>
+ * </pre>
+ * may be in only one location, but when a path such as
+ * <pre class="code">
  *     classpath:com/mycompany/**&#47;service-context.xml
- * </pre>is used to try to resolve it, the resolver will work off the (first) URL
+ * </pre>
+ * is used to try to resolve it, the resolver will work off the (first) URL
  * returned by {@code getResource("com/mycompany");}. If this base package
  * node exists in multiple classloader locations, the actual end resource may
  * not be underneath. Therefore, preferably, use "{@code classpath*:}" with the same
@@ -171,10 +176,10 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 	private static Method equinoxResolveMethod;
 
 	static {
-		// Detect Equinox OSGi (e.g. on WebSphere 6.1)
 		try {
-			Class<?> fileLocatorClass = PathMatchingResourcePatternResolver.class.getClassLoader().loadClass(
-					"org.eclipse.core.runtime.FileLocator");
+			// Detect Equinox OSGi (e.g. on WebSphere 6.1)
+			Class<?> fileLocatorClass = ClassUtils.forName("org.eclipse.core.runtime.FileLocator",
+					PathMatchingResourcePatternResolver.class.getClassLoader());
 			equinoxResolveMethod = fileLocatorClass.getMethod("resolve", URL.class);
 			logger.debug("Found Equinox FileLocator for OSGi bundle URL resolution");
 		}
@@ -198,6 +203,17 @@ public PathMatchingResourcePatternResolver() {
 		this.resourceLoader = new DefaultResourceLoader();
 	}
 
+	/**
+	 * Create a new PathMatchingResourcePatternResolver.
+	 * <p>ClassLoader access will happen via the thread context class loader.
+	 * @param resourceLoader the ResourceLoader to load root directories and
+	 * actual resources with
+	 */
+	public PathMatchingResourcePatternResolver(ResourceLoader resourceLoader) {
+		Assert.notNull(resourceLoader, "ResourceLoader must not be null");
+		this.resourceLoader = resourceLoader;
+	}
+
 	/**
 	 * Create a new PathMatchingResourcePatternResolver with a DefaultResourceLoader.
 	 * @param classLoader the ClassLoader to load classpath resources with,
@@ -209,16 +225,6 @@ public PathMatchingResourcePatternResolver(ClassLoader classLoader) {
 		this.resourceLoader = new DefaultResourceLoader(classLoader);
 	}
 
-	/**
-	 * Create a new PathMatchingResourcePatternResolver.
-	 * <p>ClassLoader access will happen via the thread context class loader.
-	 * @param resourceLoader the ResourceLoader to load root directories and
-	 * actual resources with
-	 */
-	public PathMatchingResourcePatternResolver(ResourceLoader resourceLoader) {
-		Assert.notNull(resourceLoader, "ResourceLoader must not be null");
-		this.resourceLoader = resourceLoader;
-	}
 
 	/**
 	 * Return the ResourceLoader that this pattern resolver works with.
@@ -227,10 +233,6 @@ public ResourceLoader getResourceLoader() {
 		return this.resourceLoader;
 	}
 
-	/**
-	 * Return the ClassLoader that this pattern resolver works with
-	 * (never {@code null}).
-	 */
 	public ClassLoader getClassLoader() {
 		return getResourceLoader().getClassLoader();
 	}
@@ -298,7 +300,8 @@ protected Resource[] findAllClassPathResources(String location) throws IOExcepti
 		if (path.startsWith("/")) {
 			path = path.substring(1);
 		}
-		Enumeration<URL> resourceUrls = getClassLoader().getResources(path);
+		ClassLoader cl = getClassLoader();
+		Enumeration<URL> resourceUrls = (cl != null ? cl.getResources(path) : ClassLoader.getSystemResources(path));
 		Set<Resource> result = new LinkedHashSet<Resource>(16);
 		while (resourceUrls.hasMoreElements()) {
 			URL url = resourceUrls.nextElement();
@@ -337,12 +340,12 @@ protected Resource[] findPathMatchingResources(String locationPattern) throws IO
 		Set<Resource> result = new LinkedHashSet<Resource>(16);
 		for (Resource rootDirResource : rootDirResources) {
 			rootDirResource = resolveRootDirResource(rootDirResource);
-			if (isJarResource(rootDirResource)) {
-				result.addAll(doFindPathMatchingJarResources(rootDirResource, subPattern));
-			}
-			else if (rootDirResource.getURL().getProtocol().startsWith(ResourceUtils.URL_PROTOCOL_VFS)) {
+			if (rootDirResource.getURL().getProtocol().startsWith(ResourceUtils.URL_PROTOCOL_VFS)) {
 				result.addAll(VfsResourceMatchingDelegate.findMatchingResources(rootDirResource, subPattern, getPathMatcher()));
 			}
+			else if (isJarResource(rootDirResource)) {
+				result.addAll(doFindPathMatchingJarResources(rootDirResource, subPattern));
+			}
 			else {
 				result.addAll(doFindPathMatchingFileResources(rootDirResource, subPattern));
 			}
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java b/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java
index 1e68ba23d8..fb9508390e 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ public void setProperties(Properties properties) {
 	 * Set local properties, e.g. via the "props" tag in XML bean definitions,
 	 * allowing for merging multiple properties sets into one.
 	 */
-	public void setPropertiesArray(Properties[] propertiesArray) {
+	public void setPropertiesArray(Properties... propertiesArray) {
 		this.localProperties = propertiesArray;
 	}
 
@@ -88,7 +88,7 @@ public void setLocation(Resource location) {
 	 * Hence, make sure that the most specific files are the last
 	 * ones in the given list of locations.
 	 */
-	public void setLocations(Resource[] locations) {
+	public void setLocations(Resource... locations) {
 		this.locations = locations;
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java b/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java
index 503f2bb1bb..c501a52fe6 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/PropertiesLoaderUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -170,14 +170,15 @@ public static Properties loadAllProperties(String resourceName) throws IOExcepti
 	 */
 	public static Properties loadAllProperties(String resourceName, ClassLoader classLoader) throws IOException {
 		Assert.notNull(resourceName, "Resource name must not be null");
-		ClassLoader clToUse = classLoader;
-		if (clToUse == null) {
-			clToUse = ClassUtils.getDefaultClassLoader();
+		ClassLoader classLoaderToUse = classLoader;
+		if (classLoaderToUse == null) {
+			classLoaderToUse = ClassUtils.getDefaultClassLoader();
 		}
+		Enumeration<URL> urls = (classLoaderToUse != null ? classLoaderToUse.getResources(resourceName) :
+				ClassLoader.getSystemResources(resourceName));
 		Properties props = new Properties();
-		Enumeration urls = clToUse.getResources(resourceName);
 		while (urls.hasMoreElements()) {
-			URL url = (URL) urls.nextElement();
+			URL url = urls.nextElement();
 			URLConnection con = url.openConnection();
 			ResourceUtils.useCachesIfNecessary(con);
 			InputStream is = con.getInputStream();
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java b/spring-core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java
index 12c6fb7aca..e37a21f048 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,12 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.core.env.StandardEnvironment;
+
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertyResolver;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.Resource;
+import org.springframework.util.Assert;
 
 /**
  * Editor for {@link org.springframework.core.io.Resource} arrays, to
@@ -55,10 +57,10 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport {
 
 	private static final Log logger = LogFactory.getLog(ResourceArrayPropertyEditor.class);
 
-	private final PropertyResolver propertyResolver;
-
 	private final ResourcePatternResolver resourcePatternResolver;
 
+	private PropertyResolver propertyResolver;
+
 	private final boolean ignoreUnresolvablePlaceholders;
 
 
@@ -69,7 +71,7 @@ public class ResourceArrayPropertyEditor extends PropertyEditorSupport {
 	 * @see Environment
 	 */
 	public ResourceArrayPropertyEditor() {
-		this(new PathMatchingResourcePatternResolver(), new StandardEnvironment(), true);
+		this(new PathMatchingResourcePatternResolver(), null, true);
 	}
 
 	/**
@@ -80,17 +82,7 @@ public ResourceArrayPropertyEditor() {
 	 */
 	@Deprecated
 	public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolver) {
-		this(resourcePatternResolver, new StandardEnvironment(), true);
-	}
-
-	/**
-	 * Create a new ResourceArrayPropertyEditor with the given {@link ResourcePatternResolver}
-	 * and {@link PropertyResolver} (typically an {@link Environment}).
-	 * @param resourcePatternResolver the ResourcePatternResolver to use
-	 * @param propertyResolver the PropertyResolver to use
-	 */
-	public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolver, PropertyResolver propertyResolver) {
-		this(resourcePatternResolver, propertyResolver, true);
+		this(resourcePatternResolver, null, true);
 	}
 
 	/**
@@ -103,7 +95,17 @@ public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolv
 	 */
 	@Deprecated
 	public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolver, boolean ignoreUnresolvablePlaceholders) {
-		this(resourcePatternResolver, new StandardEnvironment(), ignoreUnresolvablePlaceholders);
+		this(resourcePatternResolver, null, ignoreUnresolvablePlaceholders);
+	}
+
+	/**
+	 * Create a new ResourceArrayPropertyEditor with the given {@link ResourcePatternResolver}
+	 * and {@link PropertyResolver} (typically an {@link Environment}).
+	 * @param resourcePatternResolver the ResourcePatternResolver to use
+	 * @param propertyResolver the PropertyResolver to use
+	 */
+	public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolver, PropertyResolver propertyResolver) {
+		this(resourcePatternResolver, propertyResolver, true);
 	}
 
 	/**
@@ -116,6 +118,8 @@ public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolv
 	 */
 	public ResourceArrayPropertyEditor(ResourcePatternResolver resourcePatternResolver,
 			PropertyResolver propertyResolver, boolean ignoreUnresolvablePlaceholders) {
+
+		Assert.notNull(resourcePatternResolver, "ResourcePatternResolver must not be null");
 		this.resourcePatternResolver = resourcePatternResolver;
 		this.propertyResolver = propertyResolver;
 		this.ignoreUnresolvablePlaceholders = ignoreUnresolvablePlaceholders;
@@ -197,9 +201,11 @@ else if (element instanceof Resource) {
 	 * @see PropertyResolver#resolveRequiredPlaceholders(String)
 	 */
 	protected String resolvePath(String path) {
-		return this.ignoreUnresolvablePlaceholders ?
-				this.propertyResolver.resolvePlaceholders(path) :
-				this.propertyResolver.resolveRequiredPlaceholders(path);
+		if (this.propertyResolver == null) {
+			this.propertyResolver = new StandardEnvironment();
+		}
+		return (this.ignoreUnresolvablePlaceholders ? this.propertyResolver.resolvePlaceholders(path) :
+				this.propertyResolver.resolveRequiredPlaceholders(path));
 	}
 
 }
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java b/spring-core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java
index 9c0c12eecd..e9721a9517 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,11 @@
 package org.springframework.core.io.support;
 
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.util.Assert;
 import org.springframework.util.ResourceUtils;
 
 /**
  * Utility class for determining whether a given URL is a resource
- * location that can be loaded via a ResourcePatternResolver.
+ * location that can be loaded via a {@link ResourcePatternResolver}.
  *
  * <p>Callers will usually assume that a location is a relative path
  * if the {@link #isUrl(String)} method returns {@code false}.
@@ -59,7 +58,6 @@ public static boolean isUrl(String resourceLocation) {
 	 * @see PathMatchingResourcePatternResolver
 	 */
 	public static ResourcePatternResolver getResourcePatternResolver(ResourceLoader resourceLoader) {
-		Assert.notNull(resourceLoader, "ResourceLoader must not be null");
 		if (resourceLoader instanceof ResourcePatternResolver) {
 			return (ResourcePatternResolver) resourceLoader;
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java b/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java
index 13ae7ca91f..9125716580 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,34 +59,36 @@ public abstract class SpringFactoriesLoader {
 
 
 	/**
-	 * Loads the factory implementations of the given type from the default location, using
-	 * the given class loader.
+	 * Load the factory implementations of the given type from the default location,
+	 * using the given class loader.
 	 * <p>The returned factories are ordered in accordance with the {@link OrderComparator}.
 	 * @param factoryClass the interface or abstract class representing the factory
 	 * @param classLoader the ClassLoader to use for loading (can be {@code null} to use the default)
 	 */
 	public static <T> List<T> loadFactories(Class<T> factoryClass, ClassLoader classLoader) {
 		Assert.notNull(factoryClass, "'factoryClass' must not be null");
-		if (classLoader == null) {
-			classLoader = SpringFactoriesLoader.class.getClassLoader();
+		ClassLoader classLoaderToUse = classLoader;
+		if (classLoaderToUse == null) {
+			classLoaderToUse = SpringFactoriesLoader.class.getClassLoader();
 		}
-		List<String> factoryNames = loadFactoryNames(factoryClass, classLoader);
+		List<String> factoryNames = loadFactoryNames(factoryClass, classLoaderToUse);
 		if (logger.isTraceEnabled()) {
 			logger.trace("Loaded [" + factoryClass.getName() + "] names: " + factoryNames);
 		}
 		List<T> result = new ArrayList<T>(factoryNames.size());
 		for (String factoryName : factoryNames) {
-			result.add(instantiateFactory(factoryName, factoryClass, classLoader));
+			result.add(instantiateFactory(factoryName, factoryClass, classLoaderToUse));
 		}
 		OrderComparator.sort(result);
 		return result;
 	}
 
-	private static List<String> loadFactoryNames(Class<?> factoryClass, ClassLoader classLoader) {
+	public static List<String> loadFactoryNames(Class<?> factoryClass, ClassLoader classLoader) {
 		String factoryClassName = factoryClass.getName();
 		try {
+			Enumeration<URL> urls = (classLoader != null ? classLoader.getResources(FACTORIES_RESOURCE_LOCATION) :
+					ClassLoader.getSystemResources(FACTORIES_RESOURCE_LOCATION));
 			List<String> result = new ArrayList<String>();
-			Enumeration<URL> urls = classLoader.getResources(FACTORIES_RESOURCE_LOCATION);
 			while (urls.hasMoreElements()) {
 				URL url = urls.nextElement();
 				Properties properties = PropertiesLoaderUtils.loadProperties(new UrlResource(url));
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java
index 3ae7ca3b12..b9909f61e5 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ public SerializingConverter(Serializer<Object> serializer) {
 	 * Serializes the source object and returns the byte array result.
 	 */
 	public byte[] convert(Object source) {
-		ByteArrayOutputStream byteStream = new ByteArrayOutputStream(128);
+		ByteArrayOutputStream byteStream = new ByteArrayOutputStream(256);
 		try  {
 			this.serializer.serialize(source, byteStream);
 			return byteStream.toByteArray();
diff --git a/spring-core/src/main/java/org/springframework/core/style/ToStringCreator.java b/spring-core/src/main/java/org/springframework/core/style/ToStringCreator.java
index 5871f8dfcc..6f682939cc 100644
--- a/spring-core/src/main/java/org/springframework/core/style/ToStringCreator.java
+++ b/spring-core/src/main/java/org/springframework/core/style/ToStringCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,11 +36,11 @@ public class ToStringCreator {
 			new DefaultToStringStyler(StylerUtils.DEFAULT_VALUE_STYLER);
 
 
-	private StringBuilder buffer = new StringBuilder(512);
+	private final StringBuilder buffer = new StringBuilder(256);
 
-	private ToStringStyler styler;
+	private final ToStringStyler styler;
 
-	private Object object;
+	private final Object object;
 
 	private boolean styledFirstField;
 
diff --git a/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java
index 0a68e74615..f650e1d597 100644
--- a/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,6 +67,7 @@ public interface AsyncTaskExecutor extends TaskExecutor {
 	 * @param task the {@code Runnable} to execute (never {@code null})
 	 * @return a Future representing pending completion of the task
 	 * @throws TaskRejectedException if the given task was not accepted
+	 * @since 3.0
 	 */
 	Future<?> submit(Runnable task);
 
@@ -76,6 +77,7 @@ public interface AsyncTaskExecutor extends TaskExecutor {
 	 * @param task the {@code Callable} to execute (never {@code null})
 	 * @return a Future representing pending completion of the task
 	 * @throws TaskRejectedException if the given task was not accepted
+	 * @since 3.0
 	 */
 	<T> Future<T> submit(Callable<T> task);
 
diff --git a/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java
index bd2df283d7..f980c4d433 100644
--- a/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java
+++ b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 import org.springframework.util.Assert;
 
 /**
- * Adapter that takes a JDK 1.5 {@code java.util.concurrent.Executor} and
+ * Adapter that takes a JDK {@code java.util.concurrent.Executor} and
  * exposes a Spring {@link org.springframework.core.task.TaskExecutor} for it.
  * Also detects an extended {@code java.util.concurrent.ExecutorService}, adapting
  * the {@link org.springframework.core.task.AsyncTaskExecutor} interface accordingly.
@@ -41,13 +41,13 @@
  */
 public class TaskExecutorAdapter implements AsyncTaskExecutor {
 
-	private Executor concurrentExecutor;
+	private final Executor concurrentExecutor;
 
 
 	/**
 	 * Create a new TaskExecutorAdapter,
-	 * using the given JDK 1.5 concurrent executor.
-	 * @param concurrentExecutor the JDK 1.5 concurrent executor to delegate to
+	 * using the given JDK concurrent executor.
+	 * @param concurrentExecutor the JDK concurrent executor to delegate to
 	 */
 	public TaskExecutorAdapter(Executor concurrentExecutor) {
 		Assert.notNull(concurrentExecutor, "Executor must not be null");
@@ -56,7 +56,7 @@ public TaskExecutorAdapter(Executor concurrentExecutor) {
 
 
 	/**
-	 * Delegates to the specified JDK 1.5 concurrent executor.
+	 * Delegates to the specified JDK concurrent executor.
 	 * @see java.util.concurrent.Executor#execute(Runnable)
 	 */
 	public void execute(Runnable task) {
diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
index 1e5d00a9ca..1a4e53650f 100644
--- a/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/StandardAnnotationMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -145,6 +145,8 @@ public Map<String, Object> getAnnotationAttributes(String annotationType, boolea
 				return AnnotationUtils.getAnnotationAttributes(
 						ann, classValuesAsString, this.nestedAnnotationsAsMap);
 			}
+		}
+		for (Annotation ann : anns) {
 			for (Annotation metaAnn : ann.annotationType().getAnnotations()) {
 				if (metaAnn.annotationType().getName().equals(annotationType)) {
 					return AnnotationUtils.getAnnotationAttributes(
@@ -158,14 +160,16 @@ public Map<String, Object> getAnnotationAttributes(String annotationType, boolea
 	public boolean hasAnnotatedMethods(String annotationType) {
 		Method[] methods = getIntrospectedClass().getDeclaredMethods();
 		for (Method method : methods) {
-			for (Annotation ann : method.getAnnotations()) {
-				if (ann.annotationType().getName().equals(annotationType)) {
-					return true;
-				}
-				else {
-					for (Annotation metaAnn : ann.annotationType().getAnnotations()) {
-						if (metaAnn.annotationType().getName().equals(annotationType)) {
-							return true;
+			if (!method.isBridge()) {
+				for (Annotation ann : method.getAnnotations()) {
+					if (ann.annotationType().getName().equals(annotationType)) {
+						return true;
+					}
+					else {
+						for (Annotation metaAnn : ann.annotationType().getAnnotations()) {
+							if (metaAnn.annotationType().getName().equals(annotationType)) {
+								return true;
+							}
 						}
 					}
 				}
@@ -175,19 +179,21 @@ public boolean hasAnnotatedMethods(String annotationType) {
 	}
 
 	public Set<MethodMetadata> getAnnotatedMethods(String annotationType) {
-		Method[] methods = getIntrospectedClass().getDeclaredMethods();
 		Set<MethodMetadata> annotatedMethods = new LinkedHashSet<MethodMetadata>();
+		Method[] methods = getIntrospectedClass().getDeclaredMethods();
 		for (Method method : methods) {
-			for (Annotation ann : method.getAnnotations()) {
-				if (ann.annotationType().getName().equals(annotationType)) {
-					annotatedMethods.add(new StandardMethodMetadata(method, this.nestedAnnotationsAsMap));
-					break;
-				}
-				else {
-					for (Annotation metaAnn : ann.annotationType().getAnnotations()) {
-						if (metaAnn.annotationType().getName().equals(annotationType)) {
-							annotatedMethods.add(new StandardMethodMetadata(method, this.nestedAnnotationsAsMap));
-							break;
+			if (!method.isBridge()) {
+				for (Annotation ann : method.getAnnotations()) {
+					if (ann.annotationType().getName().equals(annotationType)) {
+						annotatedMethods.add(new StandardMethodMetadata(method, this.nestedAnnotationsAsMap));
+						break;
+					}
+					else {
+						for (Annotation metaAnn : ann.annotationType().getAnnotations()) {
+							if (metaAnn.annotationType().getName().equals(annotationType)) {
+								annotatedMethods.add(new StandardMethodMetadata(method, this.nestedAnnotationsAsMap));
+								break;
+							}
 						}
 					}
 				}
diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
index c6564c643f..8288debed4 100644
--- a/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,9 +49,14 @@ public StandardMethodMetadata(Method introspectedMethod) {
 	}
 
 	/**
-	 * Create a new StandardMethodMetadata wrapper for the given Method.
+	 * Create a new StandardMethodMetadata wrapper for the given Method,
+	 * providing the option to return any nested annotations or annotation arrays in the
+	 * form of {@link org.springframework.core.annotation.AnnotationAttributes} instead
+	 * of actual {@link java.lang.annotation.Annotation} instances.
 	 * @param introspectedMethod the Method to introspect
-	 * @param nestedAnnotationsAsMap
+	 * @param nestedAnnotationsAsMap return nested annotations and annotation arrays as
+	 * {@link org.springframework.core.annotation.AnnotationAttributes} for compatibility
+	 * with ASM-based {@link AnnotationMetadata} implementations
 	 * @since 3.1.1
 	 */
 	public StandardMethodMetadata(Method introspectedMethod, boolean nestedAnnotationsAsMap) {
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
index 77a8fef3a0..4e9bb8fa62 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -28,6 +29,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.asm.AnnotationVisitor;
 import org.springframework.asm.SpringAsmInfo;
 import org.springframework.asm.Type;
@@ -36,7 +38,6 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
 
-
 /**
  * @author Chris Beams
  * @author Juergen Hoeller
@@ -44,20 +45,18 @@
  */
 abstract class AbstractRecursiveAnnotationVisitor extends AnnotationVisitor {
 
-	protected final Log logger = LogFactory.getLog(this.getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
 	protected final AnnotationAttributes attributes;
 
 	protected final ClassLoader classLoader;
 
-
 	public AbstractRecursiveAnnotationVisitor(ClassLoader classLoader, AnnotationAttributes attributes) {
 		super(SpringAsmInfo.ASM_VERSION);
 		this.classLoader = classLoader;
 		this.attributes = attributes;
 	}
 
-
 	public void visit(String attributeName, Object attributeValue) {
 		this.attributes.put(attributeName, attributeValue);
 	}
@@ -74,6 +73,11 @@ public AnnotationVisitor visitArray(String attributeName) {
 	}
 
 	public void visitEnum(String attributeName, String asmTypeDescriptor, String attributeValue) {
+		Object newValue = getEnumValue(asmTypeDescriptor, attributeValue);
+		visit(attributeName, newValue);
+	}
+
+	protected Object getEnumValue(String asmTypeDescriptor, String attributeValue) {
 		Object valueToUse = attributeValue;
 		try {
 			Class<?> enumType = this.classLoader.loadClass(Type.getType(asmTypeDescriptor).getClassName());
@@ -83,12 +87,12 @@ public void visitEnum(String attributeName, String asmTypeDescriptor, String att
 			}
 		}
 		catch (ClassNotFoundException ex) {
-			this.logger.debug("Failed to classload enum type while reading annotation metadata", ex);
+			logger.debug("Failed to classload enum type while reading annotation metadata", ex);
 		}
 		catch (IllegalAccessException ex) {
-			this.logger.warn("Could not access enum value while reading annotation metadata", ex);
+			logger.warn("Could not access enum value while reading annotation metadata", ex);
 		}
-		this.attributes.put(attributeName, valueToUse);
+		return valueToUse;
 	}
 }
 
@@ -104,7 +108,6 @@ final class RecursiveAnnotationArrayVisitor extends AbstractRecursiveAnnotationV
 
 	private final List<AnnotationAttributes> allNestedAttributes = new ArrayList<AnnotationAttributes>();
 
-
 	public RecursiveAnnotationArrayVisitor(
 			String attributeName, AnnotationAttributes attributes, ClassLoader classLoader) {
 		super(classLoader, attributes);
@@ -119,7 +122,13 @@ public void visit(String attributeName, Object attributeValue) {
 			newValue = ObjectUtils.addObjectToArray((Object[]) existingValue, newValue);
 		}
 		else {
-			Object[] newArray = (Object[]) Array.newInstance(newValue.getClass(), 1);
+			Class<?> arrayClass = newValue.getClass();
+			if (Enum.class.isAssignableFrom(arrayClass)) {
+				while (arrayClass.getSuperclass() != null && !arrayClass.isEnum()) {
+					arrayClass = arrayClass.getSuperclass();
+				}
+			}
+			Object[] newArray = (Object[]) Array.newInstance(arrayClass, 1);
 			newArray[0] = newValue;
 			newValue = newArray;
 		}
@@ -136,8 +145,8 @@ public AnnotationVisitor visitAnnotation(String attributeName, String asmTypeDes
 
 	public void visitEnd() {
 		if (!this.allNestedAttributes.isEmpty()) {
-			this.attributes.put(this.attributeName, this.allNestedAttributes.toArray(
-					new AnnotationAttributes[this.allNestedAttributes.size()]));
+			this.attributes.put(this.attributeName,
+				this.allNestedAttributes.toArray(new AnnotationAttributes[this.allNestedAttributes.size()]));
 		}
 	}
 }
@@ -152,23 +161,20 @@ class RecursiveAnnotationAttributesVisitor extends AbstractRecursiveAnnotationVi
 
 	private final String annotationType;
 
-
-	public RecursiveAnnotationAttributesVisitor(
-			String annotationType, AnnotationAttributes attributes, ClassLoader classLoader) {
+	public RecursiveAnnotationAttributesVisitor(String annotationType, AnnotationAttributes attributes,
+			ClassLoader classLoader) {
 		super(classLoader, attributes);
 		this.annotationType = annotationType;
 	}
 
-
 	public final void visitEnd() {
 		try {
 			Class<?> annotationClass = this.classLoader.loadClass(this.annotationType);
-			this.doVisitEnd(annotationClass);
+			doVisitEnd(annotationClass);
 		}
 		catch (ClassNotFoundException ex) {
-			this.logger.debug("Failed to classload type while reading annotation " +
-					"metadata. This is a non-fatal error, but certain annotation " +
-					"metadata may be unavailable.", ex);
+			logger.debug("Failed to class-load type while reading annotation metadata. " +
+					"This is a non-fatal error, but certain annotation metadata may be unavailable.", ex);
 		}
 	}
 
@@ -177,26 +183,31 @@ protected void doVisitEnd(Class<?> annotationClass) {
 	}
 
 	private void registerDefaultValues(Class<?> annotationClass) {
-		// Check declared default values of attributes in the annotation type.
-		Method[] annotationAttributes = annotationClass.getMethods();
-		for (Method annotationAttribute : annotationAttributes) {
-			String attributeName = annotationAttribute.getName();
-			Object defaultValue = annotationAttribute.getDefaultValue();
-			if (defaultValue != null && !this.attributes.containsKey(attributeName)) {
-				if (defaultValue instanceof Annotation) {
-					defaultValue = AnnotationAttributes.fromMap(
-							AnnotationUtils.getAnnotationAttributes((Annotation)defaultValue, false, true));
-				}
-				else if (defaultValue instanceof Annotation[]) {
-					Annotation[] realAnnotations = (Annotation[]) defaultValue;
-					AnnotationAttributes[] mappedAnnotations = new AnnotationAttributes[realAnnotations.length];
-					for (int i = 0; i < realAnnotations.length; i++) {
-						mappedAnnotations[i] = AnnotationAttributes.fromMap(
-								AnnotationUtils.getAnnotationAttributes(realAnnotations[i], false, true));
+		// Only do further scanning for public annotations; we'd run into
+		// IllegalAccessExceptions otherwise, and we don't want to mess with
+		// accessibility in a SecurityManager environment.
+		if (Modifier.isPublic(annotationClass.getModifiers())) {
+			// Check declared default values of attributes in the annotation type.
+			Method[] annotationAttributes = annotationClass.getMethods();
+			for (Method annotationAttribute : annotationAttributes) {
+				String attributeName = annotationAttribute.getName();
+				Object defaultValue = annotationAttribute.getDefaultValue();
+				if (defaultValue != null && !this.attributes.containsKey(attributeName)) {
+					if (defaultValue instanceof Annotation) {
+						defaultValue = AnnotationAttributes.fromMap(AnnotationUtils.getAnnotationAttributes(
+							(Annotation) defaultValue, false, true));
 					}
-					defaultValue = mappedAnnotations;
+					else if (defaultValue instanceof Annotation[]) {
+						Annotation[] realAnnotations = (Annotation[]) defaultValue;
+						AnnotationAttributes[] mappedAnnotations = new AnnotationAttributes[realAnnotations.length];
+						for (int i = 0; i < realAnnotations.length; i++) {
+							mappedAnnotations[i] = AnnotationAttributes.fromMap(AnnotationUtils.getAnnotationAttributes(
+								realAnnotations[i], false, true));
+						}
+						defaultValue = mappedAnnotations;
+					}
+					this.attributes.put(attributeName, defaultValue);
 				}
-				this.attributes.put(attributeName, defaultValue);
 			}
 		}
 	}
@@ -223,7 +234,6 @@ final class AnnotationAttributesReadingVisitor extends RecursiveAnnotationAttrib
 
 	private final Map<String, Set<String>> metaAnnotationMap;
 
-
 	public AnnotationAttributesReadingVisitor(
 			String annotationType, Map<String, AnnotationAttributes> attributesMap,
 			Map<String, Set<String>> metaAnnotationMap, ClassLoader classLoader) {
@@ -246,16 +256,21 @@ private void registerMetaAnnotations(Class<?> annotationClass) {
 		Set<String> metaAnnotationTypeNames = new LinkedHashSet<String>();
 		for (Annotation metaAnnotation : annotationClass.getAnnotations()) {
 			metaAnnotationTypeNames.add(metaAnnotation.annotationType().getName());
-			if (!this.attributesMap.containsKey(metaAnnotation.annotationType().getName())) {
-				this.attributesMap.put(metaAnnotation.annotationType().getName(),
-						AnnotationUtils.getAnnotationAttributes(metaAnnotation, true, true));
-			}
-			for (Annotation metaMetaAnnotation : metaAnnotation.annotationType().getAnnotations()) {
-				metaAnnotationTypeNames.add(metaMetaAnnotation.annotationType().getName());
+			// Only do further scanning for public annotations; we'd run into IllegalAccessExceptions
+			// otherwise, and don't want to mess with accessibility in a SecurityManager environment.
+			if (Modifier.isPublic(metaAnnotation.annotationType().getModifiers())) {
+				if (!this.attributesMap.containsKey(metaAnnotation.annotationType().getName())) {
+					this.attributesMap.put(metaAnnotation.annotationType().getName(),
+							AnnotationUtils.getAnnotationAttributes(metaAnnotation, true, true));
+				}
+				for (Annotation metaMetaAnnotation : metaAnnotation.annotationType().getAnnotations()) {
+					metaAnnotationTypeNames.add(metaMetaAnnotation.annotationType().getName());
+				}
 			}
 		}
 		if (this.metaAnnotationMap != null) {
 			this.metaAnnotationMap.put(annotationClass.getName(), metaAnnotationTypeNames);
 		}
 	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
index 97a4897f81..e173984608 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,19 +19,16 @@
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.springframework.asm.AnnotationVisitor;
 import org.springframework.asm.MethodVisitor;
+import org.springframework.asm.Opcodes;
 import org.springframework.asm.Type;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.MethodMetadata;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 
 /**
  * ASM class visitor which looks for the class name and implemented types as
@@ -47,13 +44,13 @@ final class AnnotationMetadataReadingVisitor extends ClassMetadataReadingVisitor
 
 	private final ClassLoader classLoader;
 
-	private final Set<String> annotationSet = new LinkedHashSet<String>();
+	private final Set<String> annotationSet = new LinkedHashSet<String>(4);
 
 	private final Map<String, Set<String>> metaAnnotationMap = new LinkedHashMap<String, Set<String>>(4);
 
 	private final Map<String, AnnotationAttributes> attributeMap = new LinkedHashMap<String, AnnotationAttributes>(4);
 
-	private final MultiValueMap<String, MethodMetadata> methodMetadataMap = new LinkedMultiValueMap<String, MethodMetadata>();
+	private final Set<MethodMetadata> methodMetadataSet = new LinkedHashSet<MethodMetadata>(4);
 
 
 	public AnnotationMetadataReadingVisitor(ClassLoader classLoader) {
@@ -63,7 +60,12 @@ public AnnotationMetadataReadingVisitor(ClassLoader classLoader) {
 
 	@Override
 	public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-		return new MethodMetadataReadingVisitor(name, access, this.getClassName(), this.classLoader, this.methodMetadataMap);
+		// Skip bridge methods - we're only interested in original annotation-defining user methods.
+		// On JDK 8, we'd otherwise run into double detection of the same annotated method...
+		if ((access & Opcodes.ACC_BRIDGE) != 0) {
+			return super.visitMethod(access, name, desc, signature, exceptions);
+		}
+		return new MethodMetadataReadingVisitor(name, access, getClassName(), this.classLoader, this.methodMetadataSet);
 	}
 
 	@Override
@@ -105,19 +107,11 @@ public AnnotationAttributes getAnnotationAttributes(String annotationType) {
 	}
 
 	public AnnotationAttributes getAnnotationAttributes(String annotationType, boolean classValuesAsString) {
-		return getAnnotationAttributes(annotationType, classValuesAsString, false);
-	}
-
-	public AnnotationAttributes getAnnotationAttributes(
-			String annotationType, boolean classValuesAsString, boolean nestedAttributesAsMap) {
-
 		AnnotationAttributes raw = this.attributeMap.get(annotationType);
-		return convertClassValues(raw, classValuesAsString, nestedAttributesAsMap);
+		return convertClassValues(raw, classValuesAsString);
 	}
 
-	private AnnotationAttributes convertClassValues(
-			AnnotationAttributes original, boolean classValuesAsString, boolean nestedAttributesAsMap) {
-
+	private AnnotationAttributes convertClassValues(AnnotationAttributes original, boolean classValuesAsString) {
 		if (original == null) {
 			return null;
 		}
@@ -126,12 +120,12 @@ private AnnotationAttributes convertClassValues(
 			try {
 				Object value = entry.getValue();
 				if (value instanceof AnnotationAttributes) {
-					value = convertClassValues((AnnotationAttributes)value, classValuesAsString, nestedAttributesAsMap);
+					value = convertClassValues((AnnotationAttributes) value, classValuesAsString);
 				}
 				else if (value instanceof AnnotationAttributes[]) {
 					AnnotationAttributes[] values = (AnnotationAttributes[])value;
 					for (int i = 0; i < values.length; i++) {
-						values[i] = convertClassValues(values[i], classValuesAsString, nestedAttributesAsMap);
+						values[i] = convertClassValues(values[i], classValuesAsString);
 					}
 				}
 				else if (value instanceof Type) {
@@ -170,16 +164,22 @@ else if (value instanceof Class[]) {
 	}
 
 	public boolean hasAnnotatedMethods(String annotationType) {
-		return this.methodMetadataMap.containsKey(annotationType);
+		for (MethodMetadata methodMetadata : this.methodMetadataSet) {
+			if (methodMetadata.isAnnotated(annotationType)) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	public Set<MethodMetadata> getAnnotatedMethods(String annotationType) {
-		List<MethodMetadata> list = this.methodMetadataMap.get(annotationType);
-		if (CollectionUtils.isEmpty(list)) {
-			return new LinkedHashSet<MethodMetadata>(0);
+		Set<MethodMetadata> annotatedMethods = new LinkedHashSet<MethodMetadata>(4);
+		for (MethodMetadata methodMetadata : this.methodMetadataSet) {
+			if (methodMetadata.isAnnotated(annotationType)) {
+				annotatedMethods.add(methodMetadata);
+			}
 		}
-		Set<MethodMetadata> annotatedMethods = new LinkedHashSet<MethodMetadata>(list.size());
-		annotatedMethods.addAll(list);
 		return annotatedMethods;
 	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
index 58256b6049..dde3790c8e 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
 
 import org.springframework.asm.AnnotationVisitor;
 import org.springframework.asm.MethodVisitor;
@@ -26,7 +27,6 @@
 import org.springframework.asm.Type;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.MethodMetadata;
-import org.springframework.util.MultiValueMap;
 
 /**
  * ASM method visitor which looks for the annotations defined on the method,
@@ -45,28 +45,31 @@ final class MethodMetadataReadingVisitor extends MethodVisitor implements Method
 
 	private final int access;
 
-	private String declaringClassName;
+	private final String declaringClassName;
 
 	private final ClassLoader classLoader;
 
-	private final MultiValueMap<String, MethodMetadata> methodMetadataMap;
+	private final Set<MethodMetadata> methodMetadataSet;
 
 	private final Map<String, AnnotationAttributes> attributeMap = new LinkedHashMap<String, AnnotationAttributes>(2);
 
-	public MethodMetadataReadingVisitor(String name, int access, String declaringClassName, ClassLoader classLoader,
-			MultiValueMap<String, MethodMetadata> methodMetadataMap) {
+
+	public MethodMetadataReadingVisitor(String name, int access, String declaringClassName,
+			ClassLoader classLoader, Set<MethodMetadata> methodMetadataSet) {
+
 		super(SpringAsmInfo.ASM_VERSION);
 		this.name = name;
 		this.access = access;
 		this.declaringClassName = declaringClassName;
 		this.classLoader = classLoader;
-		this.methodMetadataMap = methodMetadataMap;
+		this.methodMetadataSet = methodMetadataSet;
 	}
 
+
 	@Override
 	public AnnotationVisitor visitAnnotation(final String desc, boolean visible) {
 		String className = Type.getType(desc).getClassName();
-		methodMetadataMap.add(className, this);
+		this.methodMetadataSet.add(this);
 		return new AnnotationAttributesReadingVisitor(className, this.attributeMap, null, this.classLoader);
 	}
 
@@ -97,4 +100,5 @@ public AnnotationAttributes getAnnotationAttributes(String annotationType) {
 	public String getDeclaringClassName() {
 		return this.declaringClassName;
 	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
index af2d4c62d8..36c495e542 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
@@ -64,7 +64,7 @@ final class SimpleMetadataReader implements MetadataReader {
 		classReader.accept(visitor, ClassReader.SKIP_DEBUG);
 
 		this.annotationMetadata = visitor;
-		// (since AnnotationMetadataReader extends ClassMetadataReadingVisitor)
+		// (since AnnotationMetadataReadingVisitor extends ClassMetadataReadingVisitor)
 		this.classMetadata = visitor;
 		this.resource = resource;
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java
index 2d8b40b524..9e1c736fc9 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReaderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,7 +73,23 @@ public final ResourceLoader getResourceLoader() {
 	public MetadataReader getMetadataReader(String className) throws IOException {
 		String resourcePath = ResourceLoader.CLASSPATH_URL_PREFIX +
 				ClassUtils.convertClassNameToResourcePath(className) + ClassUtils.CLASS_FILE_SUFFIX;
-		return getMetadataReader(this.resourceLoader.getResource(resourcePath));
+		Resource resource = this.resourceLoader.getResource(resourcePath);
+		if (!resource.exists()) {
+			// Maybe an inner class name using the dot name syntax? Need to use the dollar syntax here...
+			// ClassUtils.forName has an equivalent check for resolution into Class references later on.
+			int lastDotIndex = className.lastIndexOf('.');
+			if (lastDotIndex != -1) {
+				String innerClassName =
+						className.substring(0, lastDotIndex) + '$' + className.substring(lastDotIndex + 1);
+				String innerClassResourcePath = ResourceLoader.CLASSPATH_URL_PREFIX +
+						ClassUtils.convertClassNameToResourcePath(innerClassName) + ClassUtils.CLASS_FILE_SUFFIX;
+				Resource innerClassResource = this.resourceLoader.getResource(innerClassResourcePath);
+				if (innerClassResource.exists()) {
+					resource = innerClassResource;
+				}
+			}
+		}
+		return getMetadataReader(resource);
 	}
 
 	public MetadataReader getMetadataReader(Resource resource) throws IOException {
diff --git a/spring-core/src/main/java/org/springframework/core/type/filter/AbstractClassTestingTypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AbstractClassTestingTypeFilter.java
index 3d4bbdd744..e63571f653 100644
--- a/spring-core/src/main/java/org/springframework/core/type/filter/AbstractClassTestingTypeFilter.java
+++ b/spring-core/src/main/java/org/springframework/core/type/filter/AbstractClassTestingTypeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 import java.io.IOException;
 
 import org.springframework.core.type.ClassMetadata;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReader;
+import org.springframework.core.type.classreading.MetadataReaderFactory;
 
 /**
  * Type filter that exposes a
diff --git a/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java
index 82362b5670..6ee0c87528 100644
--- a/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java
+++ b/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 import java.io.IOException;
 
 import org.springframework.core.type.ClassMetadata;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReader;
+import org.springframework.core.type.classreading.MetadataReaderFactory;
 
 /**
  * Type filter that is aware of traversing over hierarchy.
@@ -131,7 +131,7 @@ protected Boolean matchSuperClass(String superClassName) {
 	/**
 	 * Override this to match on interface type name.
 	 */
-	protected Boolean matchInterface(String interfaceNames) {
+	protected Boolean matchInterface(String interfaceName) {
 		return null;
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/type/filter/AnnotationTypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AnnotationTypeFilter.java
index 8a0d14b6aa..7d2d674c7c 100644
--- a/spring-core/src/main/java/org/springframework/core/type/filter/AnnotationTypeFilter.java
+++ b/spring-core/src/main/java/org/springframework/core/type/filter/AnnotationTypeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,10 @@
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Inherited;
 
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.classreading.MetadataReader;
+import org.springframework.util.ClassUtils;
 
 /**
  * A simple filter which matches classes with a given annotation,
@@ -49,7 +51,7 @@ public class AnnotationTypeFilter extends AbstractTypeHierarchyTraversingFilter
 	 * @param annotationType the annotation type to match
 	 */
 	public AnnotationTypeFilter(Class<? extends Annotation> annotationType) {
-		this(annotationType, true);
+		this(annotationType, true, false);
 	}
 
 	/**
@@ -84,16 +86,26 @@ protected boolean matchSelf(MetadataReader metadataReader) {
 
 	@Override
 	protected Boolean matchSuperClass(String superClassName) {
-		if (Object.class.getName().equals(superClassName)) {
-			return Boolean.FALSE;
+		return hasAnnotation(superClassName);
+	}
+
+	@Override
+	protected Boolean matchInterface(String interfaceName) {
+		return hasAnnotation(interfaceName);
+	}
+
+	protected Boolean hasAnnotation(String typeName) {
+		if (Object.class.getName().equals(typeName)) {
+			return false;
 		}
-		else if (superClassName.startsWith("java.")) {
+		else if (typeName.startsWith("java")) {
 			try {
-				Class<?> clazz = getClass().getClassLoader().loadClass(superClassName);
-				return (clazz.getAnnotation(this.annotationType) != null);
+				Class<?> clazz = ClassUtils.forName(typeName, getClass().getClassLoader());
+				return ((this.considerMetaAnnotations ? AnnotationUtils.getAnnotation(clazz, this.annotationType) :
+						clazz.getAnnotation(this.annotationType)) != null);
 			}
-			catch (ClassNotFoundException ex) {
-				// Class not found - can't determine a match that way.
+			catch (Throwable ex) {
+				// Class not regularly loadable - can't determine a match that way.
 			}
 		}
 		return null;
diff --git a/spring-core/src/main/java/org/springframework/core/type/filter/AspectJTypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AspectJTypeFilter.java
index 262338d912..0e2a3a5d8e 100644
--- a/spring-core/src/main/java/org/springframework/core/type/filter/AspectJTypeFilter.java
+++ b/spring-core/src/main/java/org/springframework/core/type/filter/AspectJTypeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@
 import org.aspectj.weaver.patterns.SimpleScope;
 import org.aspectj.weaver.patterns.TypePattern;
 
-import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReader;
+import org.springframework.core.type.classreading.MetadataReaderFactory;
 
 /**
  * Type filter that uses AspectJ type pattern for matching.
diff --git a/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java
index 82afe352cc..6365304627 100644
--- a/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java
+++ b/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.core.type.filter;
 
+import org.springframework.util.ClassUtils;
+
 /**
  * A simple filter which matches classes that are assignable to a given type.
  *
@@ -26,14 +28,14 @@
  */
 public class AssignableTypeFilter extends AbstractTypeHierarchyTraversingFilter {
 
-	private final Class targetType;
+	private final Class<?> targetType;
 
 
 	/**
 	 * Create a new AssignableTypeFilter for the given type.
 	 * @param targetType the type to match
 	 */
-	public AssignableTypeFilter(Class targetType) {
+	public AssignableTypeFilter(Class<?> targetType) {
 		super(true, true);
 		this.targetType = targetType;
 	}
@@ -59,15 +61,15 @@ protected Boolean matchTargetType(String typeName) {
 			return true;
 		}
 		else if (Object.class.getName().equals(typeName)) {
-			return Boolean.FALSE;
+			return false;
 		}
-		else if (typeName.startsWith("java.")) {
+		else if (typeName.startsWith("java")) {
 			try {
-				Class clazz = getClass().getClassLoader().loadClass(typeName);
-				return Boolean.valueOf(this.targetType.isAssignableFrom(clazz));
+				Class<?> clazz = ClassUtils.forName(typeName, getClass().getClassLoader());
+				return this.targetType.isAssignableFrom(clazz);
 			}
-			catch (ClassNotFoundException ex) {
-				// Class not found - can't determine a match that way.
+			catch (Throwable ex) {
+				// Class not regularly loadable - can't determine a match that way.
 			}
 		}
 		return null;
diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
index e7fefa175d..a4f74a4b0d 100644
--- a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
@@ -50,29 +50,37 @@
  */
 public class AntPathMatcher implements PathMatcher {
 
-	private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\{[^/]+?\\}");
-
 	/** Default path separator: "/" */
 	public static final String DEFAULT_PATH_SEPARATOR = "/";
 
+	private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\{[^/]+?\\}");
+
+
 	private String pathSeparator = DEFAULT_PATH_SEPARATOR;
 
+	private boolean trimTokens = true;
+
 	private final Map<String, AntPathStringMatcher> stringMatcherCache =
 			new ConcurrentHashMap<String, AntPathStringMatcher>(256);
 
-	private boolean trimTokens = true;
 
-
-	/** Set the path separator to use for pattern parsing. Default is "/", as in Ant. */
+	/**
+	 * Set the path separator to use for pattern parsing.
+	 * Default is "/", as in Ant.
+	 */
 	public void setPathSeparator(String pathSeparator) {
 		this.pathSeparator = (pathSeparator != null ? pathSeparator : DEFAULT_PATH_SEPARATOR);
 	}
 
-	/** Whether to trim tokenized paths and patterns. */
+	/**
+	 * Specify whether to trim tokenized paths and patterns.
+	 * Default is {@code true}.
+	 */
 	public void setTrimTokens(boolean trimTokens) {
-		this.trimTokens  = trimTokens;
+		this.trimTokens = trimTokens;
 	}
 
+
 	public boolean isPattern(String path) {
 		return (path.indexOf('*') != -1 || path.indexOf('?') != -1);
 	}
@@ -94,15 +102,13 @@ public boolean matchStart(String pattern, String path) {
 	 * as far as the given base path goes is sufficient)
 	 * @return {@code true} if the supplied {@code path} matched, {@code false} if it didn't
 	 */
-	protected boolean doMatch(String pattern, String path, boolean fullMatch,
-			Map<String, String> uriTemplateVariables) {
-
+	protected boolean doMatch(String pattern, String path, boolean fullMatch, Map<String, String> uriTemplateVariables) {
 		if (path.startsWith(this.pathSeparator) != pattern.startsWith(this.pathSeparator)) {
 			return false;
 		}
 
-		String[] pattDirs = StringUtils.tokenizeToStringArray(pattern, this.pathSeparator, this.trimTokens, true);
-		String[] pathDirs = StringUtils.tokenizeToStringArray(path, this.pathSeparator, this.trimTokens, true);
+		String[] pattDirs = tokenizePath(pattern);
+		String[] pathDirs = tokenizePath(path);
 
 		int pattIdxStart = 0;
 		int pattIdxEnd = pattDirs.length - 1;
@@ -111,11 +117,11 @@ protected boolean doMatch(String pattern, String path, boolean fullMatch,
 
 		// Match all elements up to the first **
 		while (pattIdxStart <= pattIdxEnd && pathIdxStart <= pathIdxEnd) {
-			String patDir = pattDirs[pattIdxStart];
-			if ("**".equals(patDir)) {
+			String pattDir = pattDirs[pattIdxStart];
+			if ("**".equals(pattDir)) {
 				break;
 			}
-			if (!matchStrings(patDir, pathDirs[pathIdxStart], uriTemplateVariables)) {
+			if (!matchStrings(pattDir, pathDirs[pathIdxStart], uriTemplateVariables)) {
 				return false;
 			}
 			pattIdxStart++;
@@ -152,11 +158,11 @@ else if (!fullMatch && "**".equals(pattDirs[pattIdxStart])) {
 
 		// up to last '**'
 		while (pattIdxStart <= pattIdxEnd && pathIdxStart <= pathIdxEnd) {
-			String patDir = pattDirs[pattIdxEnd];
-			if (patDir.equals("**")) {
+			String pattDir = pattDirs[pattIdxEnd];
+			if (pattDir.equals("**")) {
 				break;
 			}
-			if (!matchStrings(patDir, pathDirs[pathIdxEnd], uriTemplateVariables)) {
+			if (!matchStrings(pattDir, pathDirs[pathIdxEnd], uriTemplateVariables)) {
 				return false;
 			}
 			pattIdxEnd--;
@@ -221,6 +227,15 @@ else if (!fullMatch && "**".equals(pattDirs[pattIdxStart])) {
 		return true;
 	}
 
+	/**
+	 * Tokenize the given path String into parts, based on this matcher's settings.
+	 * @param path the path to tokenize
+	 * @return the tokenized path parts
+	 */
+	protected String[] tokenizePath(String path) {
+		return StringUtils.tokenizeToStringArray(path, this.pathSeparator, this.trimTokens, true);
+	}
+
 	/**
 	 * Tests whether or not a string matches against a pattern. The pattern may contain two special characters:
 	 * <br>'*' means zero or more characters
diff --git a/spring-core/src/main/java/org/springframework/util/Assert.java b/spring-core/src/main/java/org/springframework/util/Assert.java
index 193d461a05..55b2325d51 100644
--- a/spring-core/src/main/java/org/springframework/util/Assert.java
+++ b/spring-core/src/main/java/org/springframework/util/Assert.java
@@ -184,7 +184,7 @@ public static void hasText(String text) {
 	 */
 	public static void doesNotContain(String textToSearch, String substring, String message) {
 		if (StringUtils.hasLength(textToSearch) && StringUtils.hasLength(substring) &&
-				textToSearch.indexOf(substring) != -1) {
+				textToSearch.contains(substring)) {
 			throw new IllegalArgumentException(message);
 		}
 	}
@@ -236,8 +236,8 @@ public static void notEmpty(Object[] array) {
 	 */
 	public static void noNullElements(Object[] array, String message) {
 		if (array != null) {
-			for (int i = 0; i < array.length; i++) {
-				if (array[i] == null) {
+			for (Object element : array) {
+				if (element == null) {
 					throw new IllegalArgumentException(message);
 				}
 			}
@@ -315,7 +315,7 @@ public static void notEmpty(Map map) {
 	 * @throws IllegalArgumentException if the object is not an instance of clazz
 	 * @see Class#isInstance
 	 */
-	public static void isInstanceOf(Class clazz, Object obj) {
+	public static void isInstanceOf(Class<?> clazz, Object obj) {
 		isInstanceOf(clazz, obj, "");
 	}
 
@@ -331,7 +331,7 @@ public static void isInstanceOf(Class clazz, Object obj) {
 	 * @throws IllegalArgumentException if the object is not an instance of clazz
 	 * @see Class#isInstance
 	 */
-	public static void isInstanceOf(Class type, Object obj, String message) {
+	public static void isInstanceOf(Class<?> type, Object obj, String message) {
 		notNull(type, "Type to check against must not be null");
 		if (!type.isInstance(obj)) {
 			throw new IllegalArgumentException(
@@ -348,7 +348,7 @@ public static void isInstanceOf(Class type, Object obj, String message) {
 	 * @param subType the sub type to check
 	 * @throws IllegalArgumentException if the classes are not assignable
 	 */
-	public static void isAssignable(Class superType, Class subType) {
+	public static void isAssignable(Class<?> superType, Class<?> subType) {
 		isAssignable(superType, subType, "");
 	}
 
@@ -363,7 +363,7 @@ public static void isAssignable(Class superType, Class subType) {
 	 * ok when prepended to it.
 	 * @throws IllegalArgumentException if the classes are not assignable
 	 */
-	public static void isAssignable(Class superType, Class subType, String message) {
+	public static void isAssignable(Class<?> superType, Class<?> subType, String message) {
 		notNull(superType, "Type to check against must not be null");
 		if (subType == null || !superType.isAssignableFrom(subType)) {
 			throw new IllegalArgumentException(message + subType + " is not assignable to " + superType);
diff --git a/spring-core/src/main/java/org/springframework/util/ClassUtils.java b/spring-core/src/main/java/org/springframework/util/ClassUtils.java
index 467b0f7cb6..952023304e 100644
--- a/spring-core/src/main/java/org/springframework/util/ClassUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ClassUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,15 +17,11 @@
 package org.springframework.util;
 
 import java.beans.Introspector;
-
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
-
-import java.security.AccessControlException;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -37,10 +33,8 @@
 import java.util.Set;
 
 /**
- * Miscellaneous class utility methods. Mainly for internal use within the
- * framework; consider
- * <a href="http://commons.apache.org/lang/" target="_blank">Apache Commons Lang</a>
- * for a more comprehensive suite of class utilities.
+ * Miscellaneous class utility methods.
+ * Mainly for internal use within the framework.
  *
  * @author Juergen Hoeller
  * @author Keith Donald
@@ -61,13 +55,16 @@ public abstract class ClassUtils {
 	/** Prefix for internal non-primitive array class names: "[L" */
 	private static final String NON_PRIMITIVE_ARRAY_PREFIX = "[L";
 
-	/** The package separator character '.' */
+	/** The package separator character: '.' */
 	private static final char PACKAGE_SEPARATOR = '.';
 
-	/** The inner class separator character '$' */
+	/** The path separator character: '/' */
+	private static final char PATH_SEPARATOR = '/';
+
+	/** The inner class separator character: '$' */
 	private static final char INNER_CLASS_SEPARATOR = '$';
 
-	/** The CGLIB class separator character "$$" */
+	/** The CGLIB class separator: "$$" */
 	public static final String CGLIB_CLASS_SEPARATOR = "$$";
 
 	/** The ".class" file suffix */
@@ -147,12 +144,14 @@ private static void registerCommonClasses(Class<?>... commonClasses) {
 	 * ClassLoader, if available; the ClassLoader that loaded the ClassUtils
 	 * class will be used as fallback.
 	 * <p>Call this method if you intend to use the thread context ClassLoader
-	 * in a scenario where you absolutely need a non-null ClassLoader reference:
+	 * in a scenario where you clearly prefer a non-null ClassLoader reference:
 	 * for example, for class path resource loading (but not necessarily for
 	 * {@code Class.forName}, which accepts a {@code null} ClassLoader
 	 * reference as well).
-	 * @return the default ClassLoader (never {@code null})
+	 * @return the default ClassLoader (only {@code null} if even the system
+	 * ClassLoader isn't accessible)
 	 * @see Thread#getContextClassLoader()
+	 * @see ClassLoader#getSystemClassLoader()
 	 */
 	public static ClassLoader getDefaultClassLoader() {
 		ClassLoader cl = null;
@@ -160,11 +159,20 @@ public static ClassLoader getDefaultClassLoader() {
 			cl = Thread.currentThread().getContextClassLoader();
 		}
 		catch (Throwable ex) {
-			// Cannot access thread context ClassLoader - falling back to system class loader...
+			// Cannot access thread context ClassLoader - falling back...
 		}
 		if (cl == null) {
 			// No thread context class loader -> use class loader of this class.
 			cl = ClassUtils.class.getClassLoader();
+			if (cl == null) {
+				// getClassLoader() returning null indicates the bootstrap ClassLoader
+				try {
+					cl = ClassLoader.getSystemClassLoader();
+				}
+				catch (Throwable ex) {
+					// Cannot access system ClassLoader - oh well, maybe the caller can live with null...
+				}
+			}
 		}
 		return cl;
 	}
@@ -209,7 +217,7 @@ public static Class<?> forName(String name) throws ClassNotFoundException, Linka
 
 	/**
 	 * Replacement for {@code Class.forName()} that also returns Class instances
-	 * for primitives (e.g."int") and array class names (e.g. "String[]").
+	 * for primitives (e.g. "int") and array class names (e.g. "String[]").
 	 * Furthermore, it is also capable of resolving inner class names in Java source
 	 * style (e.g. "java.lang.Thread.State" instead of "java.lang.Thread$State").
 	 * @param name the name of the Class
@@ -252,22 +260,23 @@ public static Class<?> forName(String name, ClassLoader classLoader) throws Clas
 			return Array.newInstance(elementClass, 0).getClass();
 		}
 
-		ClassLoader classLoaderToUse = classLoader;
-		if (classLoaderToUse == null) {
-			classLoaderToUse = getDefaultClassLoader();
+		ClassLoader clToUse = classLoader;
+		if (clToUse == null) {
+			clToUse = getDefaultClassLoader();
 		}
 		try {
-			return classLoaderToUse.loadClass(name);
+			return (clToUse != null ? clToUse.loadClass(name) : Class.forName(name));
 		}
 		catch (ClassNotFoundException ex) {
-			int lastDotIndex = name.lastIndexOf('.');
+			int lastDotIndex = name.lastIndexOf(PACKAGE_SEPARATOR);
 			if (lastDotIndex != -1) {
-				String innerClassName = name.substring(0, lastDotIndex) + '$' + name.substring(lastDotIndex + 1);
+				String innerClassName =
+						name.substring(0, lastDotIndex) + INNER_CLASS_SEPARATOR + name.substring(lastDotIndex + 1);
 				try {
-					return classLoaderToUse.loadClass(innerClassName);
+					return (clToUse != null ? clToUse.loadClass(innerClassName) : Class.forName(innerClassName));
 				}
 				catch (ClassNotFoundException ex2) {
-					// swallow - let original exception get through
+					// Swallow - let original exception get through
 				}
 			}
 			throw ex;
@@ -375,9 +384,9 @@ public static Class<?> getUserClass(Object instance) {
 	 */
 	public static Class<?> getUserClass(Class<?> clazz) {
 		if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) {
-			Class<?> superClass = clazz.getSuperclass();
-			if (superClass != null && !Object.class.equals(superClass)) {
-				return superClass;
+			Class<?> superclass = clazz.getSuperclass();
+			if (superclass != null && !Object.class.equals(superclass)) {
+				return superclass;
 			}
 		}
 		return clazz;
@@ -391,21 +400,27 @@ public static Class<?> getUserClass(Class<?> clazz) {
 	 */
 	public static boolean isCacheSafe(Class<?> clazz, ClassLoader classLoader) {
 		Assert.notNull(clazz, "Class must not be null");
-		ClassLoader target = clazz.getClassLoader();
-		if (target == null) {
-			return false;
-		}
-		ClassLoader cur = classLoader;
-		if (cur == target) {
-			return true;
-		}
-		while (cur != null) {
-			cur = cur.getParent();
+		try {
+			ClassLoader target = clazz.getClassLoader();
+			if (target == null) {
+				return true;
+			}
+			ClassLoader cur = classLoader;
 			if (cur == target) {
 				return true;
 			}
+			while (cur != null) {
+				cur = cur.getParent();
+				if (cur == target) {
+					return true;
+				}
+			}
+			return false;
+		}
+		catch (SecurityException ex) {
+			// Probably from the system ClassLoader - let's consider it safe.
+			return true;
 		}
-		return false;
 	}
 
 
@@ -444,8 +459,8 @@ public static String getShortName(Class<?> clazz) {
 	 * @see java.beans.Introspector#decapitalize(String)
 	 */
 	public static String getShortNameAsProperty(Class<?> clazz) {
-		String shortName = ClassUtils.getShortName(clazz);
-		int dotIndex = shortName.lastIndexOf('.');
+		String shortName = getShortName(clazz);
+		int dotIndex = shortName.lastIndexOf(PACKAGE_SEPARATOR);
 		shortName = (dotIndex != -1 ? shortName.substring(dotIndex + 1) : shortName);
 		return Introspector.decapitalize(shortName);
 	}
@@ -514,7 +529,7 @@ private static String getQualifiedNameForArray(Class<?> clazz) {
 		StringBuilder result = new StringBuilder();
 		while (clazz.isArray()) {
 			clazz = clazz.getComponentType();
-			result.append(ClassUtils.ARRAY_SUFFIX);
+			result.append(ARRAY_SUFFIX);
 		}
 		result.insert(0, clazz.getName());
 		return result.toString();
@@ -578,7 +593,7 @@ public static boolean matchesTypeName(Class<?> clazz, String typeName) {
 	/**
 	 * Determine whether the given class has a public constructor with the given signature.
 	 * <p>Essentially translates {@code NoSuchMethodException} to "false".
-	 * @param clazz    the clazz to analyze
+	 * @param clazz the clazz to analyze
 	 * @param paramTypes the parameter types of the method
 	 * @return whether the class has a corresponding constructor
 	 * @see Class#getMethod
@@ -591,7 +606,7 @@ public static boolean hasConstructor(Class<?> clazz, Class<?>... paramTypes) {
 	 * Determine whether the given class has a public constructor with the given signature,
 	 * and return it if available (else return {@code null}).
 	 * <p>Essentially translates {@code NoSuchMethodException} to {@code null}.
-	 * @param clazz    the clazz to analyze
+	 * @param clazz the clazz to analyze
 	 * @param paramTypes the parameter types of the method
 	 * @return the constructor, or {@code null} if not found
 	 * @see Class#getConstructor
@@ -607,9 +622,9 @@ public static <T> Constructor<T> getConstructorIfAvailable(Class<T> clazz, Class
 	}
 
 	/**
-	 * Determine whether the given class has a method with the given signature.
+	 * Determine whether the given class has a public method with the given signature.
 	 * <p>Essentially translates {@code NoSuchMethodException} to "false".
-	 * @param clazz    the clazz to analyze
+	 * @param clazz the clazz to analyze
 	 * @param methodName the name of the method
 	 * @param paramTypes the parameter types of the method
 	 * @return whether the class has a corresponding method
@@ -620,12 +635,15 @@ public static boolean hasMethod(Class<?> clazz, String methodName, Class<?>... p
 	}
 
 	/**
-	 * Determine whether the given class has a method with the given signature,
+	 * Determine whether the given class has a public method with the given signature,
 	 * and return it if available (else throws an {@code IllegalStateException}).
+	 * <p>In case of any signature specified, only returns the method if there is a
+	 * unique candidate, i.e. a single public method with the specified name.
 	 * <p>Essentially translates {@code NoSuchMethodException} to {@code IllegalStateException}.
-	 * @param clazz    the clazz to analyze
+	 * @param clazz the clazz to analyze
 	 * @param methodName the name of the method
 	 * @param paramTypes the parameter types of the method
+	 * (may be {@code null} to indicate any signature)
 	 * @return the method (never {@code null})
 	 * @throws IllegalStateException if the method has not been found
 	 * @see Class#getMethod
@@ -633,31 +651,69 @@ public static boolean hasMethod(Class<?> clazz, String methodName, Class<?>... p
 	public static Method getMethod(Class<?> clazz, String methodName, Class<?>... paramTypes) {
 		Assert.notNull(clazz, "Class must not be null");
 		Assert.notNull(methodName, "Method name must not be null");
-		try {
-			return clazz.getMethod(methodName, paramTypes);
+		if (paramTypes != null) {
+			try {
+				return clazz.getMethod(methodName, paramTypes);
+			}
+			catch (NoSuchMethodException ex) {
+				throw new IllegalStateException("Expected method not found: " + ex);
+			}
 		}
-		catch (NoSuchMethodException ex) {
-			throw new IllegalStateException("Expected method not found: " + ex);
+		else {
+			Set<Method> candidates = new HashSet<Method>(1);
+			Method[] methods = clazz.getMethods();
+			for (Method method : methods) {
+				if (methodName.equals(method.getName())) {
+					candidates.add(method);
+				}
+			}
+			if (candidates.size() == 1) {
+				return candidates.iterator().next();
+			}
+			else if (candidates.isEmpty()) {
+				throw new IllegalStateException("Expected method not found: " + clazz + "." + methodName);
+			}
+			else {
+				throw new IllegalStateException("No unique method found: " + clazz + "." + methodName);
+			}
 		}
 	}
 
 	/**
-	 * Determine whether the given class has a method with the given signature,
+	 * Determine whether the given class has a public method with the given signature,
 	 * and return it if available (else return {@code null}).
+	 * <p>In case of any signature specified, only returns the method if there is a
+	 * unique candidate, i.e. a single public method with the specified name.
 	 * <p>Essentially translates {@code NoSuchMethodException} to {@code null}.
-	 * @param clazz    the clazz to analyze
+	 * @param clazz the clazz to analyze
 	 * @param methodName the name of the method
 	 * @param paramTypes the parameter types of the method
+	 * (may be {@code null} to indicate any signature)
 	 * @return the method, or {@code null} if not found
 	 * @see Class#getMethod
 	 */
 	public static Method getMethodIfAvailable(Class<?> clazz, String methodName, Class<?>... paramTypes) {
 		Assert.notNull(clazz, "Class must not be null");
 		Assert.notNull(methodName, "Method name must not be null");
-		try {
-			return clazz.getMethod(methodName, paramTypes);
+		if (paramTypes != null) {
+			try {
+				return clazz.getMethod(methodName, paramTypes);
+			}
+			catch (NoSuchMethodException ex) {
+				return null;
+			}
 		}
-		catch (NoSuchMethodException ex) {
+		else {
+			Set<Method> candidates = new HashSet<Method>(1);
+			Method[] methods = clazz.getMethods();
+			for (Method method : methods) {
+				if (methodName.equals(method.getName())) {
+					candidates.add(method);
+				}
+			}
+			if (candidates.size() == 1) {
+				return candidates.iterator().next();
+			}
 			return null;
 		}
 	}
@@ -753,7 +809,7 @@ public static Method getMostSpecificMethod(Method method, Class<?> targetClass)
 					return (specificMethod != null ? specificMethod : method);
 				}
 			}
-			catch (AccessControlException ex) {
+			catch (SecurityException ex) {
 				// Security settings are disallowing reflective access; fall back to 'method' below.
 			}
 		}
@@ -765,7 +821,7 @@ public static Method getMostSpecificMethod(Method method, Class<?> targetClass)
 	 * @param method the method to check
 	 * @param targetClass the target class to check against
 	 */
-	private static boolean isOverridable(Method method, Class targetClass) {
+	private static boolean isOverridable(Method method, Class<?> targetClass) {
 		if (Modifier.isPrivate(method.getModifiers())) {
 			return false;
 		}
@@ -777,8 +833,8 @@ private static boolean isOverridable(Method method, Class targetClass) {
 
 	/**
 	 * Return a public static method of a class.
+	 * @param clazz the class which defines the method
 	 * @param methodName the static method name
-	 * @param clazz    the class which defines the method
 	 * @param args the parameter types to the method
 	 * @return the static method, or {@code null} if no static method was found
 	 * @throws IllegalArgumentException if the method name is blank or the clazz is null
@@ -849,7 +905,7 @@ public static boolean isPrimitiveWrapperArray(Class<?> clazz) {
 	 */
 	public static Class<?> resolvePrimitiveIfNecessary(Class<?> clazz) {
 		Assert.notNull(clazz, "Class must not be null");
-		return (clazz.isPrimitive() && clazz != void.class? primitiveTypeToWrapperMap.get(clazz) : clazz);
+		return (clazz.isPrimitive() && clazz != void.class ? primitiveTypeToWrapperMap.get(clazz) : clazz);
 	}
 
 	/**
@@ -868,13 +924,13 @@ public static boolean isAssignable(Class<?> lhsType, Class<?> rhsType) {
 			return true;
 		}
 		if (lhsType.isPrimitive()) {
-			Class resolvedPrimitive = primitiveWrapperTypeMap.get(rhsType);
+			Class<?> resolvedPrimitive = primitiveWrapperTypeMap.get(rhsType);
 			if (resolvedPrimitive != null && lhsType.equals(resolvedPrimitive)) {
 				return true;
 			}
 		}
 		else {
-			Class resolvedWrapper = primitiveTypeToWrapperMap.get(rhsType);
+			Class<?> resolvedWrapper = primitiveTypeToWrapperMap.get(rhsType);
 			if (resolvedWrapper != null && lhsType.isAssignableFrom(resolvedWrapper)) {
 				return true;
 			}
@@ -903,7 +959,7 @@ public static boolean isAssignableValue(Class<?> type, Object value) {
 	 */
 	public static String convertResourcePathToClassName(String resourcePath) {
 		Assert.notNull(resourcePath, "Resource path must not be null");
-		return resourcePath.replace('/', '.');
+		return resourcePath.replace(PATH_SEPARATOR, PACKAGE_SEPARATOR);
 	}
 
 	/**
@@ -913,7 +969,7 @@ public static String convertResourcePathToClassName(String resourcePath) {
 	 */
 	public static String convertClassNameToResourcePath(String className) {
 		Assert.notNull(className, "Class name must not be null");
-		return className.replace('.', '/');
+		return className.replace(PACKAGE_SEPARATOR, PATH_SEPARATOR);
 	}
 
 	/**
@@ -926,7 +982,7 @@ public static String convertClassNameToResourcePath(String className) {
 	 * loading a resource file that is in the same package as a class file,
 	 * although {@link org.springframework.core.io.ClassPathResource} is usually
 	 * even more convenient.
-	 * @param clazz    the Class whose package will be used as the base
+	 * @param clazz the Class whose package will be used as the base
 	 * @param resourceName the resource name to append. A leading slash is optional.
 	 * @return the built-up resource path
 	 * @see ClassLoader#getResource
@@ -959,12 +1015,12 @@ public static String classPackageAsResourcePath(Class<?> clazz) {
 			return "";
 		}
 		String className = clazz.getName();
-		int packageEndIndex = className.lastIndexOf('.');
+		int packageEndIndex = className.lastIndexOf(PACKAGE_SEPARATOR);
 		if (packageEndIndex == -1) {
 			return "";
 		}
 		String packageName = className.substring(0, packageEndIndex);
-		return packageName.replace('.', '/');
+		return packageName.replace(PACKAGE_SEPARATOR, PATH_SEPARATOR);
 	}
 
 	/**
@@ -1025,7 +1081,7 @@ public static Class<?>[] toClassArray(Collection<Class<?>> collection) {
 	 * @param instance the instance to analyze for interfaces
 	 * @return all interfaces that the given instance implements as array
 	 */
-	public static Class[] getAllInterfaces(Object instance) {
+	public static Class<?>[] getAllInterfaces(Object instance) {
 		Assert.notNull(instance, "Instance must not be null");
 		return getAllInterfacesForClass(instance.getClass());
 	}
@@ -1113,10 +1169,42 @@ public static Set<Class> getAllInterfacesForClassAsSet(Class clazz, ClassLoader
 	 */
 	public static Class<?> createCompositeInterface(Class<?>[] interfaces, ClassLoader classLoader) {
 		Assert.notEmpty(interfaces, "Interfaces must not be empty");
-		Assert.notNull(classLoader, "ClassLoader must not be null");
 		return Proxy.getProxyClass(classLoader, interfaces);
 	}
 
+	/**
+	 * Determine the common ancestor of the given classes, if any.
+	 * @param clazz1 the class to introspect
+	 * @param clazz2 the other class to introspect
+	 * @return the common ancestor (i.e. common superclass, one interface
+	 * extending the other), or {@code null} if none found. If any of the
+	 * given classes is {@code null}, the other class will be returned.
+	 * @since 3.2.6
+	 */
+	public static Class<?> determineCommonAncestor(Class<?> clazz1, Class<?> clazz2) {
+		if (clazz1 == null) {
+			return clazz2;
+		}
+		if (clazz2 == null) {
+			return clazz1;
+		}
+		if (clazz1.isAssignableFrom(clazz2)) {
+			return clazz1;
+		}
+		if (clazz2.isAssignableFrom(clazz1)) {
+			return clazz2;
+		}
+		Class<?> ancestor = clazz1;
+		do {
+			ancestor = ancestor.getSuperclass();
+			if (ancestor == null || Object.class.equals(ancestor)) {
+				return null;
+			}
+		}
+		while (!ancestor.isAssignableFrom(clazz2));
+		return ancestor;
+	}
+
 	/**
 	 * Check whether the given class is visible in the given ClassLoader.
 	 * @param clazz the class to check (typically an interface)
@@ -1144,7 +1232,7 @@ public static boolean isVisible(Class<?> clazz, ClassLoader classLoader) {
 	 * @see org.springframework.aop.support.AopUtils#isCglibProxy(Object)
 	 */
 	public static boolean isCglibProxy(Object object) {
-		return ClassUtils.isCglibProxyClass(object.getClass());
+		return isCglibProxyClass(object.getClass());
 	}
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
index 5e74473fa9..dcc3a4858e 100644
--- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,8 +42,8 @@
 public abstract class CollectionUtils {
 
 	/**
-	 * Return {@code true} if the supplied Collection is {@code null}
-	 * or empty. Otherwise, return {@code false}.
+	 * Return {@code true} if the supplied Collection is {@code null} or empty.
+	 * Otherwise, return {@code false}.
 	 * @param collection the Collection to check
 	 * @return whether the given Collection is empty
 	 */
@@ -52,8 +52,8 @@ public static boolean isEmpty(Collection collection) {
 	}
 
 	/**
-	 * Return {@code true} if the supplied Map is {@code null}
-	 * or empty. Otherwise, return {@code false}.
+	 * Return {@code true} if the supplied Map is {@code null} or empty.
+	 * Otherwise, return {@code false}.
 	 * @param map the Map to check
 	 * @return whether the given Map is empty
 	 */
@@ -62,13 +62,16 @@ public static boolean isEmpty(Map map) {
 	}
 
 	/**
-	 * Convert the supplied array into a List. A primitive array gets
-	 * converted into a List of the appropriate wrapper type.
-	 * <p>A {@code null} source value will be converted to an
-	 * empty List.
+	 * Convert the supplied array into a List. A primitive array gets converted
+	 * into a List of the appropriate wrapper type.
+	 * <p><b>NOTE:</b> Generally prefer the standard {@link Arrays#asList} method.
+	 * This {@code arrayToList} method is just meant to deal with an incoming Object
+	 * value that might be an {@code Object[]} or a primitive array at runtime.
+	 * <p>A {@code null} source value will be converted to an empty List.
 	 * @param source the (potentially primitive) array
 	 * @return the converted List result
 	 * @see ObjectUtils#toObjectArray(Object)
+	 * @see Arrays#asList(Object[])
 	 */
 	public static List arrayToList(Object source) {
 		return Arrays.asList(ObjectUtils.toObjectArray(source));
@@ -312,7 +315,7 @@ else if (candidate != val.getClass()) {
 	 * Enumeration elements must be assignable to the type of the given array. The array
 	 * returned will be a different instance than the array given.
 	 */
-	public static <A,E extends A> A[] toArray(Enumeration<E> enumeration, A[] array) {
+	public static <A, E extends A> A[] toArray(Enumeration<E> enumeration, A[] array) {
 		ArrayList<A> elements = new ArrayList<A>();
 		while (enumeration.hasMoreElements()) {
 			elements.add(enumeration.nextElement());
@@ -330,10 +333,10 @@ public static <E> Iterator<E> toIterator(Enumeration<E> enumeration) {
 	}
 
 	/**
-	 * Adapts a {@code Map<K, List<V>>} to an {@code MultiValueMap<K,V>}.
-	 *
-	 * @param map the map
+	 * Adapt a {@code Map<K, List<V>>} to an {@code MultiValueMap<K, V>}.
+	 * @param map the original map
 	 * @return the multi-value map
+	 * @since 3.1
 	 */
 	public static <K, V> MultiValueMap<K, V> toMultiValueMap(Map<K, List<V>> map) {
 		return new MultiValueMapAdapter<K, V>(map);
@@ -341,12 +344,12 @@ public static <K, V> MultiValueMap<K, V> toMultiValueMap(Map<K, List<V>> map) {
 	}
 
 	/**
-	 * Returns an unmodifiable view of the specified multi-value map.
-	 *
+	 * Return an unmodifiable view of the specified multi-value map.
 	 * @param  map the map for which an unmodifiable view is to be returned.
 	 * @return an unmodifiable view of the specified multi-value map.
+	 * @since 3.1
 	 */
-	public static <K,V> MultiValueMap<K,V> unmodifiableMultiValueMap(MultiValueMap<? extends K, ? extends V> map) {
+	public static <K, V> MultiValueMap<K, V> unmodifiableMultiValueMap(MultiValueMap<? extends K, ? extends V> map) {
 		Assert.notNull(map, "'map' must not be null");
 		Map<K, List<V>> result = new LinkedHashMap<K, List<V>>(map.size());
 		for (Map.Entry<? extends K, ? extends List<? extends V>> entry : map.entrySet()) {
@@ -358,13 +361,12 @@ public static <K,V> MultiValueMap<K,V> unmodifiableMultiValueMap(MultiValueMap<?
 	}
 
 
-
 	/**
 	 * Iterator wrapping an Enumeration.
 	 */
 	private static class EnumerationIterator<E> implements Iterator<E> {
 
-		private Enumeration<E> enumeration;
+		private final Enumeration<E> enumeration;
 
 		public EnumerationIterator(Enumeration<E> enumeration) {
 			this.enumeration = enumeration;
@@ -458,8 +460,8 @@ public List<V> remove(Object key) {
 			return this.map.remove(key);
 		}
 
-		public void putAll(Map<? extends K, ? extends List<V>> m) {
-			this.map.putAll(m);
+		public void putAll(Map<? extends K, ? extends List<V>> map) {
+			this.map.putAll(map);
 		}
 
 		public void clear() {
diff --git a/spring-core/src/main/java/org/springframework/util/CompositeIterator.java b/spring-core/src/main/java/org/springframework/util/CompositeIterator.java
index 97142514c7..60b1571c9d 100644
--- a/spring-core/src/main/java/org/springframework/util/CompositeIterator.java
+++ b/spring-core/src/main/java/org/springframework/util/CompositeIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2009 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,45 +13,47 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.util;
 
 import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.LinkedHashSet;
 import java.util.NoSuchElementException;
+import java.util.Set;
 
 /**
- * Iterator that combines multiple other iterators.
- * This implementation maintains a list of iterators which are invoked in sequence until all iterators are exhausted.
+ * Composite iterator that combines multiple other iterators,
+ * as registered via {@link #add(Iterator)}.
+ *
+ * <p>This implementation maintains a linked set of iterators
+ * which are invoked in sequence until all iterators are exhausted.
+ *
  * @author Erwin Vervaet
+ * @author Juergen Hoeller
+ * @since 3.0
  */
 public class CompositeIterator<E> implements Iterator<E> {
 
-	private List<Iterator<E>> iterators = new LinkedList<Iterator<E>>();
+	private final Set<Iterator<E>> iterators = new LinkedHashSet<Iterator<E>>();
 
 	private boolean inUse = false;
 
-	/**
-	 * Create a new composite iterator. Add iterators using the {@link #add(Iterator)} method.
-	 */
-	public CompositeIterator() {
-	}
 
 	/**
 	 * Add given iterator to this composite.
 	 */
 	public void add(Iterator<E> iterator) {
-		Assert.state(!inUse, "You can no longer add iterator to a composite iterator that's already in use");
-		if (iterators.contains(iterator)) {
+		Assert.state(!this.inUse, "You can no longer add iterators to a composite iterator that's already in use");
+		if (this.iterators.contains(iterator)) {
 			throw new IllegalArgumentException("You cannot add the same iterator twice");
 		}
-		iterators.add(iterator);
+		this.iterators.add(iterator);
 	}
 
 	public boolean hasNext() {
-		inUse = true;
-		for (Iterator<Iterator<E>> it = iterators.iterator(); it.hasNext();) {
-			if (it.next().hasNext()) {
+		this.inUse = true;
+		for (Iterator<E> iterator : this.iterators) {
+			if (iterator.hasNext()) {
 				return true;
 			}
 		}
@@ -59,17 +61,17 @@ public boolean hasNext() {
 	}
 
 	public E next() {
-		inUse = true;
-		for (Iterator<Iterator<E>> it = iterators.iterator(); it.hasNext();) {
-			Iterator<E> iterator = it.next();
+		this.inUse = true;
+		for (Iterator<E> iterator : this.iterators) {
 			if (iterator.hasNext()) {
 				return iterator.next();
 			}
 		}
-		throw new NoSuchElementException("Exhaused all iterators");
+		throw new NoSuchElementException("All iterators exhausted");
 	}
 
 	public void remove() {
-		throw new UnsupportedOperationException("Remove is not supported");
+		throw new UnsupportedOperationException("CompositeIterator does not support remove()");
 	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java b/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
index 3da70f602b..c73246108e 100644
--- a/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
+++ b/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@
  * references at any time, so it may appear that an unknown thread is silently removing
  * entries.
  *
- * <p>If not explicitly specified this implementation will use
+ * <p>If not explicitly specified, this implementation will use
  * {@linkplain SoftReference soft entry references}.
  *
  * @param <K> The key type
@@ -56,15 +56,14 @@
  * @author Phillip Webb
  * @since 3.2
  */
-public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implements
-		ConcurrentMap<K, V> {
+public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K, V> {
 
 	private static final int DEFAULT_INITIAL_CAPACITY = 16;
 
-	private static final int DEFAULT_CONCURRENCY_LEVEL = 16;
-
 	private static final float DEFAULT_LOAD_FACTOR = 0.75f;
 
+	private static final int DEFAULT_CONCURRENCY_LEVEL = 16;
+
 	private static final ReferenceType DEFAULT_REFERENCE_TYPE = ReferenceType.SOFT;
 
 	private static final int MAXIMUM_CONCURRENCY_LEVEL = 1 << 16;
@@ -82,6 +81,9 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 	 */
 	private final float loadFactor;
 
+	/**
+	 * The reference type: SOFT or WEAK.
+	 */
 	private final ReferenceType referenceType;
 
 	/**
@@ -99,8 +101,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 	 * Create a new {@code ConcurrentReferenceHashMap} instance.
 	 */
 	public ConcurrentReferenceHashMap() {
-		this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,
-				DEFAULT_REFERENCE_TYPE);
+		this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_REFERENCE_TYPE);
 	}
 
 	/**
@@ -108,76 +109,78 @@ public ConcurrentReferenceHashMap() {
 	 * @param initialCapacity the initial capacity of the map
 	 */
 	public ConcurrentReferenceHashMap(int initialCapacity) {
-		this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,
-				DEFAULT_REFERENCE_TYPE);
+		this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_REFERENCE_TYPE);
 	}
 
 	/**
 	 * Create a new {@code ConcurrentReferenceHashMap} instance.
 	 * @param initialCapacity the initial capacity of the map
 	 * @param loadFactor the load factor. When the average number of references per table
-	 *        exceeds this value resize will be attempted
+	 * exceeds this value resize will be attempted
 	 */
 	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor) {
-		this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL,
-				DEFAULT_REFERENCE_TYPE);
+		this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_REFERENCE_TYPE);
 	}
 
 	/**
 	 * Create a new {@code ConcurrentReferenceHashMap} instance.
 	 * @param initialCapacity the initial capacity of the map
-	 * @param concurrencyLevel the expected number of threads that will concurrently write
-	 *        to the map
+	 * @param concurrencyLevel the expected number of threads that will concurrently
+	 * write to the map
 	 */
 	public ConcurrentReferenceHashMap(int initialCapacity, int concurrencyLevel) {
-		this(initialCapacity, DEFAULT_LOAD_FACTOR, concurrencyLevel,
-				DEFAULT_REFERENCE_TYPE);
+		this(initialCapacity, DEFAULT_LOAD_FACTOR, concurrencyLevel, DEFAULT_REFERENCE_TYPE);
 	}
 
 	/**
 	 * Create a new {@code ConcurrentReferenceHashMap} instance.
 	 * @param initialCapacity the initial capacity of the map
-	 * @param loadFactor the load factor. When the average number of references per table
-	 *        exceeds this value resize will be attempted
-	 * @param concurrencyLevel the expected number of threads that will concurrently write
-	 *        to the map
+	 * @param referenceType the reference type used for entries (soft or weak)
+	 */
+	public ConcurrentReferenceHashMap(int initialCapacity, ReferenceType referenceType) {
+		this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, referenceType);
+	}
+
+	/**
+	 * Create a new {@code ConcurrentReferenceHashMap} instance.
+	 * @param initialCapacity the initial capacity of the map
+	 * @param loadFactor the load factor. When the average number of references per
+	 * table exceeds this value, resize will be attempted.
+	 * @param concurrencyLevel the expected number of threads that will concurrently
+	 * write to the map
 	 */
-	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor,
-			int concurrencyLevel) {
+	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor, int concurrencyLevel) {
 		this(initialCapacity, loadFactor, concurrencyLevel, DEFAULT_REFERENCE_TYPE);
 	}
 
 	/**
 	 * Create a new {@code ConcurrentReferenceHashMap} instance.
 	 * @param initialCapacity the initial capacity of the map
-	 * @param loadFactor the load factor. When the average number of references per table
-	 *        exceeds this value resize will be attempted
-	 * @param concurrencyLevel the expected number of threads that will concurrently write
-	 *        to the map
-	 * @param referenceType the reference type used for entries
+	 * @param loadFactor the load factor. When the average number of references per
+	 * table exceeds this value, resize will be attempted.
+	 * @param concurrencyLevel the expected number of threads that will concurrently
+	 * write to the map
+	 * @param referenceType the reference type used for entries (soft or weak)
 	 */
-	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor,
-			int concurrencyLevel, ReferenceType referenceType) {
-		Assert.isTrue(concurrencyLevel > 0, "ConcurrencyLevel must be positive");
-		Assert.isTrue(initialCapacity >= 0, "InitialCapacity must not be negative");
-		Assert.isTrue(loadFactor > 0f, "LoadFactor must be positive");
+	@SuppressWarnings("unchecked")
+	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor, int concurrencyLevel,
+			ReferenceType referenceType) {
+
+		Assert.isTrue(initialCapacity >= 0, "Initial capacity must not be negative");
+		Assert.isTrue(loadFactor > 0f, "Load factor must be positive");
+		Assert.isTrue(concurrencyLevel > 0, "Concurrency level must be positive");
 		Assert.notNull(referenceType, "Reference type must not be null");
 		this.loadFactor = loadFactor;
 		this.shift = calculateShift(concurrencyLevel, MAXIMUM_CONCURRENCY_LEVEL);
 		int size = 1 << this.shift;
 		this.referenceType = referenceType;
-		int roundedUpSegmentCapactity = (int) ((initialCapacity + size - 1L) / size);
-		this.segments = createSegmentsArray(size);
+		int roundedUpSegmentCapacity = (int) ((initialCapacity + size - 1L) / size);
+		this.segments = (Segment[]) Array.newInstance(Segment.class, size);
 		for (int i = 0; i < this.segments.length; i++) {
-			this.segments[i] = new Segment(roundedUpSegmentCapactity);
+			this.segments[i] = new Segment(roundedUpSegmentCapacity);
 		}
 	}
 
-	@SuppressWarnings("unchecked")
-	private Segment[] createSegmentsArray(int size) {
-		return (Segment[]) Array.newInstance(Segment.class, size);
-	}
-
 
 	protected final float getLoadFactor() {
 		return this.loadFactor;
@@ -192,8 +195,8 @@ protected final Segment getSegment(int index) {
 	}
 
 	/**
-	 * Factory method that returns the {@link ReferenceManager}. This method will be
-	 * called once for each {@link Segment}.
+	 * Factory method that returns the {@link ReferenceManager}.
+	 * This method will be called once for each {@link Segment}.
 	 * @return a new reference manager
 	 */
 	protected ReferenceManager createReferenceManager() {
@@ -221,23 +224,23 @@ protected int getHash(Object o) {
 	@Override
 	public V get(Object key) {
 		Reference<K, V> reference = getReference(key, Restructure.WHEN_NECESSARY);
-		Entry<K, V> entry = (reference == null ? null : reference.get());
-		return (entry == null ? null : entry.getValue());
+		Entry<K, V> entry = (reference != null ? reference.get() : null);
+		return (entry != null ? entry.getValue() : null);
 	}
 
 	@Override
 	public boolean containsKey(Object key) {
 		Reference<K, V> reference = getReference(key, Restructure.WHEN_NECESSARY);
-		Entry<K, V> entry = (reference == null ? null : reference.get());
+		Entry<K, V> entry = (reference != null ? reference.get() : null);
 		return (entry != null && ObjectUtils.nullSafeEquals(entry.getKey(), key));
 	}
 
 	/**
-	 * Returns a {@link Reference} to the {@link Entry} for the specified {@code key} or
-	 * {@code null} if not found.
+	 * Return a {@link Reference} to the {@link Entry} for the specified {@code key},
+	 * or {@code null} if not found.
 	 * @param key the key (can be {@code null})
 	 * @param restructure types of restructure allowed during this call
-	 * @return the reference or {@code null}
+	 * @return the reference, or {@code null} if not found
 	 */
 	protected final Reference<K, V> getReference(Object key, Restructure restructure) {
 		int hash = getHash(key);
@@ -331,6 +334,19 @@ public void clear() {
 		}
 	}
 
+	/**
+	 * Remove any entries that have been garbage collected and are no longer referenced.
+	 * Under normal circumstances garbage collected entries are automatically purged as
+	 * items are added or removed from the Map. This method can be used to force a purge,
+	 * and is useful when the Map is read frequently but updated less often.
+	 */
+	public void purgeUnreferencedEntries() {
+		for (Segment segment : this.segments) {
+			segment.restructureIfNecessary(false);
+		}
+	}
+
+
 	@Override
 	public int size() {
 		int size = 0;
@@ -367,7 +383,7 @@ private Segment getSegmentForHash(int hash) {
 	protected static int calculateShift(int minimumValue, int maximumValue) {
 		int shift = 0;
 		int value = 1;
-		while (value < minimumValue && value < minimumValue) {
+		while (value < minimumValue && value < maximumValue) {
 			value <<= 1;
 			shift++;
 		}
@@ -380,15 +396,11 @@ protected static int calculateShift(int minimumValue, int maximumValue) {
 	 */
 	public static enum ReferenceType {
 
-		/**
-		 * Use {@link SoftReference}s.
-		 */
+		/** Use {@link SoftReference}s */
 		SOFT,
 
-		/**
-		 * Use {@link WeakReference}s.
-		 */
-		WEAK;
+		/** Use {@link WeakReference}s */
+		WEAK
 	}
 
 
@@ -421,14 +433,12 @@ protected final class Segment extends ReentrantLock {
 		 */
 		private int resizeThreshold;
 
-
 		public Segment(int initialCapacity) {
 			this.referenceManager = createReferenceManager();
 			this.initialSize = 1 << calculateShift(initialCapacity, MAXIMUM_SEGMENT_SIZE);
 			setReferences(createReferenceArray(this.initialSize));
 		}
 
-
 		public Reference<K, V> getReference(Object key, int hash, Restructure restructure) {
 			if (restructure == Restructure.WHEN_NECESSARY) {
 				restructureIfNecessary(false);
@@ -444,43 +454,40 @@ public Reference<K, V> getReference(Object key, int hash, Restructure restructur
 		}
 
 		/**
-		 * Apply an update operation to this segment.  The segment will be locked
-		 * during update.
+		 * Apply an update operation to this segment.
+		 * The segment will be locked during the update.
 		 * @param hash the hash of the key
 		 * @param key the key
 		 * @param task the update operation
 		 * @return the result of the operation
 		 */
 		public <T> T doTask(final int hash, final Object key, final Task<T> task) {
-
 			boolean resize = task.hasOption(TaskOption.RESIZE);
-
 			if (task.hasOption(TaskOption.RESTRUCTURE_BEFORE)) {
 				restructureIfNecessary(resize);
 			}
-
-			if (task.hasOption(TaskOption.SKIP_IF_EMPTY) && (this.count == 0)) {
+			if (task.hasOption(TaskOption.SKIP_IF_EMPTY) && this.count == 0) {
 				return task.execute(null, null, null);
 			}
-
 			lock();
 			try {
 				final int index = getIndex(hash, this.references);
 				final Reference<K, V> head = this.references[index];
 				Reference<K, V> reference = findInChain(head, key, hash);
-				Entry<K, V> entry = (reference == null ? null : reference.get());
+				Entry<K, V> entry = (reference != null ? reference.get() : null);
 				Entries entries = new Entries() {
 					@Override
 					public void add(V value) {
 						@SuppressWarnings("unchecked")
-						Entry<K, V> newEntry = new Entry<K, V>((K)key, value);
+						Entry<K, V> newEntry = new Entry<K, V>((K) key, value);
 						Reference<K, V> newReference = Segment.this.referenceManager.createReference(newEntry, hash, head);
 						Segment.this.references[index] = newReference;
 						Segment.this.count++;
 					}
 				};
 				return task.execute(reference, entry, entries);
-			} finally {
+			}
+			finally {
 				unlock();
 				if (task.hasOption(TaskOption.RESTRUCTURE_AFTER)) {
 					restructureIfNecessary(resize);
@@ -499,7 +506,8 @@ public void clear() {
 			try {
 				setReferences(createReferenceArray(this.initialSize));
 				this.count = 0;
-			} finally {
+			}
+			finally {
 				unlock();
 			}
 		}
@@ -510,7 +518,7 @@ public void clear() {
 		 * references that have been garbage collected.
 		 * @param allowResize if resizing is permitted
 		 */
-		private void restructureIfNecessary(boolean allowResize) {
+		protected final void restructureIfNecessary(boolean allowResize) {
 			boolean needsResize = ((this.count > 0) && (this.count >= this.resizeThreshold));
 			Reference<K, V> reference = this.referenceManager.pollForPurge();
 			if ((reference != null) || (needsResize && allowResize)) {
@@ -530,16 +538,16 @@ private void restructureIfNecessary(boolean allowResize) {
 
 					// Recalculate taking into account count inside lock and items that
 					// will be purged
-					needsResize = ((countAfterRestructure > 0) && (countAfterRestructure >= this.resizeThreshold));
+					needsResize = (countAfterRestructure > 0 && countAfterRestructure >= this.resizeThreshold);
 					boolean resizing = false;
 					int restructureSize = this.references.length;
-					if (allowResize && needsResize && (restructureSize < MAXIMUM_SEGMENT_SIZE)) {
+					if (allowResize && needsResize && restructureSize < MAXIMUM_SEGMENT_SIZE) {
 						restructureSize <<= 1;
 						resizing = true;
 					}
 
 					// Either create a new table or reuse the existing one
-					Reference<K, V>[] restructured =  (resizing ? createReferenceArray(restructureSize) : this.references);
+					Reference<K, V>[] restructured = (resizing ? createReferenceArray(restructureSize) : this.references);
 
 					// Restructure
 					for (int i = 0; i < this.references.length; i++) {
@@ -548,7 +556,7 @@ private void restructureIfNecessary(boolean allowResize) {
 							restructured[i] = null;
 						}
 						while (reference != null) {
-							if (!toPurge.contains(reference)) {
+							if (!toPurge.contains(reference) && (reference.get() != null)) {
 								int index = getIndex(reference.getHash(), restructured);
 								restructured[index] = this.referenceManager.createReference(
 										reference.get(), reference.getHash(),
@@ -562,15 +570,15 @@ private void restructureIfNecessary(boolean allowResize) {
 					if (resizing) {
 						setReferences(restructured);
 					}
-					this.count = countAfterRestructure;
-				} finally {
+					this.count = Math.max(countAfterRestructure, 0);
+				}
+				finally {
 					unlock();
 				}
 			}
 		}
 
-		private Reference<K, V> findInChain(Reference<K, V> reference, Object key,
-				int hash) {
+		private Reference<K, V> findInChain(Reference<K, V> reference, Object key, int hash) {
 			while (reference != null) {
 				if (reference.getHash() == hash) {
 					Entry<K, V> entry = reference.get();
@@ -592,7 +600,7 @@ private Reference<K, V>[] createReferenceArray(int size) {
 		}
 
 		private int getIndex(int hash, Reference<K, V>[] references) {
-			return hash & (references.length - 1);
+			return (hash & (references.length - 1));
 		}
 
 		/**
@@ -647,7 +655,7 @@ protected static interface Reference<K, V> {
 
 		/**
 		 * Release this entry and ensure that it will be returned from
-		 * {@link ReferenceManager#pollForPurge()}.
+		 * {@code ReferenceManager#pollForPurge()}.
 		 */
 		void release();
 	}
@@ -683,27 +691,26 @@ public V setValue(V value) {
 
 		@Override
 		public String toString() {
-			return this.key + "=" + this.value;
+			return (this.key + "=" + this.value);
 		}
 
 		@Override
 		@SuppressWarnings("rawtypes")
-		public final boolean equals(Object o) {
-			if (o == this) {
+		public final boolean equals(Object other) {
+			if (this == other) {
 				return true;
 			}
-			if (o != null && o instanceof Map.Entry) {
-				Map.Entry other = (Map.Entry) o;
-				return ObjectUtils.nullSafeEquals(getKey(), other.getKey())
-						&& ObjectUtils.nullSafeEquals(getValue(), other.getValue());
+			if (!(other instanceof Map.Entry)) {
+				return false;
 			}
-			return false;
+			Map.Entry otherEntry = (Map.Entry) other;
+			return (ObjectUtils.nullSafeEquals(getKey(), otherEntry.getKey()) &&
+					ObjectUtils.nullSafeEquals(getValue(), otherEntry.getValue()));
 		}
 
 		@Override
 		public final int hashCode() {
-			return ObjectUtils.nullSafeHashCode(this.key)
-					^ ObjectUtils.nullSafeHashCode(this.value);
+			return (ObjectUtils.nullSafeHashCode(this.key) ^ ObjectUtils.nullSafeHashCode(this.value));
 		}
 	}
 
@@ -749,9 +756,10 @@ protected T execute(Reference<K, V> reference, Entry<K, V> entry) {
 
 
 	/**
-	 * Various options supported by a {@link Task}.
+	 * Various options supported by a {@code Task}.
 	 */
 	private static enum TaskOption {
+
 		RESTRUCTURE_BEFORE, RESTRUCTURE_AFTER, SKIP_IF_EMPTY, RESIZE
 	}
 
@@ -783,9 +791,8 @@ public Iterator<Map.Entry<K, V>> iterator() {
 		public boolean contains(Object o) {
 			if (o != null && o instanceof Map.Entry<?, ?>) {
 				Map.Entry<?, ?> entry = (java.util.Map.Entry<?, ?>) o;
-				Reference<K, V> reference = ConcurrentReferenceHashMap.this.getReference(
-						entry.getKey(), Restructure.NEVER);
-				Entry<K, V> other = (reference == null ? null : reference.get());
+				Reference<K, V> reference = ConcurrentReferenceHashMap.this.getReference(entry.getKey(), Restructure.NEVER);
+				Entry<K, V> other = (reference != null ? reference.get() : null);
 				if (other != null) {
 					return ObjectUtils.nullSafeEquals(entry.getValue(), other.getValue());
 				}
@@ -797,8 +804,7 @@ public boolean contains(Object o) {
 		public boolean remove(Object o) {
 			if (o instanceof Map.Entry<?, ?>) {
 				Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
-				return ConcurrentReferenceHashMap.this.remove(entry.getKey(),
-						entry.getValue());
+				return ConcurrentReferenceHashMap.this.remove(entry.getKey(), entry.getValue());
 			}
 			return false;
 		}
@@ -838,7 +844,7 @@ public EntryIterator() {
 
 		public boolean hasNext() {
 			getNextIfNecessary();
-			return this.next != null;
+			return (this.next != null);
 		}
 
 		public Entry<K, V> next() {
@@ -897,6 +903,7 @@ public void remove() {
 	 * The types of restructuring that can be performed.
 	 */
 	protected static enum Restructure {
+
 		WHEN_NECESSARY, NEVER
 	}
 
@@ -916,8 +923,7 @@ protected class ReferenceManager {
 		 * @param next the next reference in the chain or {@code null}
 		 * @return a new {@link Reference}
 		 */
-		public Reference<K, V> createReference(Entry<K, V> entry, int hash,
-				Reference<K, V> next) {
+		public Reference<K, V> createReference(Entry<K, V> entry, int hash, Reference<K, V> next) {
 			if (ConcurrentReferenceHashMap.this.referenceType == ReferenceType.WEAK) {
 				return new WeakEntryReference<K, V>(entry, hash, next, this.queue);
 			}
@@ -941,15 +947,13 @@ public Reference<K, V> pollForPurge() {
 	/**
 	 * Internal {@link Reference} implementation for {@link SoftReference}s.
 	 */
-	private static final class SoftEntryReference<K, V> extends
-			SoftReference<Entry<K, V>> implements Reference<K, V> {
+	private static final class SoftEntryReference<K, V> extends SoftReference<Entry<K, V>> implements Reference<K, V> {
 
 		private final int hash;
 
 		private final Reference<K, V> nextReference;
 
-		public SoftEntryReference(Entry<K, V> entry, int hash, Reference<K, V> next,
-				ReferenceQueue<Entry<K, V>> queue) {
+		public SoftEntryReference(Entry<K, V> entry, int hash, Reference<K, V> next, ReferenceQueue<Entry<K, V>> queue) {
 			super(entry, queue);
 			this.hash = hash;
 			this.nextReference = next;
@@ -973,15 +977,13 @@ public void release() {
 	/**
 	 * Internal {@link Reference} implementation for {@link WeakReference}s.
 	 */
-	private static final class WeakEntryReference<K, V> extends
-			WeakReference<Entry<K, V>> implements Reference<K, V> {
+	private static final class WeakEntryReference<K, V> extends WeakReference<Entry<K, V>> implements Reference<K, V> {
 
 		private final int hash;
 
 		private final Reference<K, V> nextReference;
 
-		public WeakEntryReference(Entry<K, V> entry, int hash, Reference<K, V> next,
-				ReferenceQueue<Entry<K, V>> queue) {
+		public WeakEntryReference(Entry<K, V> entry, int hash, Reference<K, V> next, ReferenceQueue<Entry<K, V>> queue) {
 			super(entry, queue);
 			this.hash = hash;
 			this.nextReference = next;
@@ -1000,4 +1002,5 @@ public void release() {
 			clear();
 		}
 	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java b/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java
index 0d1a368356..969b5e3d94 100644
--- a/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java
+++ b/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 
 /**
- * Simple customizable helper class for creating threads. Provides various
- * bean properties, such as thread name prefix, thread priority, etc.
+ * Simple customizable helper class for creating new {@link Thread} instances.
+ * Provides various bean properties: thread name prefix, thread priority, etc.
  *
  * <p>Serves as base class for thread factories such as
  * {@link org.springframework.scheduling.concurrent.CustomizableThreadFactory}.
@@ -96,11 +96,11 @@ public int getThreadPriority() {
 	/**
 	 * Set whether this factory is supposed to create daemon threads,
 	 * just executing as long as the application itself is running.
-	 * <p>Default is "false": Concrete factories usually support explicit
-	 * cancelling. Hence, if the application shuts down, Runnables will
-	 * by default finish their execution.
-	 * <p>Specify "true" for eager shutdown of threads which still
-	 * actively execute a Runnable.
+	 * <p>Default is "false": Concrete factories usually support explicit cancelling.
+	 * Hence, if the application shuts down, Runnables will by default finish their
+	 * execution.
+	 * <p>Specify "true" for eager shutdown of threads which still actively execute
+	 * a {@link Runnable} at the time that the application itself shuts down.
 	 * @see java.lang.Thread#setDaemon
 	 */
 	public void setDaemon(boolean daemon) {
@@ -132,7 +132,7 @@ public void setThreadGroup(ThreadGroup threadGroup) {
 
 	/**
 	 * Return the thread group that threads should be created in
-	 * (or {@code null}) for the default group.
+	 * (or {@code null} for the default group).
 	 */
 	public ThreadGroup getThreadGroup() {
 		return this.threadGroup;
@@ -140,9 +140,9 @@ public ThreadGroup getThreadGroup() {
 
 
 	/**
-	 * Template method for the creation of a Thread.
-	 * <p>Default implementation creates a new Thread for the given
-	 * Runnable, applying an appropriate thread name.
+	 * Template method for the creation of a new {@link Thread}.
+	 * <p>The default implementation creates a new Thread for the given
+	 * {@link Runnable}, applying an appropriate thread name.
 	 * @param runnable the Runnable to execute
 	 * @see #nextThreadName()
 	 */
@@ -154,10 +154,9 @@ public Thread createThread(Runnable runnable) {
 	}
 
 	/**
-	 * Return the thread name to use for a newly created thread.
-	 * <p>Default implementation returns the specified thread name prefix
-	 * with an increasing thread count appended: for example,
-	 * "SimpleAsyncTaskExecutor-0".
+	 * Return the thread name to use for a newly created {@link Thread}.
+	 * <p>The default implementation returns the specified thread name prefix
+	 * with an increasing thread count appended: e.g. "SimpleAsyncTaskExecutor-0".
 	 * @see #getThreadNamePrefix()
 	 */
 	protected String nextThreadName() {
diff --git a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
index 62921593a1..ea3a10fc55 100644
--- a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
+++ b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
 @SuppressWarnings("serial")
 public class LinkedCaseInsensitiveMap<V> extends LinkedHashMap<String, V> {
 
-	private final Map<String, String> caseInsensitiveKeys;
+	private Map<String, String> caseInsensitiveKeys;
 
 	private final Locale locale;
 
@@ -114,21 +114,23 @@ public boolean containsKey(Object key) {
 	@Override
 	public V get(Object key) {
 		if (key instanceof String) {
-			return super.get(this.caseInsensitiveKeys.get(convertKey((String) key)));
-		}
-		else {
-			return null;
+			String caseInsensitiveKey = this.caseInsensitiveKeys.get(convertKey((String) key));
+			if (caseInsensitiveKey != null) {
+				return super.get(caseInsensitiveKey);
+			}
 		}
+		return null;
 	}
 
 	@Override
 	public V remove(Object key) {
-		if (key instanceof String ) {
-			return super.remove(this.caseInsensitiveKeys.remove(convertKey((String) key)));
-		}
-		else {
-			return null;
+		if (key instanceof String) {
+			String caseInsensitiveKey = this.caseInsensitiveKeys.remove(convertKey((String) key));
+			if (caseInsensitiveKey != null) {
+				return super.remove(caseInsensitiveKey);
+			}
 		}
+		return null;
 	}
 
 	@Override
@@ -137,6 +139,14 @@ public void clear() {
 		super.clear();
 	}
 
+	@Override
+	@SuppressWarnings("unchecked")
+	public Object clone() {
+		LinkedCaseInsensitiveMap<V> copy = (LinkedCaseInsensitiveMap<V>) super.clone();
+		copy.caseInsensitiveKeys = new HashMap<String, String>(this.caseInsensitiveKeys);
+		return copy;
+	}
+
 
 	/**
 	 * Convert the given key to a case-insensitive key.
diff --git a/spring-core/src/main/java/org/springframework/util/MethodInvoker.java b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
index 565a68c696..d2331caf09 100644
--- a/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
+++ b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,10 +28,6 @@
  * optionally specify arguments, prepare the invoker. Afterwards, you may
  * invoke the method any number of times, obtaining the invocation result.
  *
- * <p>Typically not used directly but via its subclasses
- * {@link org.springframework.beans.factory.config.MethodInvokingFactoryBean} and
- * {@link org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean}.
- *
  * @author Colin Sampaleanu
  * @author Juergen Hoeller
  * @since 19.02.2004
@@ -40,7 +36,7 @@
  */
 public class MethodInvoker {
 
-	private Class targetClass;
+	private Class<?> targetClass;
 
 	private Object targetObject;
 
@@ -61,14 +57,14 @@ public class MethodInvoker {
 	 * @see #setTargetObject
 	 * @see #setTargetMethod
 	 */
-	public void setTargetClass(Class targetClass) {
+	public void setTargetClass(Class<?> targetClass) {
 		this.targetClass = targetClass;
 	}
 
 	/**
 	 * Return the target class on which to call the target method.
 	 */
-	public Class getTargetClass() {
+	public Class<?> getTargetClass() {
 		return this.targetClass;
 	}
 
@@ -158,7 +154,7 @@ public void prepare() throws ClassNotFoundException, NoSuchMethodException {
 			this.targetMethod = methodName;
 		}
 
-		Class targetClass = getTargetClass();
+		Class<?> targetClass = getTargetClass();
 		String targetMethod = getTargetMethod();
 		if (targetClass == null) {
 			throw new IllegalArgumentException("Either 'targetClass' or 'targetObject' is required");
@@ -168,7 +164,7 @@ public void prepare() throws ClassNotFoundException, NoSuchMethodException {
 		}
 
 		Object[] arguments = getArguments();
-		Class[] argTypes = new Class[arguments.length];
+		Class<?>[] argTypes = new Class<?>[arguments.length];
 		for (int i = 0; i < arguments.length; ++i) {
 			argTypes[i] = (arguments[i] != null ? arguments[i].getClass() : Object.class);
 		}
@@ -194,7 +190,7 @@ public void prepare() throws ClassNotFoundException, NoSuchMethodException {
 	 * @return the resolved Class
 	 * @throws ClassNotFoundException if the class name was invalid
 	 */
-	protected Class resolveClassName(String className) throws ClassNotFoundException {
+	protected Class<?> resolveClassName(String className) throws ClassNotFoundException {
 		return ClassUtils.forName(className, ClassUtils.getDefaultClassLoader());
 	}
 
@@ -216,7 +212,7 @@ protected Method findMatchingMethod() {
 
 		for (Method candidate : candidates) {
 			if (candidate.getName().equals(targetMethod)) {
-				Class[] paramTypes = candidate.getParameterTypes();
+				Class<?>[] paramTypes = candidate.getParameterTypes();
 				if (paramTypes.length == argCount) {
 					int typeDiffWeight = getTypeDifferenceWeight(paramTypes, arguments);
 					if (typeDiffWeight < minTypeDiffWeight) {
@@ -287,19 +283,22 @@ public Object invoke() throws InvocationTargetException, IllegalAccessException
 	 * Therefore, with an arg of type Integer, a constructor (Integer) would be preferred to a
 	 * constructor (Number) which would in turn be preferred to a constructor (Object).
 	 * All argument weights get accumulated.
+	 * <p>Note: This is the algorithm used by MethodInvoker itself and also the algorithm
+	 * used for constructor and factory method selection in Spring's bean container (in case
+	 * of lenient constructor resolution which is the default for regular bean definitions).
 	 * @param paramTypes the parameter types to match
 	 * @param args the arguments to match
 	 * @return the accumulated weight for all arguments
 	 */
-	public static int getTypeDifferenceWeight(Class[] paramTypes, Object[] args) {
+	public static int getTypeDifferenceWeight(Class<?>[] paramTypes, Object[] args) {
 		int result = 0;
 		for (int i = 0; i < paramTypes.length; i++) {
 			if (!ClassUtils.isAssignableValue(paramTypes[i], args[i])) {
 				return Integer.MAX_VALUE;
 			}
 			if (args[i] != null) {
-				Class paramType = paramTypes[i];
-				Class superClass = args[i].getClass().getSuperclass();
+				Class<?> paramType = paramTypes[i];
+				Class<?> superClass = args[i].getClass().getSuperclass();
 				while (superClass != null) {
 					if (paramType.equals(superClass)) {
 						result = result + 2;
diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
index 09980f1e2c..a11cb3e747 100644
--- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,7 @@
 /**
  * Miscellaneous object utility methods.
  *
- * <p>Mainly for internal use within the framework; consider
- * <a href="http://jakarta.apache.org/commons/lang/">Jakarta's Commons Lang</a>
- * for a more comprehensive suite of object utilities.
+ * <p>Mainly for internal use within the framework.
  *
  * <p>Thanks to Alex Ruiz for contributing several enhancements to this class!
  *
@@ -34,7 +32,9 @@
  * @author Rob Harrop
  * @author Chris Beams
  * @since 19.03.2004
- * @see org.apache.commons.lang.ObjectUtils
+ * @see ClassUtils
+ * @see CollectionUtils
+ * @see StringUtils
  */
 public abstract class ObjectUtils {
 
@@ -63,23 +63,21 @@ public static boolean isCheckedException(Throwable ex) {
 	}
 
 	/**
-	 * Check whether the given exception is compatible with the exceptions
-	 * declared in a throws clause.
-	 * @param ex the exception to checked
-	 * @param declaredExceptions the exceptions declared in the throws clause
+	 * Check whether the given exception is compatible with the specified
+	 * exception types, as declared in a throws clause.
+	 * @param ex the exception to check
+	 * @param declaredExceptions the exception types declared in the throws clause
 	 * @return whether the given exception is compatible
 	 */
-	public static boolean isCompatibleWithThrowsClause(Throwable ex, Class[] declaredExceptions) {
+	public static boolean isCompatibleWithThrowsClause(Throwable ex, Class<?>... declaredExceptions) {
 		if (!isCheckedException(ex)) {
 			return true;
 		}
 		if (declaredExceptions != null) {
-			int i = 0;
-			while (i < declaredExceptions.length) {
-				if (declaredExceptions[i].isAssignableFrom(ex.getClass())) {
+			for (Class<?> declaredException : declaredExceptions) {
+				if (declaredException.isInstance(ex)) {
 					return true;
 				}
-				i++;
 			}
 		}
 		return false;
@@ -161,7 +159,7 @@ public static boolean containsConstant(Enum<?>[] enumValues, String constant, bo
 	 */
 	public static <E extends Enum<?>> E caseInsensitiveValueOf(E[] enumValues, String constant) {
 		for (E candidate : enumValues) {
-			if(candidate.toString().equalsIgnoreCase(constant)) {
+			if (candidate.toString().equalsIgnoreCase(constant)) {
 				return candidate;
 			}
 		}
@@ -177,7 +175,7 @@ public static <E extends Enum<?>> E caseInsensitiveValueOf(E[] enumValues, Strin
 	 * @param obj the object to append
 	 * @return the new array (of the same component type; never {@code null})
 	 */
-	public static <A,O extends A> A[] addObjectToArray(A[] array, O obj) {
+	public static <A, O extends A> A[] addObjectToArray(A[] array, O obj) {
 		Class<?> compType = Object.class;
 		if (array != null) {
 			compType = array.getClass().getComponentType();
@@ -218,7 +216,7 @@ public static Object[] toObjectArray(Object source) {
 		if (length == 0) {
 			return new Object[0];
 		}
-		Class wrapperType = Array.get(source, 0).getClass();
+		Class<?> wrapperType = Array.get(source, 0).getClass();
 		Object[] newArray = (Object[]) Array.newInstance(wrapperType, length);
 		for (int i = 0; i < length; i++) {
 			newArray[i] = Array.get(source, i);
@@ -232,14 +230,14 @@ public static Object[] toObjectArray(Object source) {
 	//---------------------------------------------------------------------
 
 	/**
-	 * Determine if the given objects are equal, returning {@code true}
-	 * if both are {@code null} or {@code false} if only one is
-	 * {@code null}.
+	 * Determine if the given objects are equal, returning {@code true} if
+	 * both are {@code null} or {@code false} if only one is {@code null}.
 	 * <p>Compares arrays with {@code Arrays.equals}, performing an equality
 	 * check based on the array elements rather than the array reference.
 	 * @param o1 first Object to compare
 	 * @param o2 second Object to compare
 	 * @return whether the given objects are equal
+	 * @see Object#equals(Object)
 	 * @see java.util.Arrays#equals
 	 */
 	public static boolean nullSafeEquals(Object o1, Object o2) {
@@ -253,43 +251,58 @@ public static boolean nullSafeEquals(Object o1, Object o2) {
 			return true;
 		}
 		if (o1.getClass().isArray() && o2.getClass().isArray()) {
-			if (o1 instanceof Object[] && o2 instanceof Object[]) {
-				return Arrays.equals((Object[]) o1, (Object[]) o2);
-			}
-			if (o1 instanceof boolean[] && o2 instanceof boolean[]) {
-				return Arrays.equals((boolean[]) o1, (boolean[]) o2);
-			}
-			if (o1 instanceof byte[] && o2 instanceof byte[]) {
-				return Arrays.equals((byte[]) o1, (byte[]) o2);
-			}
-			if (o1 instanceof char[] && o2 instanceof char[]) {
-				return Arrays.equals((char[]) o1, (char[]) o2);
-			}
-			if (o1 instanceof double[] && o2 instanceof double[]) {
-				return Arrays.equals((double[]) o1, (double[]) o2);
-			}
-			if (o1 instanceof float[] && o2 instanceof float[]) {
-				return Arrays.equals((float[]) o1, (float[]) o2);
-			}
-			if (o1 instanceof int[] && o2 instanceof int[]) {
-				return Arrays.equals((int[]) o1, (int[]) o2);
-			}
-			if (o1 instanceof long[] && o2 instanceof long[]) {
-				return Arrays.equals((long[]) o1, (long[]) o2);
-			}
-			if (o1 instanceof short[] && o2 instanceof short[]) {
-				return Arrays.equals((short[]) o1, (short[]) o2);
-			}
+			return arrayEquals(o1, o2);
+		}
+		return false;
+	}
+
+	/**
+	 * Compare the given arrays with {@code Arrays.equals}, performing an equality
+	 * check based on the array elements rather than the array reference.
+	 * @param o1 first array to compare
+	 * @param o2 second array to compare
+	 * @return whether the given objects are equal
+	 * @see #nullSafeEquals(Object, Object)
+	 * @see java.util.Arrays#equals
+	 */
+	private static boolean arrayEquals(Object o1, Object o2) {
+		if (o1 instanceof Object[] && o2 instanceof Object[]) {
+			return Arrays.equals((Object[]) o1, (Object[]) o2);
+		}
+		if (o1 instanceof boolean[] && o2 instanceof boolean[]) {
+			return Arrays.equals((boolean[]) o1, (boolean[]) o2);
+		}
+		if (o1 instanceof byte[] && o2 instanceof byte[]) {
+			return Arrays.equals((byte[]) o1, (byte[]) o2);
+		}
+		if (o1 instanceof char[] && o2 instanceof char[]) {
+			return Arrays.equals((char[]) o1, (char[]) o2);
+		}
+		if (o1 instanceof double[] && o2 instanceof double[]) {
+			return Arrays.equals((double[]) o1, (double[]) o2);
+		}
+		if (o1 instanceof float[] && o2 instanceof float[]) {
+			return Arrays.equals((float[]) o1, (float[]) o2);
+		}
+		if (o1 instanceof int[] && o2 instanceof int[]) {
+			return Arrays.equals((int[]) o1, (int[]) o2);
+		}
+		if (o1 instanceof long[] && o2 instanceof long[]) {
+			return Arrays.equals((long[]) o1, (long[]) o2);
+		}
+		if (o1 instanceof short[] && o2 instanceof short[]) {
+			return Arrays.equals((short[]) o1, (short[]) o2);
 		}
 		return false;
 	}
 
 	/**
 	 * Return as hash code for the given object; typically the value of
-	 * {@code {@link Object#hashCode()}}. If the object is an array,
+	 * {@code Object#hashCode()}}. If the object is an array,
 	 * this method will delegate to any of the {@code nullSafeHashCode}
 	 * methods for arrays in this class. If the object is {@code null},
 	 * this method returns 0.
+	 * @see Object#hashCode()
 	 * @see #nullSafeHashCode(Object[])
 	 * @see #nullSafeHashCode(boolean[])
 	 * @see #nullSafeHashCode(byte[])
@@ -345,9 +358,8 @@ public static int nullSafeHashCode(Object[] array) {
 			return 0;
 		}
 		int hash = INITIAL_HASH;
-		int arraySize = array.length;
-		for (int i = 0; i < arraySize; i++) {
-			hash = MULTIPLIER * hash + nullSafeHashCode(array[i]);
+		for (Object element : array) {
+			hash = MULTIPLIER * hash + nullSafeHashCode(element);
 		}
 		return hash;
 	}
@@ -361,9 +373,8 @@ public static int nullSafeHashCode(boolean[] array) {
 			return 0;
 		}
 		int hash = INITIAL_HASH;
-		int arraySize = array.length;
-		for (int i = 0; i < arraySize; i++) {
-			hash = MULTIPLIER * hash + hashCode(array[i]);
+		for (boolean element : array) {
+			hash = MULTIPLIER * hash + hashCode(element);
 		}
 		return hash;
 	}
@@ -377,9 +388,8 @@ public static int nullSafeHashCode(byte[] array) {
 			return 0;
 		}
 		int hash = INITIAL_HASH;
-		int arraySize = array.length;
-		for (int i = 0; i < arraySize; i++) {
-			hash = MULTIPLIER * hash + array[i];
+		for (byte element : array) {
+			hash = MULTIPLIER * hash + element;
 		}
 		return hash;
 	}
@@ -393,9 +403,8 @@ public static int nullSafeHashCode(char[] array) {
 			return 0;
 		}
 		int hash = INITIAL_HASH;
-		int arraySize = array.length;
-		for (int i = 0; i < arraySize; i++) {
-			hash = MULTIPLIER * hash + array[i];
+		for (char element : array) {
+			hash = MULTIPLIER * hash + element;
 		}
 		return hash;
 	}
@@ -409,9 +418,8 @@ public static int nullSafeHashCode(double[] array) {
 			return 0;
 		}
 		int hash = INITIAL_HASH;
-		int arraySize = array.length;
-		for (int i = 0; i < arraySize; i++) {
-			hash = MULTIPLIER * hash + hashCode(array[i]);
+		for (double element : array) {
+			hash = MULTIPLIER * hash + hashCode(element);
 		}
 		return hash;
 	}
@@ -425,9 +433,8 @@ public static int nullSafeHashCode(float[] array) {
 			return 0;
 		}
 		int hash = INITIAL_HASH;
-		int arraySize = array.length;
-		for (int i = 0; i < arraySize; i++) {
-			hash = MULTIPLIER * hash + hashCode(array[i]);
+		for (float element : array) {
+			hash = MULTIPLIER * hash + hashCode(element);
 		}
 		return hash;
 	}
@@ -441,9 +448,8 @@ public static int nullSafeHashCode(int[] array) {
 			return 0;
 		}
 		int hash = INITIAL_HASH;
-		int arraySize = array.length;
-		for (int i = 0; i < arraySize; i++) {
-			hash = MULTIPLIER * hash + array[i];
+		for (int element : array) {
+			hash = MULTIPLIER * hash + element;
 		}
 		return hash;
 	}
@@ -457,9 +463,8 @@ public static int nullSafeHashCode(long[] array) {
 			return 0;
 		}
 		int hash = INITIAL_HASH;
-		int arraySize = array.length;
-		for (int i = 0; i < arraySize; i++) {
-			hash = MULTIPLIER * hash + hashCode(array[i]);
+		for (long element : array) {
+			hash = MULTIPLIER * hash + hashCode(element);
 		}
 		return hash;
 	}
@@ -473,9 +478,8 @@ public static int nullSafeHashCode(short[] array) {
 			return 0;
 		}
 		int hash = INITIAL_HASH;
-		int arraySize = array.length;
-		for (int i = 0; i < arraySize; i++) {
-			hash = MULTIPLIER * hash + array[i];
+		for (short element : array) {
+			hash = MULTIPLIER * hash + element;
 		}
 		return hash;
 	}
@@ -485,7 +489,7 @@ public static int nullSafeHashCode(short[] array) {
 	 * @see Boolean#hashCode()
 	 */
 	public static int hashCode(boolean bool) {
-		return bool ? 1231 : 1237;
+		return (bool ? 1231 : 1237);
 	}
 
 	/**
@@ -493,8 +497,7 @@ public static int hashCode(boolean bool) {
 	 * @see Double#hashCode()
 	 */
 	public static int hashCode(double dbl) {
-		long bits = Double.doubleToLongBits(dbl);
-		return hashCode(bits);
+		return hashCode(Double.doubleToLongBits(dbl));
 	}
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/util/PatternMatchUtils.java b/spring-core/src/main/java/org/springframework/util/PatternMatchUtils.java
index 0b7c80a47e..f130352db7 100644
--- a/spring-core/src/main/java/org/springframework/util/PatternMatchUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/PatternMatchUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,6 +50,9 @@ public static boolean simpleMatch(String pattern, String str) {
 				return str.endsWith(pattern.substring(1));
 			}
 			String part = pattern.substring(1, nextIndex);
+			if ("".equals(part)) {
+				return simpleMatch(pattern.substring(nextIndex), str);
+			}
 			int partIndex = str.indexOf(part);
 			while (partIndex != -1) {
 				if (simpleMatch(pattern.substring(nextIndex), str.substring(partIndex + part.length()))) {
@@ -74,8 +77,8 @@ public static boolean simpleMatch(String pattern, String str) {
 	 */
 	public static boolean simpleMatch(String[] patterns, String str) {
 		if (patterns != null) {
-			for (int i = 0; i < patterns.length; i++) {
-				if (simpleMatch(patterns[i], str)) {
+			for (String pattern : patterns) {
+				if (simpleMatch(pattern, str)) {
 					return true;
 				}
 			}
diff --git a/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java b/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
index 5728b28604..1ce878f852 100644
--- a/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
+++ b/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,8 +62,8 @@ public class PropertyPlaceholderHelper {
 	/**
 	 * Creates a new {@code PropertyPlaceholderHelper} that uses the supplied prefix and suffix.
 	 * Unresolvable placeholders are ignored.
-	 * @param placeholderPrefix the prefix that denotes the start of a placeholder.
-	 * @param placeholderSuffix the suffix that denotes the end of a placeholder.
+	 * @param placeholderPrefix the prefix that denotes the start of a placeholder
+	 * @param placeholderSuffix the suffix that denotes the end of a placeholder
 	 */
 	public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix) {
 		this(placeholderPrefix, placeholderSuffix, null, true);
@@ -75,14 +75,14 @@ public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuf
 	 * @param placeholderSuffix the suffix that denotes the end of a placeholder
 	 * @param valueSeparator the separating character between the placeholder variable
 	 * and the associated default value, if any
-	 * @param ignoreUnresolvablePlaceholders indicates whether unresolvable placeholders should be ignored
-	 * ({@code true}) or cause an exception ({@code false}).
+	 * @param ignoreUnresolvablePlaceholders indicates whether unresolvable placeholders should
+	 * be ignored ({@code true}) or cause an exception ({@code false})
 	 */
 	public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix,
 			String valueSeparator, boolean ignoreUnresolvablePlaceholders) {
 
-		Assert.notNull(placeholderPrefix, "placeholderPrefix must not be null");
-		Assert.notNull(placeholderSuffix, "placeholderSuffix must not be null");
+		Assert.notNull(placeholderPrefix, "'placeholderPrefix' must not be null");
+		Assert.notNull(placeholderSuffix, "'placeholderSuffix' must not be null");
 		this.placeholderPrefix = placeholderPrefix;
 		this.placeholderSuffix = placeholderSuffix;
 		String simplePrefixForSuffix = wellKnownSimplePrefixes.get(this.placeholderSuffix);
@@ -98,14 +98,14 @@ public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuf
 
 
 	/**
-	 * Replaces all placeholders of format {@code ${name}} with the corresponding property
-	 * from the supplied {@link Properties}.
-	 * @param value the value containing the placeholders to be replaced.
-	 * @param properties the {@code Properties} to use for replacement.
-	 * @return the supplied value with placeholders replaced inline.
+	 * Replaces all placeholders of format {@code ${name}} with the corresponding
+	 * property from the supplied {@link Properties}.
+	 * @param value the value containing the placeholders to be replaced
+	 * @param properties the {@code Properties} to use for replacement
+	 * @return the supplied value with placeholders replaced inline
 	 */
 	public String replacePlaceholders(String value, final Properties properties) {
-		Assert.notNull(properties, "Argument 'properties' must not be null.");
+		Assert.notNull(properties, "'properties' must not be null");
 		return replacePlaceholders(value, new PlaceholderResolver() {
 			public String resolvePlaceholder(String placeholderName) {
 				return properties.getProperty(placeholderName);
@@ -114,27 +114,27 @@ public String resolvePlaceholder(String placeholderName) {
 	}
 
 	/**
-	 * Replaces all placeholders of format {@code ${name}} with the value returned from the supplied
-	 * {@link PlaceholderResolver}.
-	 * @param value the value containing the placeholders to be replaced.
-	 * @param placeholderResolver the {@code PlaceholderResolver} to use for replacement.
-	 * @return the supplied value with placeholders replaced inline.
+	 * Replaces all placeholders of format {@code ${name}} with the value returned
+	 * from the supplied {@link PlaceholderResolver}.
+	 * @param value the value containing the placeholders to be replaced
+	 * @param placeholderResolver the {@code PlaceholderResolver} to use for replacement
+	 * @return the supplied value with placeholders replaced inline
 	 */
 	public String replacePlaceholders(String value, PlaceholderResolver placeholderResolver) {
-		Assert.notNull(value, "Argument 'value' must not be null.");
+		Assert.notNull(value, "'value' must not be null");
 		return parseStringValue(value, placeholderResolver, new HashSet<String>());
 	}
 
 	protected String parseStringValue(
 			String strVal, PlaceholderResolver placeholderResolver, Set<String> visitedPlaceholders) {
 
-		StringBuilder buf = new StringBuilder(strVal);
+		StringBuilder result = new StringBuilder(strVal);
 
 		int startIndex = strVal.indexOf(this.placeholderPrefix);
 		while (startIndex != -1) {
-			int endIndex = findPlaceholderEndIndex(buf, startIndex);
+			int endIndex = findPlaceholderEndIndex(result, startIndex);
 			if (endIndex != -1) {
-				String placeholder = buf.substring(startIndex + this.placeholderPrefix.length(), endIndex);
+				String placeholder = result.substring(startIndex + this.placeholderPrefix.length(), endIndex);
 				String originalPlaceholder = placeholder;
 				if (!visitedPlaceholders.add(originalPlaceholder)) {
 					throw new IllegalArgumentException(
@@ -159,15 +159,15 @@ protected String parseStringValue(
 					// Recursive invocation, parsing placeholders contained in the
 					// previously resolved placeholder value.
 					propVal = parseStringValue(propVal, placeholderResolver, visitedPlaceholders);
-					buf.replace(startIndex, endIndex + this.placeholderSuffix.length(), propVal);
+					result.replace(startIndex, endIndex + this.placeholderSuffix.length(), propVal);
 					if (logger.isTraceEnabled()) {
 						logger.trace("Resolved placeholder '" + placeholder + "'");
 					}
-					startIndex = buf.indexOf(this.placeholderPrefix, startIndex + propVal.length());
+					startIndex = result.indexOf(this.placeholderPrefix, startIndex + propVal.length());
 				}
 				else if (this.ignoreUnresolvablePlaceholders) {
 					// Proceed with unprocessed value.
-					startIndex = buf.indexOf(this.placeholderPrefix, endIndex + this.placeholderSuffix.length());
+					startIndex = result.indexOf(this.placeholderPrefix, endIndex + this.placeholderSuffix.length());
 				}
 				else {
 					throw new IllegalArgumentException("Could not resolve placeholder '" +
@@ -180,7 +180,7 @@ else if (this.ignoreUnresolvablePlaceholders) {
 			}
 		}
 
-		return buf.toString();
+		return result.toString();
 	}
 
 	private int findPlaceholderEndIndex(CharSequence buf, int startIndex) {
@@ -210,14 +210,13 @@ else if (StringUtils.substringMatch(buf, index, this.simplePrefix)) {
 
 	/**
 	 * Strategy interface used to resolve replacement values for placeholders contained in Strings.
-	 * @see PropertyPlaceholderHelper
 	 */
 	public static interface PlaceholderResolver {
 
 		/**
-		 * Resolves the supplied placeholder name into the replacement value.
-		 * @param placeholderName the name of the placeholder to resolve.
-		 * @return the replacement value or {@code null} if no replacement is to be made.
+		 * Resolve the supplied placeholder name to the replacement value.
+		 * @param placeholderName the name of the placeholder to resolve
+		 * @return the replacement value, or {@code null} if no replacement is to be made
 		 */
 		String resolvePlaceholder(String placeholderName);
 	}
diff --git a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
index 87ba421141..f1757f8390 100644
--- a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
@@ -44,7 +45,24 @@
  */
 public abstract class ReflectionUtils {
 
-	private static final Pattern CGLIB_RENAMED_METHOD_PATTERN = Pattern.compile("CGLIB\\$(.+)\\$\\d+");
+	/**
+	 * Naming prefix for CGLIB-renamed methods.
+	 * @see #isCglibRenamedMethod
+	 */
+	private static final String CGLIB_RENAMED_METHOD_PREFIX = "CGLIB$";
+
+	/**
+	 * Pattern for detecting CGLIB-renamed methods.
+	 * @see #isCglibRenamedMethod
+	 */
+	private static final Pattern CGLIB_RENAMED_METHOD_PATTERN = Pattern.compile("(.+)\\$\\d+");
+
+	/**
+	 * Cache for {@link Class#getDeclaredMethods()}, allowing for fast resolution.
+	 */
+	private static final Map<Class<?>, Method[]> declaredMethodsCache =
+			new ConcurrentReferenceHashMap<Class<?>, Method[]>(256);
+
 
 	/**
 	 * Attempt to find a {@link Field field} on the supplied {@link Class} with the
@@ -73,7 +91,8 @@ public static Field findField(Class<?> clazz, String name, Class<?> type) {
 		while (!Object.class.equals(searchType) && searchType != null) {
 			Field[] fields = searchType.getDeclaredFields();
 			for (Field field : fields) {
-				if ((name == null || name.equals(field.getName())) && (type == null || type.equals(field.getType()))) {
+				if ((name == null || name.equals(field.getName())) &&
+						(type == null || type.equals(field.getType()))) {
 					return field;
 				}
 			}
@@ -98,8 +117,8 @@ public static void setField(Field field, Object target, Object value) {
 		}
 		catch (IllegalAccessException ex) {
 			handleReflectionException(ex);
-			throw new IllegalStateException("Unexpected reflection exception - " + ex.getClass().getName() + ": "
-					+ ex.getMessage());
+			throw new IllegalStateException(
+					"Unexpected reflection exception - " + ex.getClass().getName() + ": " + ex.getMessage());
 		}
 	}
 
@@ -133,7 +152,7 @@ public static Object getField(Field field, Object target) {
 	 * @return the Method object, or {@code null} if none found
 	 */
 	public static Method findMethod(Class<?> clazz, String name) {
-		return findMethod(clazz, name, new Class[0]);
+		return findMethod(clazz, name, new Class<?>[0]);
 	}
 
 	/**
@@ -151,10 +170,10 @@ public static Method findMethod(Class<?> clazz, String name, Class<?>... paramTy
 		Assert.notNull(name, "Method name must not be null");
 		Class<?> searchType = clazz;
 		while (searchType != null) {
-			Method[] methods = (searchType.isInterface() ? searchType.getMethods() : searchType.getDeclaredMethods());
+			Method[] methods = (searchType.isInterface() ? searchType.getMethods() : getDeclaredMethods(searchType));
 			for (Method method : methods) {
-				if (name.equals(method.getName())
-						&& (paramTypes == null || Arrays.equals(paramTypes, method.getParameterTypes()))) {
+				if (name.equals(method.getName()) &&
+						(paramTypes == null || Arrays.equals(paramTypes, method.getParameterTypes()))) {
 					return method;
 				}
 			}
@@ -373,24 +392,28 @@ public static boolean isToStringMethod(Method method) {
 	 * Determine whether the given method is originally declared by {@link java.lang.Object}.
 	 */
 	public static boolean isObjectMethod(Method method) {
+		if (method == null) {
+			return false;
+		}
 		try {
 			Object.class.getDeclaredMethod(method.getName(), method.getParameterTypes());
 			return true;
-		} catch (SecurityException ex) {
-			return false;
-		} catch (NoSuchMethodException ex) {
+		}
+		catch (Exception ex) {
 			return false;
 		}
 	}
 
 	/**
-	 * Determine whether the given method is a CGLIB 'renamed' method, following
-	 * the pattern "CGLIB$methodName$0".
+	 * Determine whether the given method is a CGLIB 'renamed' method,
+	 * following the pattern "CGLIB$methodName$0".
 	 * @param renamedMethod the method to check
 	 * @see org.springframework.cglib.proxy.Enhancer#rename
 	 */
 	public static boolean isCglibRenamedMethod(Method renamedMethod) {
-		return CGLIB_RENAMED_METHOD_PATTERN.matcher(renamedMethod.getName()).matches();
+		String name = renamedMethod.getName();
+		return (name.startsWith(CGLIB_RENAMED_METHOD_PREFIX) &&
+				CGLIB_RENAMED_METHOD_PATTERN.matcher(name.substring(CGLIB_RENAMED_METHOD_PREFIX.length())).matches());
 	}
 
 	/**
@@ -402,7 +425,8 @@ public static boolean isCglibRenamedMethod(Method renamedMethod) {
 	 * @see java.lang.reflect.Field#setAccessible
 	 */
 	public static void makeAccessible(Field field) {
-		if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) ||
+		if ((!Modifier.isPublic(field.getModifiers()) ||
+				!Modifier.isPublic(field.getDeclaringClass().getModifiers()) ||
 				Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) {
 			field.setAccessible(true);
 		}
@@ -417,8 +441,8 @@ public static void makeAccessible(Field field) {
 	 * @see java.lang.reflect.Method#setAccessible
 	 */
 	public static void makeAccessible(Method method) {
-		if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
-				&& !method.isAccessible()) {
+		if ((!Modifier.isPublic(method.getModifiers()) ||
+				!Modifier.isPublic(method.getDeclaringClass().getModifiers())) && !method.isAccessible()) {
 			method.setAccessible(true);
 		}
 	}
@@ -432,8 +456,8 @@ public static void makeAccessible(Method method) {
 	 * @see java.lang.reflect.Constructor#setAccessible
 	 */
 	public static void makeAccessible(Constructor<?> ctor) {
-		if ((!Modifier.isPublic(ctor.getModifiers()) || !Modifier.isPublic(ctor.getDeclaringClass().getModifiers()))
-				&& !ctor.isAccessible()) {
+		if ((!Modifier.isPublic(ctor.getModifiers()) ||
+				!Modifier.isPublic(ctor.getDeclaringClass().getModifiers())) && !ctor.isAccessible()) {
 			ctor.setAccessible(true);
 		}
 	}
@@ -443,11 +467,11 @@ public static void makeAccessible(Constructor<?> ctor) {
 	 * class and superclasses.
 	 * <p>The same named method occurring on subclass and superclass will appear
 	 * twice, unless excluded by a {@link MethodFilter}.
-	 * @param clazz class to start looking at
+	 * @param clazz the class to introspect
 	 * @param mc the callback to invoke for each method
 	 * @see #doWithMethods(Class, MethodCallback, MethodFilter)
 	 */
-	public static void doWithMethods(Class<?> clazz, MethodCallback mc) throws IllegalArgumentException {
+	public static void doWithMethods(Class<?> clazz, MethodCallback mc) {
 		doWithMethods(clazz, mc, null);
 	}
 
@@ -456,15 +480,13 @@ public static void doWithMethods(Class<?> clazz, MethodCallback mc) throws Illeg
 	 * class and superclasses (or given interface and super-interfaces).
 	 * <p>The same named method occurring on subclass and superclass will appear
 	 * twice, unless excluded by the specified {@link MethodFilter}.
-	 * @param clazz class to start looking at
+	 * @param clazz the class to introspect
 	 * @param mc the callback to invoke for each method
 	 * @param mf the filter that determines the methods to apply the callback to
 	 */
-	public static void doWithMethods(Class<?> clazz, MethodCallback mc, MethodFilter mf)
-			throws IllegalArgumentException {
-
+	public static void doWithMethods(Class<?> clazz, MethodCallback mc, MethodFilter mf) {
 		// Keep backing up the inheritance hierarchy.
-		Method[] methods = clazz.getDeclaredMethods();
+		Method[] methods = getDeclaredMethods(clazz);
 		for (Method method : methods) {
 			if (mf != null && !mf.matches(method)) {
 				continue;
@@ -473,8 +495,7 @@ public static void doWithMethods(Class<?> clazz, MethodCallback mc, MethodFilter
 				mc.doWith(method);
 			}
 			catch (IllegalAccessException ex) {
-				throw new IllegalStateException("Shouldn't be illegal to access method '" + method.getName()
-						+ "': " + ex);
+				throw new IllegalStateException("Not allowed to access method '" + method.getName() + "': " + ex);
 			}
 		}
 		if (clazz.getSuperclass() != null) {
@@ -488,10 +509,11 @@ else if (clazz.isInterface()) {
 	}
 
 	/**
-	 * Get all declared methods on the leaf class and all superclasses. Leaf
-	 * class methods are included first.
+	 * Get all declared methods on the leaf class and all superclasses.
+	 * Leaf class methods are included first.
+	 * @param leafClass the class to introspect
 	 */
-	public static Method[] getAllDeclaredMethods(Class<?> leafClass) throws IllegalArgumentException {
+	public static Method[] getAllDeclaredMethods(Class<?> leafClass) {
 		final List<Method> methods = new ArrayList<Method>(32);
 		doWithMethods(leafClass, new MethodCallback() {
 			public void doWith(Method method) {
@@ -502,25 +524,26 @@ public void doWith(Method method) {
 	}
 
 	/**
-	 * Get the unique set of declared methods on the leaf class and all superclasses. Leaf
-	 * class methods are included first and while traversing the superclass hierarchy any methods found
-	 * with signatures matching a method already included are filtered out.
+	 * Get the unique set of declared methods on the leaf class and all superclasses.
+	 * Leaf class methods are included first and while traversing the superclass hierarchy
+	 * any methods found with signatures matching a method already included are filtered out.
+	 * @param leafClass the class to introspect
 	 */
-	public static Method[] getUniqueDeclaredMethods(Class<?> leafClass) throws IllegalArgumentException {
+	public static Method[] getUniqueDeclaredMethods(Class<?> leafClass) {
 		final List<Method> methods = new ArrayList<Method>(32);
 		doWithMethods(leafClass, new MethodCallback() {
 			public void doWith(Method method) {
 				boolean knownSignature = false;
 				Method methodBeingOverriddenWithCovariantReturnType = null;
-
 				for (Method existingMethod : methods) {
 					if (method.getName().equals(existingMethod.getName()) &&
 							Arrays.equals(method.getParameterTypes(), existingMethod.getParameterTypes())) {
-						// is this a covariant return type situation?
+						// Is this a covariant return type situation?
 						if (existingMethod.getReturnType() != method.getReturnType() &&
 								existingMethod.getReturnType().isAssignableFrom(method.getReturnType())) {
 							methodBeingOverriddenWithCovariantReturnType = existingMethod;
-						} else {
+						}
+						else {
 							knownSignature = true;
 						}
 						break;
@@ -537,13 +560,26 @@ public void doWith(Method method) {
 		return methods.toArray(new Method[methods.size()]);
 	}
 
+	/**
+	 * This variant retrieves {@link Class#getDeclaredMethods()} from a local cache
+	 * in order to avoid the JVM's SecurityManager check and defensive array copying.
+	 */
+	private static Method[] getDeclaredMethods(Class<?> clazz) {
+		Method[] result = declaredMethodsCache.get(clazz);
+		if (result == null) {
+			result = clazz.getDeclaredMethods();
+			declaredMethodsCache.put(clazz, result);
+		}
+		return result;
+	}
+
 	/**
 	 * Invoke the given callback on all fields in the target class, going up the
 	 * class hierarchy to get all declared fields.
 	 * @param clazz the target class to analyze
 	 * @param fc the callback to invoke for each field
 	 */
-	public static void doWithFields(Class<?> clazz, FieldCallback fc) throws IllegalArgumentException {
+	public static void doWithFields(Class<?> clazz, FieldCallback fc) {
 		doWithFields(clazz, fc, null);
 	}
 
@@ -554,15 +590,12 @@ public static void doWithFields(Class<?> clazz, FieldCallback fc) throws Illegal
 	 * @param fc the callback to invoke for each field
 	 * @param ff the filter that determines the fields to apply the callback to
 	 */
-	public static void doWithFields(Class<?> clazz, FieldCallback fc, FieldFilter ff)
-			throws IllegalArgumentException {
-
+	public static void doWithFields(Class<?> clazz, FieldCallback fc, FieldFilter ff) {
 		// Keep backing up the inheritance hierarchy.
 		Class<?> targetClass = clazz;
 		do {
 			Field[] fields = targetClass.getDeclaredFields();
 			for (Field field : fields) {
-				// Skip static and final fields.
 				if (ff != null && !ff.matches(field)) {
 					continue;
 				}
@@ -570,8 +603,7 @@ public static void doWithFields(Class<?> clazz, FieldCallback fc, FieldFilter ff
 					fc.doWith(field);
 				}
 				catch (IllegalAccessException ex) {
-					throw new IllegalStateException(
-							"Shouldn't be illegal to access field '" + field.getName() + "': " + ex);
+					throw new IllegalStateException("Not allowed to access field '" + field.getName() + "': " + ex);
 				}
 			}
 			targetClass = targetClass.getSuperclass();
@@ -583,9 +615,8 @@ public static void doWithFields(Class<?> clazz, FieldCallback fc, FieldFilter ff
 	 * Given the source object and the destination, which must be the same class
 	 * or a subclass, copy all fields, including inherited fields. Designed to
 	 * work on objects with public no-arg constructors.
-	 * @throws IllegalArgumentException if the arguments are incompatible
 	 */
-	public static void shallowCopyFieldState(final Object src, final Object dest) throws IllegalArgumentException {
+	public static void shallowCopyFieldState(final Object src, final Object dest) {
 		if (src == null) {
 			throw new IllegalArgumentException("Source for field copy cannot be null");
 		}
@@ -593,8 +624,8 @@ public static void shallowCopyFieldState(final Object src, final Object dest) th
 			throw new IllegalArgumentException("Destination for field copy cannot be null");
 		}
 		if (!src.getClass().isAssignableFrom(dest.getClass())) {
-			throw new IllegalArgumentException("Destination class [" + dest.getClass().getName()
-					+ "] must be same or subclass as source class [" + src.getClass().getName() + "]");
+			throw new IllegalArgumentException("Destination class [" + dest.getClass().getName() +
+					"] must be same or subclass as source class [" + src.getClass().getName() + "]");
 		}
 		doWithFields(src.getClass(), new FieldCallback() {
 			public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException {
diff --git a/spring-core/src/main/java/org/springframework/util/ResourceUtils.java b/spring-core/src/main/java/org/springframework/util/ResourceUtils.java
index 8acebff9ab..1479631320 100644
--- a/spring-core/src/main/java/org/springframework/util/ResourceUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,15 +30,15 @@
  *
  * <p>Consider using Spring's Resource abstraction in the core package
  * for handling all kinds of file resources in a uniform manner.
- * {@link org.springframework.core.io.ResourceLoader}'s {@code getResource}
+ * {@link org.springframework.core.io.ResourceLoader}'s {@code getResource()}
  * method can resolve any location to a {@link org.springframework.core.io.Resource}
- * object, which in turn allows to obtain a {@code java.io.File} in the
+ * object, which in turn allows one to obtain a {@code java.io.File} in the
  * file system through its {@code getFile()} method.
  *
  * <p>The main reason for these utility methods for resource location handling
  * is to support {@link Log4jConfigurer}, which must be able to resolve
  * resource locations <i>before the logging system has been initialized</i>.
- * Spring' Resource abstraction in the core package, on the other hand,
+ * Spring's {@code Resource} abstraction in the core package, on the other hand,
  * already expects the logging system to be available.
  *
  * @author Juergen Hoeller
@@ -66,14 +66,17 @@ public abstract class ResourceUtils {
 	/** URL protocol for an entry from a zip file: "zip" */
 	public static final String URL_PROTOCOL_ZIP = "zip";
 
+	/** URL protocol for an entry from a WebSphere jar file: "wsjar" */
+	public static final String URL_PROTOCOL_WSJAR = "wsjar";
+
 	/** URL protocol for an entry from a JBoss jar file: "vfszip" */
 	public static final String URL_PROTOCOL_VFSZIP = "vfszip";
 
-	/** URL protocol for a JBoss VFS resource: "vfs" */
-	public static final String URL_PROTOCOL_VFS = "vfs";
+	/** URL protocol for a JBoss file system resource: "vfsfile" */
+	public static final String URL_PROTOCOL_VFSFILE = "vfsfile";
 
-	/** URL protocol for an entry from a WebSphere jar file: "wsjar" */
-	public static final String URL_PROTOCOL_WSJAR = "wsjar";
+	/** URL protocol for a general JBoss VFS resource: "vfs" */
+	public static final String URL_PROTOCOL_VFS = "vfs";
 
 	/** URL protocol for an entry from an OC4J jar file: "code-source" */
 	public static final String URL_PROTOCOL_CODE_SOURCE = "code-source";
@@ -119,11 +122,12 @@ public static URL getURL(String resourceLocation) throws FileNotFoundException {
 		Assert.notNull(resourceLocation, "Resource location must not be null");
 		if (resourceLocation.startsWith(CLASSPATH_URL_PREFIX)) {
 			String path = resourceLocation.substring(CLASSPATH_URL_PREFIX.length());
-			URL url = ClassUtils.getDefaultClassLoader().getResource(path);
+			ClassLoader cl = ClassUtils.getDefaultClassLoader();
+			URL url = (cl != null ? cl.getResource(path) : ClassLoader.getSystemResource(path));
 			if (url == null) {
 				String description = "class path resource [" + path + "]";
-				throw new FileNotFoundException(
-						description + " cannot be resolved to URL because it does not exist");
+				throw new FileNotFoundException(description +
+						" cannot be resolved to URL because it does not exist");
 			}
 			return url;
 		}
@@ -146,7 +150,7 @@ public static URL getURL(String resourceLocation) throws FileNotFoundException {
 	/**
 	 * Resolve the given resource location to a {@code java.io.File},
 	 * i.e. to a file in the file system.
-	 * <p>Does not check whether the fil actually exists; simply returns
+	 * <p>Does not check whether the file actually exists; simply returns
 	 * the File that the given location would correspond to.
 	 * @param resourceLocation the resource location to resolve: either a
 	 * "classpath:" pseudo URL, a "file:" URL, or a plain file path
@@ -159,11 +163,11 @@ public static File getFile(String resourceLocation) throws FileNotFoundException
 		if (resourceLocation.startsWith(CLASSPATH_URL_PREFIX)) {
 			String path = resourceLocation.substring(CLASSPATH_URL_PREFIX.length());
 			String description = "class path resource [" + path + "]";
-			URL url = ClassUtils.getDefaultClassLoader().getResource(path);
+			ClassLoader cl = ClassUtils.getDefaultClassLoader();
+			URL url = (cl != null ? cl.getResource(path) : ClassLoader.getSystemResource(path));
 			if (url == null) {
-				throw new FileNotFoundException(
-						description + " cannot be resolved to absolute file path " +
-						"because it does not reside in the file system");
+				throw new FileNotFoundException(description +
+						" cannot be resolved to absolute file path because it does not exist");
 			}
 			return getFile(url, description);
 		}
@@ -222,6 +226,7 @@ public static File getFile(URL resourceUrl, String description) throws FileNotFo
 	 * @return a corresponding File object
 	 * @throws FileNotFoundException if the URL cannot be resolved to
 	 * a file in the file system
+	 * @since 2.5
 	 */
 	public static File getFile(URI resourceUri) throws FileNotFoundException {
 		return getFile(resourceUri, "URI");
@@ -236,6 +241,7 @@ public static File getFile(URI resourceUri) throws FileNotFoundException {
 	 * @return a corresponding File object
 	 * @throws FileNotFoundException if the URL cannot be resolved to
 	 * a file in the file system
+	 * @since 2.5
 	 */
 	public static File getFile(URI resourceUri, String description) throws FileNotFoundException {
 		Assert.notNull(resourceUri, "Resource URI must not be null");
@@ -249,29 +255,29 @@ public static File getFile(URI resourceUri, String description) throws FileNotFo
 
 	/**
 	 * Determine whether the given URL points to a resource in the file system,
-	 * that is, has protocol "file" or "vfs".
+	 * that is, has protocol "file", "vfsfile" or "vfs".
 	 * @param url the URL to check
 	 * @return whether the URL has been identified as a file system URL
 	 */
 	public static boolean isFileURL(URL url) {
 		String protocol = url.getProtocol();
-		return (URL_PROTOCOL_FILE.equals(protocol) || protocol.startsWith(URL_PROTOCOL_VFS));
+		return (URL_PROTOCOL_FILE.equals(protocol) || URL_PROTOCOL_VFSFILE.equals(protocol) ||
+				URL_PROTOCOL_VFS.equals(protocol));
 	}
 
 	/**
 	 * Determine whether the given URL points to a resource in a jar file,
-	 * that is, has protocol "jar", "zip", "wsjar" or "code-source".
-	 * <p>"zip" and "wsjar" are used by BEA WebLogic Server and IBM WebSphere, respectively,
-	 * but can be treated like jar files. The same applies to "code-source" URLs on Oracle
+	 * that is, has protocol "jar", "zip", "vfszip", "wsjar" or "code-source".
+	 * <p>"zip" and "wsjar" are used by WebLogic Server and WebSphere, respectively,
+	 * but can be treated like jar files. The same applies to "code-source" URLs on
 	 * OC4J, provided that the path contains a jar separator.
 	 * @param url the URL to check
 	 * @return whether the URL has been identified as a JAR URL
 	 */
 	public static boolean isJarURL(URL url) {
 		String protocol = url.getProtocol();
-		return (URL_PROTOCOL_JAR.equals(protocol) ||
-				URL_PROTOCOL_ZIP.equals(protocol) ||
-				URL_PROTOCOL_WSJAR.equals(protocol) ||
+		return (URL_PROTOCOL_JAR.equals(protocol) || URL_PROTOCOL_ZIP.equals(protocol) ||
+				URL_PROTOCOL_VFSZIP.equals(protocol) || URL_PROTOCOL_WSJAR.equals(protocol) ||
 				(URL_PROTOCOL_CODE_SOURCE.equals(protocol) && url.getPath().contains(JAR_URL_SEPARATOR)));
 	}
 
@@ -306,7 +312,7 @@ public static URL extractJarFileURL(URL jarUrl) throws MalformedURLException {
 
 	/**
 	 * Create a URI instance for the given URL,
-	 * replacing spaces with "%20" quotes first.
+	 * replacing spaces with "%20" URI encoding first.
 	 * <p>Furthermore, this method works on JDK 1.4 as well,
 	 * in contrast to the {@code URL.toURI()} method.
 	 * @param url the URL to convert into a URI instance
@@ -320,7 +326,7 @@ public static URI toURI(URL url) throws URISyntaxException {
 
 	/**
 	 * Create a URI instance for the given location String,
-	 * replacing spaces with "%20" quotes first.
+	 * replacing spaces with "%20" URI encoding first.
 	 * @param location the location String to convert into a URI instance
 	 * @return the URI instance
 	 * @throws URISyntaxException if the location wasn't a valid URI
diff --git a/spring-core/src/main/java/org/springframework/util/SerializationUtils.java b/spring-core/src/main/java/org/springframework/util/SerializationUtils.java
index 943996702d..f85b1c72dd 100644
--- a/spring-core/src/main/java/org/springframework/util/SerializationUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/SerializationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ public static byte[] serialize(Object object) {
 		if (object == null) {
 			return null;
 		}
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
 		try {
 			ObjectOutputStream oos = new ObjectOutputStream(baos);
 			oos.writeObject(object);
diff --git a/spring-core/src/main/java/org/springframework/util/StopWatch.java b/spring-core/src/main/java/org/springframework/util/StopWatch.java
index 1f7552b57a..57544c4ea5 100644
--- a/spring-core/src/main/java/org/springframework/util/StopWatch.java
+++ b/spring-core/src/main/java/org/springframework/util/StopWatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -116,15 +116,15 @@ public void start(String taskName) throws IllegalStateException {
 		if (this.running) {
 			throw new IllegalStateException("Can't start StopWatch: it's already running");
 		}
-		this.startTimeMillis = System.currentTimeMillis();
 		this.running = true;
 		this.currentTaskName = taskName;
+		this.startTimeMillis = System.currentTimeMillis();
 	}
 
 	/**
 	 * Stop the current task. The results are undefined if timing
 	 * methods are called without invoking at least one pair
-	 * {@link #start()} / {@link #stop()} methods.
+	 * {@code start()} / {@code stop()} methods.
 	 * @see #start()
 	 */
 	public void stop() throws IllegalStateException {
@@ -229,7 +229,8 @@ public String prettyPrint() {
 		sb.append('\n');
 		if (!this.keepTaskList) {
 			sb.append("No task info kept");
-		} else {
+		}
+		else {
 			sb.append("-----------------------------------------\n");
 			sb.append("ms     %     Task name\n");
 			sb.append("-----------------------------------------\n");
@@ -261,7 +262,8 @@ public String toString() {
 				long percent = Math.round((100.0 * task.getTimeSeconds()) / getTotalTimeSeconds());
 				sb.append(" = ").append(percent).append("%");
 			}
-		} else {
+		}
+		else {
 			sb.append("; no task info kept");
 		}
 		return sb.toString();
@@ -300,7 +302,7 @@ public long getTimeMillis() {
 		 * Return the time in seconds this task took.
 		 */
 		public double getTimeSeconds() {
-			return this.timeMillis / 1000.0;
+			return (this.timeMillis / 1000.0);
 		}
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index 7fa4b75cf9..7f9f721c32 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,6 @@
  * @author Rick Evans
  * @author Arjen Poutsma
  * @since 16 April 2001
- * @see org.apache.commons.lang.StringUtils
  */
 public abstract class StringUtils {
 
@@ -87,7 +86,7 @@ public static boolean isEmpty(Object str) {
 	/**
 	 * Check that the given CharSequence is neither {@code null} nor of length 0.
 	 * Note: Will return {@code true} for a CharSequence that purely consists of whitespace.
-	 * <p><pre>
+	 * <p><pre class="code">
 	 * StringUtils.hasLength(null) = false
 	 * StringUtils.hasLength("") = false
 	 * StringUtils.hasLength(" ") = true
@@ -116,7 +115,7 @@ public static boolean hasLength(String str) {
 	 * Check whether the given CharSequence has actual text.
 	 * More specifically, returns {@code true} if the string not {@code null},
 	 * its length is greater than 0, and it contains at least one non-whitespace character.
-	 * <p><pre>
+	 * <p><pre class="code">
 	 * StringUtils.hasText(null) = false
 	 * StringUtils.hasText("") = false
 	 * StringUtils.hasText(" ") = false
@@ -207,7 +206,7 @@ public static String trimWhitespace(String str) {
 
 	/**
 	 * Trim <i>all</i> whitespace from the given String:
-	 * leading, trailing, and inbetween characters.
+	 * leading, trailing, and in between characters.
 	 * @param str the String to check
 	 * @return the trimmed String
 	 * @see java.lang.Character#isWhitespace
@@ -264,7 +263,7 @@ public static String trimTrailingWhitespace(String str) {
 	}
 
 	/**
-	 * Trim all occurences of the supplied leading character from the given String.
+	 * Trim all occurrences of the supplied leading character from the given String.
 	 * @param str the String to check
 	 * @param leadingCharacter the leading character to be trimmed
 	 * @return the trimmed String
@@ -281,7 +280,7 @@ public static String trimLeadingCharacter(String str, char leadingCharacter) {
 	}
 
 	/**
-	 * Trim all occurences of the supplied trailing character from the given String.
+	 * Trim all occurrences of the supplied trailing character from the given String.
 	 * @param str the String to check
 	 * @param trailingCharacter the trailing character to be trimmed
 	 * @return the trimmed String
@@ -380,7 +379,7 @@ public static int countOccurrencesOf(String str, String sub) {
 	}
 
 	/**
-	 * Replace all occurences of a substring within a string with
+	 * Replace all occurrences of a substring within a string with
 	 * another string.
 	 * @param inString String to examine
 	 * @param oldPattern String to replace
@@ -621,7 +620,12 @@ public static String cleanPath(String path) {
 		String prefix = "";
 		if (prefixIndex != -1) {
 			prefix = pathToUse.substring(0, prefixIndex + 1);
-			pathToUse = pathToUse.substring(prefixIndex + 1);
+			if (prefix.contains("/")) {
+				prefix = "";
+			}
+			else {
+				pathToUse = pathToUse.substring(prefixIndex + 1);
+			}
 		}
 		if (pathToUse.startsWith(FOLDER_SEPARATOR)) {
 			prefix = prefix + FOLDER_SEPARATOR;
@@ -674,10 +678,11 @@ public static boolean pathEquals(String path1, String path2) {
 	/**
 	 * Parse the given {@code localeString} value into a {@link Locale}.
 	 * <p>This is the inverse operation of {@link Locale#toString Locale's toString}.
-	 * @param localeString the locale string, following {@code Locale's}
+	 * @param localeString the locale String, following {@code Locale's}
 	 * {@code toString()} format ("en", "en_UK", etc);
 	 * also accepts spaces as separators, as an alternative to underscores
 	 * @return a corresponding {@code Locale} instance
+	 * @throws IllegalArgumentException in case of an invalid locale specification
 	 */
 	public static Locale parseLocaleString(String localeString) {
 		String[] parts = tokenizeToStringArray(localeString, "_ ", false, false);
@@ -686,10 +691,10 @@ public static Locale parseLocaleString(String localeString) {
 		validateLocalePart(language);
 		validateLocalePart(country);
 		String variant = "";
-		if (parts.length >= 2) {
+		if (parts.length > 2) {
 			// There is definitely a variant, and it is everything after the country
 			// code sans the separator between the country code and the variant.
-			int endIndexOfCountryCode = localeString.lastIndexOf(country) + country.length();
+			int endIndexOfCountryCode = localeString.indexOf(country, language.length()) + country.length();
 			// Strip off any leading '_' and whitespace, what's left is the variant.
 			variant = trimLeadingWhitespace(localeString.substring(endIndexOfCountryCode));
 			if (variant.startsWith("_")) {
@@ -702,7 +707,7 @@ public static Locale parseLocaleString(String localeString) {
 	private static void validateLocalePart(String localePart) {
 		for (int i = 0; i < localePart.length(); i++) {
 			char ch = localePart.charAt(i);
-			if (ch != '_' && ch != ' ' && !Character.isLetterOrDigit(ch)) {
+			if (ch != ' ' && ch != '_' && ch != '#' && !Character.isLetterOrDigit(ch)) {
 				throw new IllegalArgumentException(
 						"Locale part \"" + localePart + "\" contains invalid characters");
 			}
diff --git a/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java b/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java
index 19ee4478e7..6c3acd7e1d 100644
--- a/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,12 @@
 
 package org.springframework.util;
 
-import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;
-
 /**
  * Helper class for resolving placeholders in texts. Usually applied to file paths.
  *
- * <p>A text may contain {@code ${...}} placeholders, to be resolved as system properties: e.g.
- * {@code ${user.dir}}.  Default values can be supplied using the ":" separator between key
- * and value.
+ * <p>A text may contain {@code ${...}} placeholders, to be resolved as system properties:
+ * e.g. {@code ${user.dir}}. Default values can be supplied using the ":" separator
+ * between key and value.
  *
  * @author Juergen Hoeller
  * @author Rob Harrop
@@ -53,7 +51,8 @@ public abstract class SystemPropertyUtils {
 
 
 	/**
-	 * Resolve ${...} placeholders in the given text, replacing them with corresponding system property values.
+	 * Resolve {@code ${...}} placeholders in the given text, replacing them with
+	 * corresponding system property values.
 	 * @param text the String to resolve
 	 * @return the resolved String
 	 * @see #PLACEHOLDER_PREFIX
@@ -65,15 +64,16 @@ public static String resolvePlaceholders(String text) {
 	}
 
 	/**
-	 * Resolve ${...} placeholders in the given text, replacing them with corresponding system property values.
-	 * Unresolvable placeholders with no default value are ignored and passed through unchanged if the
-	 * flag is set to true.
+	 * Resolve {@code ${...}} placeholders in the given text, replacing them with
+	 * corresponding system property values. Unresolvable placeholders with no default
+	 * value are ignored and passed through unchanged if the flag is set to {@code true}.
 	 * @param text the String to resolve
-	 * @param ignoreUnresolvablePlaceholders flag to determine is unresolved placeholders are ignored
+	 * @param ignoreUnresolvablePlaceholders whether unresolved placeholders are to be ignored
 	 * @return the resolved String
 	 * @see #PLACEHOLDER_PREFIX
 	 * @see #PLACEHOLDER_SUFFIX
-	 * @throws IllegalArgumentException if there is an unresolvable placeholder and the flag is false
+	 * @throws IllegalArgumentException if there is an unresolvable placeholder
+	 * and the "ignoreUnresolvablePlaceholders" flag is {@code false}
 	 */
 	public static String resolvePlaceholders(String text, boolean ignoreUnresolvablePlaceholders) {
 		PropertyPlaceholderHelper helper = (ignoreUnresolvablePlaceholders ? nonStrictHelper : strictHelper);
@@ -81,7 +81,11 @@ public static String resolvePlaceholders(String text, boolean ignoreUnresolvable
 	}
 
 
-	private static class SystemPropertyPlaceholderResolver implements PlaceholderResolver {
+	/**
+	 * PlaceholderResolver implementation that resolves against system properties
+	 * and system environment variables.
+	 */
+	private static class SystemPropertyPlaceholderResolver implements PropertyPlaceholderHelper.PlaceholderResolver {
 
 		private final String text;
 
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java
index 80b8b9b369..f29310e20e 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/InstanceComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,23 +31,22 @@
  * is required.
  *
  * @author Phillip Webb
- * @param <T> The type of objects being compared
- * @see CompoundComparator
  * @since 3.2
+ * @param <T> the type of objects being compared
+ * @see CompoundComparator
  */
 public class InstanceComparator<T> implements Comparator<T> {
 
-	private Class<?>[] instanceOrder;
+	private final Class<?>[] instanceOrder;
 
 
 	/**
 	 * Create a new {@link InstanceComparator} instance.
-	 *
 	 * @param instanceOrder the ordered list of classes that should be used when comparing
 	 * objects. Classes earlier in the list will be be given a higher priority.
 	 */
 	public InstanceComparator(Class<?>... instanceOrder) {
-		Assert.notNull(instanceOrder, "InstanceOrder must not be null");
+		Assert.notNull(instanceOrder, "'instanceOrder' must not be null");
 		this.instanceOrder = instanceOrder;
 	}
 
@@ -59,14 +58,14 @@ public int compare(T o1, T o2) {
 	}
 
 	private int getOrder(T object) {
-		if(object != null) {
-			for (int i = 0; i < instanceOrder.length; i++) {
-				if (instanceOrder[i].isInstance(object)) {
+		if (object != null) {
+			for (int i = 0; i < this.instanceOrder.length; i++) {
+				if (this.instanceOrder[i].isInstance(object)) {
 					return i;
 				}
 			}
 		}
-		return instanceOrder.length;
+		return this.instanceOrder.length;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/package-info.java b/spring-core/src/main/java/org/springframework/util/comparator/package-info.java
index 7bcb8576d8..f2213670b9 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/package-info.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/package-info.java
@@ -1,3 +1,4 @@
+
 /**
  *
  * Useful generic {@code java.util.Comparator} implementations,
diff --git a/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java b/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java
index 44eaedb735..61c6271dc3 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,31 +32,31 @@
 import org.springframework.util.Assert;
 
 /**
- * Convenience methods for working with the DOM API, in particular for working with DOM Nodes and DOM Elements.
+ * Convenience methods for working with the DOM API,
+ * in particular for working with DOM Nodes and DOM Elements.
  *
  * @author Juergen Hoeller
  * @author Rob Harrop
  * @author Costin Leau
  * @author Arjen Poutsma
  * @author Luke Taylor
+ * @since 1.2
  * @see org.w3c.dom.Node
  * @see org.w3c.dom.Element
- * @since 1.2
  */
 public abstract class DomUtils {
 
 	/**
-	 * Retrieve all child elements of the given DOM element that match any of the given element names. Only look at the
-	 * direct child level of the given element; do not go into further depth (in contrast to the DOM API's
-	 * {@code getElementsByTagName} method).
-	 *
-	 * @param ele           the DOM element to analyze
+	 * Retrieves all child elements of the given DOM element that match any of the given element names.
+	 * Only looks at the direct child level of the given element; do not go into further depth
+	 * (in contrast to the DOM API's {@code getElementsByTagName} method).
+	 * @param ele the DOM element to analyze
 	 * @param childEleNames the child element names to look for
 	 * @return a List of child {@code org.w3c.dom.Element} instances
 	 * @see org.w3c.dom.Element
 	 * @see org.w3c.dom.Element#getElementsByTagName
 	 */
-	public static List<Element> getChildElementsByTagName(Element ele, String[] childEleNames) {
+	public static List<Element> getChildElementsByTagName(Element ele, String... childEleNames) {
 		Assert.notNull(ele, "Element must not be null");
 		Assert.notNull(childEleNames, "Element names collection must not be null");
 		List<String> childEleNameList = Arrays.asList(childEleNames);
@@ -72,24 +72,22 @@ public static List<Element> getChildElementsByTagName(Element ele, String[] chil
 	}
 
 	/**
-	 * Retrieve all child elements of the given DOM element that match the given element name. Only look at the direct
-	 * child level of the given element; do not go into further depth (in contrast to the DOM API's
-	 * {@code getElementsByTagName} method).
-	 *
-	 * @param ele          the DOM element to analyze
+	 * Retrieves all child elements of the given DOM element that match the given element name.
+	 * Only look at the direct child level of the given element; do not go into further depth
+	 * (in contrast to the DOM API's {@code getElementsByTagName} method).
+	 * @param ele the DOM element to analyze
 	 * @param childEleName the child element name to look for
 	 * @return a List of child {@code org.w3c.dom.Element} instances
 	 * @see org.w3c.dom.Element
 	 * @see org.w3c.dom.Element#getElementsByTagName
 	 */
 	public static List<Element> getChildElementsByTagName(Element ele, String childEleName) {
-		return getChildElementsByTagName(ele, new String[]{childEleName});
+		return getChildElementsByTagName(ele, new String[] {childEleName});
 	}
 
 	/**
 	 * Utility method that returns the first child element identified by its name.
-	 *
-	 * @param ele          the DOM element to analyze
+	 * @param ele the DOM element to analyze
 	 * @param childEleName the child element name to look for
 	 * @return the {@code org.w3c.dom.Element} instance, or {@code null} if none found
 	 */
@@ -108,8 +106,7 @@ public static Element getChildElementByTagName(Element ele, String childEleName)
 
 	/**
 	 * Utility method that returns the first child element value identified by its name.
-	 *
-	 * @param ele          the DOM element to analyze
+	 * @param ele the DOM element to analyze
 	 * @param childEleName the child element name to look for
 	 * @return the extracted text value, or {@code null} if no child element found
 	 */
@@ -119,9 +116,8 @@ public static String getChildElementValueByTagName(Element ele, String childEleN
 	}
 
 	/**
-	 * Retrieve all child elements of the given DOM element
-
-	 * @param ele           the DOM element to analyze
+	 * Retrieves all child elements of the given DOM element
+	 * @param ele the DOM element to analyze
 	 * @return a List of child {@code org.w3c.dom.Element} instances
 	 */
 	public static List<Element> getChildElements(Element ele) {
@@ -138,9 +134,10 @@ public static List<Element> getChildElements(Element ele) {
 	}
 
 	/**
-	 * Extract the text value from the given DOM element, ignoring XML comments. <p>Appends all CharacterData nodes and
-	 * EntityReference nodes into a single String value, excluding Comment nodes.
-	 *
+	 * Extracts the text value from the given DOM element, ignoring XML comments.
+	 * <p>Appends all CharacterData nodes and EntityReference nodes into a single
+	 * String value, excluding Comment nodes. Only exposes actual user-specified
+	 * text, no default values of any kind.
 	 * @see CharacterData
 	 * @see EntityReference
 	 * @see Comment
@@ -159,8 +156,9 @@ public static String getTextValue(Element valueEle) {
 	}
 
 	/**
-	 * Namespace-aware equals comparison. Returns {@code true} if either {@link Node#getLocalName} or {@link
-	 * Node#getNodeName} equals {@code desiredName}, otherwise returns {@code false}.
+	 * Namespace-aware equals comparison. Returns {@code true} if either
+	 * {@link Node#getLocalName} or {@link Node#getNodeName} equals
+	 * {@code desiredName}, otherwise returns {@code false}.
 	 */
 	public static boolean nodeNameEquals(Node node, String desiredName) {
 		Assert.notNull(node, "Node must not be null");
@@ -170,7 +168,6 @@ public static boolean nodeNameEquals(Node node, String desiredName) {
 
 	/**
 	 * Returns a SAX {@code ContentHandler} that transforms callback calls to DOM {@code Node}s.
-	 *
 	 * @param node the node to publish events to
 	 * @return the content handler
 	 */
@@ -178,13 +175,17 @@ public static ContentHandler createContentHandler(Node node) {
 		return new DomContentHandler(node);
 	}
 
-	/** Matches the given node's name and local name against the given desired name. */
+	/**
+	 * Matches the given node's name and local name against the given desired name.
+	 */
 	private static boolean nodeNameMatch(Node node, String desiredName) {
 		return (desiredName.equals(node.getNodeName()) || desiredName.equals(node.getLocalName()));
 	}
 
-	/** Matches the given node's name and local name against the given desired names. */
-	private static boolean nodeNameMatch(Node node, Collection desiredNames) {
+	/**
+	 * Matches the given node's name and local name against the given desired names.
+	 */
+	private static boolean nodeNameMatch(Node node, Collection<?> desiredNames) {
 		return (desiredNames.contains(node.getNodeName()) || desiredNames.contains(node.getLocalName()));
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java
index 0d32a3fc08..fd43354a68 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,12 +51,12 @@
  * an {@code XMLEventReader}, and calls the corresponding methods on the SAX callback interfaces.
  *
  * @author Arjen Poutsma
+ * @since 3.0
  * @see XMLEventReader
  * @see #setContentHandler(org.xml.sax.ContentHandler)
  * @see #setDTDHandler(org.xml.sax.DTDHandler)
  * @see #setEntityResolver(org.xml.sax.EntityResolver)
  * @see #setErrorHandler(org.xml.sax.ErrorHandler)
- * @since 3.0
  */
 class StaxEventXMLReader extends AbstractStaxXMLReader {
 
@@ -70,11 +70,11 @@ class StaxEventXMLReader extends AbstractStaxXMLReader {
 
 	private String encoding;
 
+
 	/**
 	 * Constructs a new instance of the {@code StaxEventXmlReader} that reads from the given
 	 * {@code XMLEventReader}. The supplied event reader must be in {@code XMLStreamConstants.START_DOCUMENT} or
 	 * {@code XMLStreamConstants.START_ELEMENT} state.
-	 *
 	 * @param reader the {@code XMLEventReader} to read from
 	 * @throws IllegalStateException if the reader is not at the start of a document or element
 	 */
@@ -89,17 +89,17 @@ class StaxEventXMLReader extends AbstractStaxXMLReader {
 		catch (XMLStreamException ex) {
 			throw new IllegalStateException("Could not read first element: " + ex.getMessage());
 		}
-
 		this.reader = reader;
 	}
 
+
 	@Override
 	protected void parseInternal() throws SAXException, XMLStreamException {
 		boolean documentStarted = false;
 		boolean documentEnded = false;
 		int elementDepth = 0;
-		while (reader.hasNext() && elementDepth >= 0) {
-			XMLEvent event = reader.nextEvent();
+		while (this.reader.hasNext() && elementDepth >= 0) {
+			XMLEvent event = this.reader.nextEvent();
 			if (!event.isStartDocument() && !event.isEndDocument() && !documentStarted) {
 				handleStartDocument(event);
 				documentStarted = true;
@@ -165,36 +165,28 @@ private void handleStartDocument(final XMLEvent event) throws SAXException {
 				this.encoding = startDocument.getCharacterEncodingScheme();
 			}
 		}
-
 		if (getContentHandler() != null) {
 			final Location location = event.getLocation();
 			getContentHandler().setDocumentLocator(new Locator2() {
-
 				public int getColumnNumber() {
-					return location != null ? location.getColumnNumber() : -1;
+					return (location != null ? location.getColumnNumber() : -1);
 				}
-
 				public int getLineNumber() {
-					return location != null ? location.getLineNumber() : -1;
+					return (location != null ? location.getLineNumber() : -1);
 				}
-
 				public String getPublicId() {
-					return location != null ? location.getPublicId() : null;
+					return (location != null ? location.getPublicId() : null);
 				}
-
 				public String getSystemId() {
-					return location != null ? location.getSystemId() : null;
+					return (location != null ? location.getSystemId() : null);
 				}
-
 				public String getXMLVersion() {
 					return xmlVersion;
 				}
-
 				public String getEncoding() {
 					return encoding;
 				}
 			});
-
 			getContentHandler().startDocument();
 		}
 	}
@@ -311,7 +303,6 @@ private void handleEntityReference(EntityReference reference) throws SAXExceptio
 
 	private Attributes getAttributes(StartElement event) {
 		AttributesImpl attributes = new AttributesImpl();
-
 		for (Iterator i = event.getAttributes(); i.hasNext();) {
 			Attribute attribute = (Attribute) i.next();
 			QName qName = attribute.getName();
@@ -323,8 +314,7 @@ private Attributes getAttributes(StartElement event) {
 			if (type == null) {
 				type = "CDATA";
 			}
-			attributes
-					.addAttribute(namespace, qName.getLocalPart(), toQualifiedName(qName), type, attribute.getValue());
+			attributes.addAttribute(namespace, qName.getLocalPart(), toQualifiedName(qName), type, attribute.getValue());
 		}
 		if (hasNamespacePrefixesFeature()) {
 			for (Iterator i = event.getNamespaces(); i.hasNext();) {
diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java
index bca48d1cdb..359514b57c 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,16 +31,16 @@
 import org.springframework.util.StringUtils;
 
 /**
- * SAX {@code XMLReader} that reads from a StAX {@code XMLStreamReader}.  Reads from an
+ * SAX {@code XMLReader} that reads from a StAX {@code XMLStreamReader}. Reads from an
  * {@code XMLStreamReader}, and calls the corresponding methods on the SAX callback interfaces.
  *
  * @author Arjen Poutsma
+ * @since 3.0
  * @see XMLStreamReader
  * @see #setContentHandler(org.xml.sax.ContentHandler)
  * @see #setDTDHandler(org.xml.sax.DTDHandler)
  * @see #setEntityResolver(org.xml.sax.EntityResolver)
  * @see #setErrorHandler(org.xml.sax.ErrorHandler)
- * @since 3.0
  */
 class StaxStreamXMLReader extends AbstractStaxXMLReader {
 
@@ -52,11 +52,11 @@ class StaxStreamXMLReader extends AbstractStaxXMLReader {
 
 	private String encoding;
 
+
 	/**
-	 * Constructs a new instance of the {@code StaxStreamXmlReader} that reads from the given
-	 * {@code XMLStreamReader}.  The supplied stream reader must be in {@code XMLStreamConstants.START_DOCUMENT}
+	 * Construct a new instance of the {@code StaxStreamXmlReader} that reads from the given
+	 * {@code XMLStreamReader}. The supplied stream reader must be in {@code XMLStreamConstants.START_DOCUMENT}
 	 * or {@code XMLStreamConstants.START_ELEMENT} state.
-	 *
 	 * @param reader the {@code XMLEventReader} to read from
 	 * @throws IllegalStateException if the reader is not at the start of a document or element
 	 */
@@ -69,12 +69,13 @@ class StaxStreamXMLReader extends AbstractStaxXMLReader {
 		this.reader = reader;
 	}
 
+
 	@Override
 	protected void parseInternal() throws SAXException, XMLStreamException {
 		boolean documentStarted = false;
 		boolean documentEnded = false;
 		int elementDepth = 0;
-		int eventType = reader.getEventType();
+		int eventType = this.reader.getEventType();
 		while (true) {
 			if (eventType != XMLStreamConstants.START_DOCUMENT && eventType != XMLStreamConstants.END_DOCUMENT &&
 					!documentStarted) {
@@ -118,8 +119,8 @@ protected void parseInternal() throws SAXException, XMLStreamException {
 					handleEntityReference();
 					break;
 			}
-			if (reader.hasNext() && elementDepth >= 0) {
-				eventType = reader.next();
+			if (this.reader.hasNext() && elementDepth >= 0) {
+				eventType = this.reader.next();
 			}
 			else {
 				break;
@@ -131,66 +132,58 @@ protected void parseInternal() throws SAXException, XMLStreamException {
 	}
 
 	private void handleStartDocument() throws SAXException {
-		if (XMLStreamConstants.START_DOCUMENT == reader.getEventType()) {
-			String xmlVersion = reader.getVersion();
+		if (XMLStreamConstants.START_DOCUMENT == this.reader.getEventType()) {
+			String xmlVersion = this.reader.getVersion();
 			if (StringUtils.hasLength(xmlVersion)) {
 				this.xmlVersion = xmlVersion;
 			}
-			this.encoding = reader.getCharacterEncodingScheme();
+			this.encoding = this.reader.getCharacterEncodingScheme();
 		}
-
 		if (getContentHandler() != null) {
-			final Location location = reader.getLocation();
-
+			final Location location = this.reader.getLocation();
 			getContentHandler().setDocumentLocator(new Locator2() {
-
 				public int getColumnNumber() {
-					return location != null ? location.getColumnNumber() : -1;
+					return (location != null ? location.getColumnNumber() : -1);
 				}
-
 				public int getLineNumber() {
-					return location != null ? location.getLineNumber() : -1;
+					return (location != null ? location.getLineNumber() : -1);
 				}
-
 				public String getPublicId() {
-					return location != null ? location.getPublicId() : null;
+					return (location != null ? location.getPublicId() : null);
 				}
-
 				public String getSystemId() {
-					return location != null ? location.getSystemId() : null;
+					return (location != null ? location.getSystemId() : null);
 				}
-
 				public String getXMLVersion() {
 					return xmlVersion;
 				}
-
 				public String getEncoding() {
 					return encoding;
 				}
 			});
 			getContentHandler().startDocument();
-			if (reader.standaloneSet()) {
-				setStandalone(reader.isStandalone());
+			if (this.reader.standaloneSet()) {
+				setStandalone(this.reader.isStandalone());
 			}
 		}
 	}
 
 	private void handleStartElement() throws SAXException {
 		if (getContentHandler() != null) {
-			QName qName = reader.getName();
+			QName qName = this.reader.getName();
 			if (hasNamespacesFeature()) {
-				for (int i = 0; i < reader.getNamespaceCount(); i++) {
-					startPrefixMapping(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
+				for (int i = 0; i < this.reader.getNamespaceCount(); i++) {
+					startPrefixMapping(this.reader.getNamespacePrefix(i), this.reader.getNamespaceURI(i));
 				}
-				for (int i = 0; i < reader.getAttributeCount(); i++) {
-					String prefix = reader.getAttributePrefix(i);
-					String namespace = reader.getAttributeNamespace(i);
+				for (int i = 0; i < this.reader.getAttributeCount(); i++) {
+					String prefix = this.reader.getAttributePrefix(i);
+					String namespace = this.reader.getAttributeNamespace(i);
 					if (StringUtils.hasLength(namespace)) {
 						startPrefixMapping(prefix, namespace);
 					}
 				}
-				getContentHandler().startElement(qName.getNamespaceURI(), qName.getLocalPart(), toQualifiedName(qName),
-						getAttributes());
+				getContentHandler().startElement(qName.getNamespaceURI(), qName.getLocalPart(),
+						toQualifiedName(qName), getAttributes());
 			}
 			else {
 				getContentHandler().startElement("", "", toQualifiedName(qName), getAttributes());
@@ -200,11 +193,11 @@ private void handleStartElement() throws SAXException {
 
 	private void handleEndElement() throws SAXException {
 		if (getContentHandler() != null) {
-			QName qName = reader.getName();
+			QName qName = this.reader.getName();
 			if (hasNamespacesFeature()) {
 				getContentHandler().endElement(qName.getNamespaceURI(), qName.getLocalPart(), toQualifiedName(qName));
-				for (int i = 0; i < reader.getNamespaceCount(); i++) {
-					String prefix = reader.getNamespacePrefix(i);
+				for (int i = 0; i < this.reader.getNamespaceCount(); i++) {
+					String prefix = this.reader.getNamespacePrefix(i);
 					if (prefix == null) {
 						prefix = "";
 					}
@@ -218,31 +211,28 @@ private void handleEndElement() throws SAXException {
 	}
 
 	private void handleCharacters() throws SAXException {
-		if (getContentHandler() != null && reader.isWhiteSpace()) {
-			getContentHandler()
-					.ignorableWhitespace(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
-			return;
-		}
-		if (XMLStreamConstants.CDATA == reader.getEventType() && getLexicalHandler() != null) {
+		if (XMLStreamConstants.CDATA == this.reader.getEventType() && getLexicalHandler() != null) {
 			getLexicalHandler().startCDATA();
 		}
 		if (getContentHandler() != null) {
-			getContentHandler().characters(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
+			getContentHandler().characters(this.reader.getTextCharacters(),
+					this.reader.getTextStart(), this.reader.getTextLength());
 		}
-		if (XMLStreamConstants.CDATA == reader.getEventType() && getLexicalHandler() != null) {
+		if (XMLStreamConstants.CDATA == this.reader.getEventType() && getLexicalHandler() != null) {
 			getLexicalHandler().endCDATA();
 		}
 	}
 
 	private void handleComment() throws SAXException {
 		if (getLexicalHandler() != null) {
-			getLexicalHandler().comment(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
+			getLexicalHandler().comment(this.reader.getTextCharacters(),
+					this.reader.getTextStart(), this.reader.getTextLength());
 		}
 	}
 
 	private void handleDtd() throws SAXException {
 		if (getLexicalHandler() != null) {
-			javax.xml.stream.Location location = reader.getLocation();
+			javax.xml.stream.Location location = this.reader.getLocation();
 			getLexicalHandler().startDTD(null, location.getPublicId(), location.getSystemId());
 		}
 		if (getLexicalHandler() != null) {
@@ -252,10 +242,10 @@ private void handleDtd() throws SAXException {
 
 	private void handleEntityReference() throws SAXException {
 		if (getLexicalHandler() != null) {
-			getLexicalHandler().startEntity(reader.getLocalName());
+			getLexicalHandler().startEntity(this.reader.getLocalName());
 		}
 		if (getLexicalHandler() != null) {
-			getLexicalHandler().endEntity(reader.getLocalName());
+			getLexicalHandler().endEntity(this.reader.getLocalName());
 		}
 	}
 
@@ -267,29 +257,28 @@ private void handleEndDocument() throws SAXException {
 
 	private void handleProcessingInstruction() throws SAXException {
 		if (getContentHandler() != null) {
-			getContentHandler().processingInstruction(reader.getPITarget(), reader.getPIData());
+			getContentHandler().processingInstruction(this.reader.getPITarget(), this.reader.getPIData());
 		}
 	}
 
 	private Attributes getAttributes() {
 		AttributesImpl attributes = new AttributesImpl();
-
-		for (int i = 0; i < reader.getAttributeCount(); i++) {
-			String namespace = reader.getAttributeNamespace(i);
+		for (int i = 0; i < this.reader.getAttributeCount(); i++) {
+			String namespace = this.reader.getAttributeNamespace(i);
 			if (namespace == null || !hasNamespacesFeature()) {
 				namespace = "";
 			}
-			String type = reader.getAttributeType(i);
+			String type = this.reader.getAttributeType(i);
 			if (type == null) {
 				type = "CDATA";
 			}
-			attributes.addAttribute(namespace, reader.getAttributeLocalName(i),
-					toQualifiedName(reader.getAttributeName(i)), type, reader.getAttributeValue(i));
+			attributes.addAttribute(namespace, this.reader.getAttributeLocalName(i),
+					toQualifiedName(this.reader.getAttributeName(i)), type, this.reader.getAttributeValue(i));
 		}
 		if (hasNamespacePrefixesFeature()) {
-			for (int i = 0; i < reader.getNamespaceCount(); i++) {
-				String prefix = reader.getNamespacePrefix(i);
-				String namespaceUri = reader.getNamespaceURI(i);
+			for (int i = 0; i < this.reader.getNamespaceCount(); i++) {
+				String prefix = this.reader.getNamespacePrefix(i);
+				String namespaceUri = this.reader.getNamespaceURI(i);
 				String qName;
 				if (StringUtils.hasLength(prefix)) {
 					qName = "xmlns:" + prefix;
diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxUtils.java b/spring-core/src/main/java/org/springframework/util/xml/StaxUtils.java
index efafa259d4..41fd3f63dc 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/StaxUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/StaxUtils.java
@@ -111,7 +111,16 @@ public static Source createStaxSource(XMLEventReader eventReader) throws XMLStre
 	 * 1.4 {@link StAXSource}; {@code false} otherwise.
 	 */
 	public static boolean isStaxSource(Source source) {
-		return (source instanceof StaxSource || (jaxp14Available && Jaxp14StaxHandler.isStaxSource(source)));
+		return ((source instanceof StaxSource) || (jaxp14Available && Jaxp14StaxHandler.isStaxSource(source)));
+	}
+
+	/**
+	 * Indicate whether the given class is a StAX Source class.
+	 * @return {@code true} if {@code source} is a custom StAX source or JAXP
+	 * 1.4 {@link StAXSource} class; {@code false} otherwise.
+	 */
+	public static boolean isStaxSourceClass(Class<? extends Source> clazz) {
+		return (StaxSource.class.equals(clazz) || (jaxp14Available && Jaxp14StaxHandler.isStaxSourceClass(clazz)));
 	}
 
 
@@ -348,6 +357,10 @@ private static boolean isStaxSource(Source source) {
 			return (source instanceof StAXSource);
 		}
 
+		private static boolean isStaxSourceClass(Class<? extends Source> clazz) {
+            return StAXSource.class.equals(clazz);
+        }
+
 		private static boolean isStaxResult(Result result) {
 			return (result instanceof StAXResult);
 		}
diff --git a/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java
index d3a11a736b..b8321a0592 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@
 import javax.xml.stream.events.XMLEvent;
 
 /**
- * Implementation of the {@link javax.xml.stream.XMLStreamReader} interface that wraps a {@link XMLEventReader}. Useful,
- * because the StAX {@link javax.xml.stream.XMLInputFactory} allows one to create a event reader from a stream reader,
- * but not vice-versa.
+ * Implementation of the {@link javax.xml.stream.XMLStreamReader} interface that wraps a
+ * {@link XMLEventReader}. Useful because the StAX {@link javax.xml.stream.XMLInputFactory}
+ * allows one to create a event reader from a stream reader, but not vice-versa.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -44,124 +44,117 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 
 	private final XMLEventReader eventReader;
 
-	XMLEventStreamReader(XMLEventReader eventReader) throws XMLStreamException {
+
+	public XMLEventStreamReader(XMLEventReader eventReader) throws XMLStreamException {
 		this.eventReader = eventReader;
-		event = eventReader.nextEvent();
+		this.event = eventReader.nextEvent();
 	}
 
-	public boolean isStandalone() {
-		if (event.isStartDocument()) {
-			return ((StartDocument) event).isStandalone();
+
+	public QName getName() {
+		if (this.event.isStartElement()) {
+			return this.event.asStartElement().getName();
+		}
+		else if (this.event.isEndElement()) {
+			return this.event.asEndElement().getName();
 		}
 		else {
 			throw new IllegalStateException();
 		}
 	}
 
+	public Location getLocation() {
+		return this.event.getLocation();
+	}
+
+	public int getEventType() {
+		return this.event.getEventType();
+	}
+
 	public String getVersion() {
-		if (event.isStartDocument()) {
-			return ((StartDocument) event).getVersion();
+		if (this.event.isStartDocument()) {
+			return ((StartDocument) this.event).getVersion();
 		}
 		else {
 			return null;
 		}
 	}
 
-	public int getTextStart() {
-		return 0;
+	public Object getProperty(String name) throws IllegalArgumentException {
+		return this.eventReader.getProperty(name);
 	}
 
-	public String getText() {
-		if (event.isCharacters()) {
-			return event.asCharacters().getData();
-		}
-		else if (event.getEventType() == XMLEvent.COMMENT) {
-			return ((Comment) event).getText();
+	public boolean isStandalone() {
+		if (this.event.isStartDocument()) {
+			return ((StartDocument) event).isStandalone();
 		}
 		else {
 			throw new IllegalStateException();
 		}
 	}
 
-	public String getPITarget() {
-		if (event.isProcessingInstruction()) {
-			return ((ProcessingInstruction) event).getTarget();
+	public boolean standaloneSet() {
+		if (this.event.isStartDocument()) {
+			return ((StartDocument) this.event).standaloneSet();
 		}
 		else {
 			throw new IllegalStateException();
 		}
 	}
 
-	public String getPIData() {
-		if (event.isProcessingInstruction()) {
-			return ((ProcessingInstruction) event).getData();
-		}
-		else {
-			throw new IllegalStateException();
-		}
+	public String getEncoding() {
+		return null;
 	}
 
-	public int getNamespaceCount() {
-		Iterator namespaces;
-		if (event.isStartElement()) {
-			namespaces = event.asStartElement().getNamespaces();
-		}
-		else if (event.isEndElement()) {
-			namespaces = event.asEndElement().getNamespaces();
+	public String getCharacterEncodingScheme() {
+		return null;
+	}
+
+	public String getPITarget() {
+		if (this.event.isProcessingInstruction()) {
+			return ((ProcessingInstruction) this.event).getTarget();
 		}
 		else {
 			throw new IllegalStateException();
 		}
-		return countIterator(namespaces);
 	}
 
-	public NamespaceContext getNamespaceContext() {
-		if (event.isStartElement()) {
-			return event.asStartElement().getNamespaceContext();
+	public String getPIData() {
+		if (this.event.isProcessingInstruction()) {
+			return ((ProcessingInstruction) this.event).getData();
 		}
 		else {
 			throw new IllegalStateException();
 		}
 	}
 
-	public QName getName() {
-		if (event.isStartElement()) {
-			return event.asStartElement().getName();
+	public int getTextStart() {
+		return 0;
+	}
+
+	public String getText() {
+		if (this.event.isCharacters()) {
+			return event.asCharacters().getData();
 		}
-		else if (event.isEndElement()) {
-			return event.asEndElement().getName();
+		else if (this.event.getEventType() == XMLEvent.COMMENT) {
+			return ((Comment) this.event).getText();
 		}
 		else {
 			throw new IllegalStateException();
 		}
 	}
 
-	public Location getLocation() {
-		return event.getLocation();
-	}
-
-	public int getEventType() {
-		return event.getEventType();
-	}
-
-	public String getEncoding() {
-		return null;
-	}
-
-	public String getCharacterEncodingScheme() {
-		return null;
-	}
-
+	@SuppressWarnings("rawtypes")
 	public int getAttributeCount() {
-		if (!event.isStartElement()) {
+		if (!this.event.isStartElement()) {
 			throw new IllegalStateException();
 		}
-		Iterator attributes = event.asStartElement().getAttributes();
+		Iterator attributes = this.event.asStartElement().getAttributes();
 		return countIterator(attributes);
 	}
 
-	public void close() throws XMLStreamException {
-		eventReader.close();
+	public boolean isAttributeSpecified(int index) {
+		return getAttribute(index).isSpecified();
 	}
 
 	public QName getAttributeName(int index) {
@@ -176,51 +169,13 @@ public String getAttributeValue(int index) {
 		return getAttribute(index).getValue();
 	}
 
-	public String getNamespacePrefix(int index) {
-		return getNamespace(index).getPrefix();
-	}
-
-	public String getNamespaceURI(int index) {
-		return getNamespace(index).getNamespaceURI();
-	}
-
-	public Object getProperty(String name) throws IllegalArgumentException {
-		return eventReader.getProperty(name);
-	}
-
-	public boolean isAttributeSpecified(int index) {
-		return getAttribute(index).isSpecified();
-	}
-
-	public int next() throws XMLStreamException {
-		event = eventReader.nextEvent();
-		return event.getEventType();
-	}
-
-	public boolean standaloneSet() {
-		if (event.isStartDocument()) {
-			return ((StartDocument) event).standaloneSet();
-		}
-		else {
-			throw new IllegalStateException();
-		}
-	}
-
-	private int countIterator(Iterator iterator) {
-		int count = 0;
-		while (iterator.hasNext()) {
-			iterator.next();
-			count++;
-		}
-		return count;
-	}
-
+	@SuppressWarnings("rawtypes")
 	private Attribute getAttribute(int index) {
-		if (!event.isStartElement()) {
+		if (!this.event.isStartElement()) {
 			throw new IllegalStateException();
 		}
 		int count = 0;
-		Iterator attributes = event.asStartElement().getAttributes();
+		Iterator attributes = this.event.asStartElement().getAttributes();
 		while (attributes.hasNext()) {
 			Attribute attribute = (Attribute) attributes.next();
 			if (count == index) {
@@ -233,13 +188,46 @@ private Attribute getAttribute(int index) {
 		throw new IllegalArgumentException();
 	}
 
+	public NamespaceContext getNamespaceContext() {
+		if (this.event.isStartElement()) {
+			return this.event.asStartElement().getNamespaceContext();
+		}
+		else {
+			throw new IllegalStateException();
+		}
+	}
+
+	@SuppressWarnings("rawtypes")
+	public int getNamespaceCount() {
+		Iterator namespaces;
+		if (this.event.isStartElement()) {
+			namespaces = this.event.asStartElement().getNamespaces();
+		}
+		else if (this.event.isEndElement()) {
+			namespaces = this.event.asEndElement().getNamespaces();
+		}
+		else {
+			throw new IllegalStateException();
+		}
+		return countIterator(namespaces);
+	}
+
+	public String getNamespacePrefix(int index) {
+		return getNamespace(index).getPrefix();
+	}
+
+	public String getNamespaceURI(int index) {
+		return getNamespace(index).getNamespaceURI();
+	}
+
+	@SuppressWarnings("rawtypes")
 	private Namespace getNamespace(int index) {
 		Iterator namespaces;
-		if (event.isStartElement()) {
-			namespaces = event.asStartElement().getNamespaces();
+		if (this.event.isStartElement()) {
+			namespaces = this.event.asStartElement().getNamespaces();
 		}
-		else if (event.isEndElement()) {
-			namespaces = event.asEndElement().getNamespaces();
+		else if (this.event.isEndElement()) {
+			namespaces = this.event.asEndElement().getNamespaces();
 		}
 		else {
 			throw new IllegalStateException();
@@ -256,4 +244,25 @@ else if (event.isEndElement()) {
 		}
 		throw new IllegalArgumentException();
 	}
+
+	public int next() throws XMLStreamException {
+		this.event = this.eventReader.nextEvent();
+		return this.event.getEventType();
+	}
+
+	public void close() throws XMLStreamException {
+		this.eventReader.close();
+	}
+
+
+	@SuppressWarnings("rawtypes")
+	private static int countIterator(Iterator iterator) {
+		int count = 0;
+		while (iterator.hasNext()) {
+			iterator.next();
+			count++;
+		}
+		return count;
+	}
+
 }
diff --git a/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java
index 37dff4fb81..d65c4a3697 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,8 @@
 import org.springframework.util.Assert;
 
 /**
- * Implementation of the {@link javax.xml.stream.XMLStreamWriter} interface that wraps a {@link XMLEventWriter}.
+ * Implementation of the {@link javax.xml.stream.XMLStreamWriter} interface
+ * that wraps an {@link XMLEventWriter}.
  *
  * @author Arjen Poutsma
  * @since 3.0.5
@@ -46,168 +47,202 @@ class XMLEventStreamWriter implements XMLStreamWriter {
 
 	private final XMLEventFactory eventFactory;
 
-	private List<EndElement> endElements = new ArrayList<EndElement>();
+	private final List<EndElement> endElements = new ArrayList<EndElement>();
+
+	private boolean emptyElement = false;
+
 
 	public XMLEventStreamWriter(XMLEventWriter eventWriter, XMLEventFactory eventFactory) {
 		Assert.notNull(eventWriter, "'eventWriter' must not be null");
 		Assert.notNull(eventFactory, "'eventFactory' must not be null");
-
 		this.eventWriter = eventWriter;
 		this.eventFactory = eventFactory;
 	}
 
-	public NamespaceContext getNamespaceContext() {
-		return eventWriter.getNamespaceContext();
+
+	public void setNamespaceContext(NamespaceContext context) throws XMLStreamException {
+		this.eventWriter.setNamespaceContext(context);
 	}
 
-	public String getPrefix(String uri) throws XMLStreamException {
-		return eventWriter.getPrefix(uri);
+	public NamespaceContext getNamespaceContext() {
+		return this.eventWriter.getNamespaceContext();
 	}
 
 	public void setPrefix(String prefix, String uri) throws XMLStreamException {
-		eventWriter.setPrefix(prefix, uri);
+		this.eventWriter.setPrefix(prefix, uri);
+	}
+
+	public String getPrefix(String uri) throws XMLStreamException {
+		return this.eventWriter.getPrefix(uri);
 	}
 
 	public void setDefaultNamespace(String uri) throws XMLStreamException {
-		eventWriter.setDefaultNamespace(uri);
+		this.eventWriter.setDefaultNamespace(uri);
 	}
 
-	public void setNamespaceContext(NamespaceContext context) throws XMLStreamException {
-		eventWriter.setNamespaceContext(context);
+	public Object getProperty(String name) throws IllegalArgumentException {
+		throw new IllegalArgumentException();
 	}
 
+
 	public void writeStartDocument() throws XMLStreamException {
-		eventWriter.add(eventFactory.createStartDocument());
+		closeEmptyElementIfNecessary();
+		this.eventWriter.add(this.eventFactory.createStartDocument());
 	}
 
 	public void writeStartDocument(String version) throws XMLStreamException {
-		eventWriter.add(eventFactory.createStartDocument(DEFAULT_ENCODING, version));
+		closeEmptyElementIfNecessary();
+		this.eventWriter.add(this.eventFactory.createStartDocument(DEFAULT_ENCODING, version));
 	}
 
 	public void writeStartDocument(String encoding, String version) throws XMLStreamException {
-		eventWriter.add(eventFactory.createStartDocument(encoding, version));
+		closeEmptyElementIfNecessary();
+		this.eventWriter.add(this.eventFactory.createStartDocument(encoding, version));
 	}
 
 	public void writeStartElement(String localName) throws XMLStreamException {
-		writeStartElement(eventFactory.createStartElement(new QName(localName), null, null));
+		closeEmptyElementIfNecessary();
+		doWriteStartElement(this.eventFactory.createStartElement(new QName(localName), null, null));
 	}
 
 	public void writeStartElement(String namespaceURI, String localName) throws XMLStreamException {
-		writeStartElement(eventFactory.createStartElement(new QName(namespaceURI, localName), null, null));
+		closeEmptyElementIfNecessary();
+		doWriteStartElement(this.eventFactory.createStartElement(new QName(namespaceURI, localName), null, null));
 	}
 
 	public void writeStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
-		writeStartElement(eventFactory.createStartElement(new QName(namespaceURI, localName, prefix), null, null));
+		closeEmptyElementIfNecessary();
+		doWriteStartElement(this.eventFactory.createStartElement(new QName(namespaceURI, localName, prefix), null, null));
+	}
+
+	private void doWriteStartElement(StartElement startElement) throws XMLStreamException {
+		this.eventWriter.add(startElement);
+		this.endElements.add(this.eventFactory.createEndElement(startElement.getName(), startElement.getNamespaces()));
 	}
 
 	public void writeEmptyElement(String localName) throws XMLStreamException {
+		closeEmptyElementIfNecessary();
 		writeStartElement(localName);
-		writeEndElement();
+		this.emptyElement = true;
 	}
 
 	public void writeEmptyElement(String namespaceURI, String localName) throws XMLStreamException {
+		closeEmptyElementIfNecessary();
 		writeStartElement(namespaceURI, localName);
-		writeEndElement();
+		this.emptyElement = true;
 	}
 
 	public void writeEmptyElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
+		closeEmptyElementIfNecessary();
 		writeStartElement(prefix, localName, namespaceURI);
-		writeEndElement();
+		this.emptyElement = true;
+	}
+
+	private void closeEmptyElementIfNecessary() throws XMLStreamException {
+		if (this.emptyElement) {
+			this.emptyElement = false;
+			writeEndElement();
+		}
 	}
 
 	public void writeEndElement() throws XMLStreamException {
-		int last = endElements.size() - 1;
-		EndElement lastEndElement = endElements.get(last);
-		eventWriter.add(lastEndElement);
-		endElements.remove(last);
+		closeEmptyElementIfNecessary();
+		int last = this.endElements.size() - 1;
+		EndElement lastEndElement = this.endElements.get(last);
+		this.eventWriter.add(lastEndElement);
+		this.endElements.remove(last);
 	}
 
 	public void writeAttribute(String localName, String value) throws XMLStreamException {
-		eventWriter.add(eventFactory.createAttribute(localName, value));
+		this.eventWriter.add(this.eventFactory.createAttribute(localName, value));
 	}
 
 	public void writeAttribute(String namespaceURI, String localName, String value) throws XMLStreamException {
-		eventWriter.add(eventFactory.createAttribute(new QName(namespaceURI, localName), value));
+		this.eventWriter.add(this.eventFactory.createAttribute(new QName(namespaceURI, localName), value));
 	}
 
 	public void writeAttribute(String prefix, String namespaceURI, String localName, String value)
 			throws XMLStreamException {
-		eventWriter.add(eventFactory.createAttribute(prefix, namespaceURI, localName, value));
+
+		this.eventWriter.add(this.eventFactory.createAttribute(prefix, namespaceURI, localName, value));
 	}
 
 	public void writeNamespace(String prefix, String namespaceURI) throws XMLStreamException {
-		writeNamespace(eventFactory.createNamespace(prefix, namespaceURI));
+		doWriteNamespace(this.eventFactory.createNamespace(prefix, namespaceURI));
 	}
 
 	public void writeDefaultNamespace(String namespaceURI) throws XMLStreamException {
-		writeNamespace(eventFactory.createNamespace(namespaceURI));
+		doWriteNamespace(this.eventFactory.createNamespace(namespaceURI));
+	}
+
+	@SuppressWarnings("rawtypes")
+	private void doWriteNamespace(Namespace namespace) throws XMLStreamException {
+		int last = this.endElements.size() - 1;
+		EndElement oldEndElement = this.endElements.get(last);
+		Iterator oldNamespaces = oldEndElement.getNamespaces();
+		List<Namespace> newNamespaces = new ArrayList<Namespace>();
+		while (oldNamespaces.hasNext()) {
+			Namespace oldNamespace = (Namespace) oldNamespaces.next();
+			newNamespaces.add(oldNamespace);
+		}
+		newNamespaces.add(namespace);
+		EndElement newEndElement = this.eventFactory.createEndElement(oldEndElement.getName(), newNamespaces.iterator());
+		this.eventWriter.add(namespace);
+		this.endElements.set(last, newEndElement);
 	}
 
 	public void writeCharacters(String text) throws XMLStreamException {
-		eventWriter.add(eventFactory.createCharacters(text));
+		closeEmptyElementIfNecessary();
+		this.eventWriter.add(this.eventFactory.createCharacters(text));
 	}
 
 	public void writeCharacters(char[] text, int start, int len) throws XMLStreamException {
-		eventWriter.add(eventFactory.createCharacters(new String(text, start, len)));
+		closeEmptyElementIfNecessary();
+		this.eventWriter.add(this.eventFactory.createCharacters(new String(text, start, len)));
 	}
 
 	public void writeCData(String data) throws XMLStreamException {
-		eventWriter.add(eventFactory.createCData(data));
+		closeEmptyElementIfNecessary();
+		this.eventWriter.add(this.eventFactory.createCData(data));
 	}
 
 	public void writeComment(String data) throws XMLStreamException {
-		eventWriter.add(eventFactory.createComment(data));
+		closeEmptyElementIfNecessary();
+		this.eventWriter.add(this.eventFactory.createComment(data));
 	}
 
 	public void writeProcessingInstruction(String target) throws XMLStreamException {
-		eventWriter.add(eventFactory.createProcessingInstruction(target, ""));
+		closeEmptyElementIfNecessary();
+		this.eventWriter.add(this.eventFactory.createProcessingInstruction(target, ""));
 	}
 
 	public void writeProcessingInstruction(String target, String data) throws XMLStreamException {
-		eventWriter.add(eventFactory.createProcessingInstruction(target, data));
+		closeEmptyElementIfNecessary();
+		this.eventWriter.add(this.eventFactory.createProcessingInstruction(target, data));
 	}
 
 	public void writeDTD(String dtd) throws XMLStreamException {
-		eventWriter.add(eventFactory.createDTD(dtd));
+		closeEmptyElementIfNecessary();
+		this.eventWriter.add(this.eventFactory.createDTD(dtd));
 	}
 
 	public void writeEntityRef(String name) throws XMLStreamException {
-		eventWriter.add(eventFactory.createEntityReference(name, null));
+		closeEmptyElementIfNecessary();
+		this.eventWriter.add(this.eventFactory.createEntityReference(name, null));
 	}
 
 	public void writeEndDocument() throws XMLStreamException {
-		eventWriter.add(eventFactory.createEndDocument());
-	}
-
-	public Object getProperty(String name) throws IllegalArgumentException {
-		throw new IllegalArgumentException();
+		closeEmptyElementIfNecessary();
+		this.eventWriter.add(this.eventFactory.createEndDocument());
 	}
 
 	public void flush() throws XMLStreamException {
-		eventWriter.flush();
+		this.eventWriter.flush();
 	}
 
 	public void close() throws XMLStreamException {
-		eventWriter.close();
-	}
-
-	private void writeStartElement(StartElement startElement) throws XMLStreamException {
-		eventWriter.add(startElement);
-		endElements.add(eventFactory.createEndElement(startElement.getName(), startElement.getNamespaces()));
+		closeEmptyElementIfNecessary();
+		this.eventWriter.close();
 	}
 
-	private void writeNamespace(Namespace namespace) throws XMLStreamException {
-		int last = endElements.size() - 1;
-		EndElement oldEndElement = endElements.get(last);
-		Iterator oldNamespaces = oldEndElement.getNamespaces();
-		List<Namespace> newNamespaces = new ArrayList<Namespace>();
-		while (oldNamespaces.hasNext()) {
-			Namespace oldNamespace = (Namespace) oldNamespaces.next();
-			newNamespaces.add(oldNamespace);
-		}
-		newNamespaces.add(namespace);
-		EndElement newEndElement = eventFactory.createEndElement(oldEndElement.getName(), newNamespaces.iterator());
-		eventWriter.add(namespace);
-		endElements.set(last, newEndElement);
-	}
 }
diff --git a/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java b/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java
index e3077e5941..d924fd15ed 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/XmlValidationModeDetector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -123,7 +123,7 @@ public int detectValidationMode(InputStream inputStream) throws IOException {
 	 * Does the content contain the the DTD DOCTYPE declaration?
 	 */
 	private boolean hasDoctype(String content) {
-		return (content.indexOf(DOCTYPE) > -1);
+		return content.contains(DOCTYPE);
 	}
 
 	/**
@@ -136,7 +136,8 @@ private boolean hasOpeningTag(String content) {
 			return false;
 		}
 		int openTagIndex = content.indexOf('<');
-		return (openTagIndex > -1 && content.length() > openTagIndex && Character.isLetter(content.charAt(openTagIndex + 1)));
+		return (openTagIndex > -1 && (content.length() > openTagIndex + 1) &&
+				Character.isLetter(content.charAt(openTagIndex + 1)));
 	}
 
 	/**
@@ -146,7 +147,7 @@ private boolean hasOpeningTag(String content) {
 	 * the DOCTYPE declaration or the root element of the document.
 	 */
 	private String consumeCommentTokens(String line) {
-		if (line.indexOf(START_COMMENT) == -1 && line.indexOf(END_COMMENT) == -1) {
+		if (!line.contains(START_COMMENT) && !line.contains(END_COMMENT)) {
 			return line;
 		}
 		while ((line = consume(line)) != null) {
diff --git a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
index 5bdc32d9a2..5495b993d0 100644
--- a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,15 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
-
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
 
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
-
 import static org.springframework.core.GenericTypeResolver.*;
 import static org.springframework.util.ReflectionUtils.*;
 
@@ -65,90 +65,108 @@ public void nullIfNotResolvable() {
 
 	@Test
 	public void methodReturnTypes() {
-		assertEquals(Integer.class, resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "integer"), MyInterfaceType.class));
-		assertEquals(String.class, resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "string"), MyInterfaceType.class));
+		assertEquals(Integer.class,
+				resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "integer"), MyInterfaceType.class));
+		assertEquals(String.class,
+				resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "string"), MyInterfaceType.class));
 		assertEquals(null, resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "raw"), MyInterfaceType.class));
-		assertEquals(null, resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "object"), MyInterfaceType.class));
+		assertEquals(null,
+				resolveReturnTypeArgument(findMethod(MyTypeWithMethods.class, "object"), MyInterfaceType.class));
 	}
 
-	/**
-	 * @since 3.2
-	 */
 	@Test
-	public void genericMethodReturnTypes() {
-
-		Method notParameterized = findMethod(MyTypeWithMethods.class, "notParameterized", new Class[] {});
-		assertEquals(String.class, resolveReturnTypeForGenericMethod(notParameterized, new Object[] {}));
+	public void testResolveType() {
+		Method intMessageMethod = findMethod(MyTypeWithMethods.class, "readIntegerInputMessage", MyInterfaceType.class);
+		MethodParameter intMessageMethodParam = new MethodParameter(intMessageMethod, 0);
+		assertEquals(MyInterfaceType.class,
+				resolveType(intMessageMethodParam.getGenericParameterType(), new HashMap<TypeVariable, Type>()));
+
+		Method intArrMessageMethod = findMethod(MyTypeWithMethods.class, "readIntegerArrayInputMessage",
+				MyInterfaceType[].class);
+		MethodParameter intArrMessageMethodParam = new MethodParameter(intArrMessageMethod, 0);
+		assertEquals(MyInterfaceType[].class,
+				resolveType(intArrMessageMethodParam.getGenericParameterType(), new HashMap<TypeVariable, Type>()));
+
+		Method genericArrMessageMethod = findMethod(MySimpleTypeWithMethods.class, "readGenericArrayInputMessage",
+				Object[].class);
+		MethodParameter genericArrMessageMethodParam = new MethodParameter(genericArrMessageMethod, 0);
+		Map<TypeVariable, Type> varMap = getTypeVariableMap(MySimpleTypeWithMethods.class);
+		assertEquals(Integer[].class, resolveType(genericArrMessageMethodParam.getGenericParameterType(), varMap));
+	}
 
-		Method notParameterizedWithArguments = findMethod(MyTypeWithMethods.class, "notParameterizedWithArguments",
-			new Class[] { Integer.class, Boolean.class });
-		assertEquals(String.class,
-			resolveReturnTypeForGenericMethod(notParameterizedWithArguments, new Object[] { 99, true }));
+	@Test
+	public void testBoundParameterizedType() {
+		assertEquals(B.class, resolveTypeArgument(TestImpl.class, ITest.class));
+	}
 
-		Method createProxy = findMethod(MyTypeWithMethods.class, "createProxy", new Class[] { Object.class });
-		assertEquals(String.class, resolveReturnTypeForGenericMethod(createProxy, new Object[] { "foo" }));
+	@Test
+	public void testGetTypeVariableMap() throws Exception {
+		Map<TypeVariable, Type> map;
+
+		map = GenericTypeResolver.getTypeVariableMap(MySimpleInterfaceType.class);
+		assertThat(map.toString(), equalTo("{T=class java.lang.String}"));
+
+		map = GenericTypeResolver.getTypeVariableMap(MyCollectionInterfaceType.class);
+		assertThat(map.toString(), equalTo("{T=java.util.Collection<java.lang.String>}"));
+
+		map = GenericTypeResolver.getTypeVariableMap(MyCollectionSuperclassType.class);
+		assertThat(map.toString(), equalTo("{T=java.util.Collection<java.lang.String>}"));
+
+		map = GenericTypeResolver.getTypeVariableMap(MySimpleTypeWithMethods.class);
+		assertThat(map.toString(), equalTo("{T=class java.lang.Integer}"));
+
+		map = GenericTypeResolver.getTypeVariableMap(TopLevelClass.class);
+		assertThat(map.toString(), equalTo("{}"));
+
+		map = GenericTypeResolver.getTypeVariableMap(TypedTopLevelClass.class);
+		assertThat(map.toString(), equalTo("{T=class java.lang.Integer}"));
+
+		map = GenericTypeResolver.getTypeVariableMap(TypedTopLevelClass.TypedNested.class);
+		assertThat(map.size(), equalTo(2));
+		Type t = null;
+		Type x = null;
+		for (Map.Entry<TypeVariable, Type> entry : map.entrySet()) {
+			if(entry.getKey().toString().equals("T")) {
+				t = entry.getValue();
+			}
+			else {
+				x = entry.getValue();
+			}
+		}
+		assertThat(t, equalTo((Type) Integer.class));
+		assertThat(x, equalTo((Type) Long.class));
+	}
 
-		Method createNamedProxyWithDifferentTypes = findMethod(MyTypeWithMethods.class, "createNamedProxy",
-			new Class[] { String.class, Object.class });
-		// one argument to few
-		assertNull(resolveReturnTypeForGenericMethod(createNamedProxyWithDifferentTypes, new Object[] { "enigma" }));
-		assertEquals(Long.class,
-			resolveReturnTypeForGenericMethod(createNamedProxyWithDifferentTypes, new Object[] { "enigma", 99L }));
+	@Test
+	public void getGenericsCannotBeResolved() throws Exception {
+		// SPR-11030
+		Class<?>[] resolved = GenericTypeResolver.resolveTypeArguments(List.class, Iterable.class);
+		// Note: to be changed to return null in Spring 4.0
+		assertThat(resolved, equalTo(new Class[] {Object.class}));
+	}
 
-		Method createNamedProxyWithDuplicateTypes = findMethod(MyTypeWithMethods.class, "createNamedProxy",
-			new Class[] { String.class, Object.class });
-		assertEquals(String.class,
-			resolveReturnTypeForGenericMethod(createNamedProxyWithDuplicateTypes, new Object[] { "enigma", "foo" }));
-
-		Method createMock = findMethod(MyTypeWithMethods.class, "createMock", new Class[] { Class.class });
-		assertEquals(Runnable.class, resolveReturnTypeForGenericMethod(createMock, new Object[] { Runnable.class }));
-
-		Method createNamedMock = findMethod(MyTypeWithMethods.class, "createNamedMock", new Class[] { String.class,
-			Class.class });
-		assertEquals(Runnable.class,
-			resolveReturnTypeForGenericMethod(createNamedMock, new Object[] { "foo", Runnable.class }));
-
-		Method createVMock = findMethod(MyTypeWithMethods.class, "createVMock",
-			new Class[] { Object.class, Class.class });
-		assertEquals(Runnable.class,
-			resolveReturnTypeForGenericMethod(createVMock, new Object[] { "foo", Runnable.class }));
-
-		// Ideally we would expect String.class instead of Object.class, but
-		// resolveReturnTypeForGenericMethod() does not currently support this form of
-		// look-up.
-		Method extractValueFrom = findMethod(MyTypeWithMethods.class, "extractValueFrom",
-			new Class[] { MyInterfaceType.class });
-		assertEquals(Object.class,
-			resolveReturnTypeForGenericMethod(extractValueFrom, new Object[] { new MySimpleInterfaceType() }));
-
-		// Ideally we would expect Boolean.class instead of Object.class, but this
-		// information is not available at run-time due to type erasure.
-		Map<Integer, Boolean> map = new HashMap<Integer, Boolean>();
-		map.put(0, false);
-		map.put(1, true);
-		Method extractMagicValue = findMethod(MyTypeWithMethods.class, "extractMagicValue", new Class[] { Map.class });
-		assertEquals(Object.class, resolveReturnTypeForGenericMethod(extractMagicValue, new Object[] { map }));
-	}
-
-	/**
-	 * @since 3.2
-	 */
 	@Test
-	public void testResolveType() {
-			Method intMessageMethod = findMethod(MyTypeWithMethods.class, "readIntegerInputMessage", MyInterfaceType.class);
-			MethodParameter intMessageMethodParam = new MethodParameter(intMessageMethod, 0);
-			assertEquals(MyInterfaceType.class,
-							resolveType(intMessageMethodParam.getGenericParameterType(), new HashMap<TypeVariable, Type>()));
+	public void getRawMapTypeCannotBeResolved() throws Exception {
+		// SPR-11052
+		Class<?>[] resolved = GenericTypeResolver.resolveTypeArguments(Map.class, Map.class);
+		assertNull(resolved);
+	}
 
-			Method intArrMessageMethod = findMethod(MyTypeWithMethods.class, "readIntegerArrayInputMessage", MyInterfaceType[].class);
-			MethodParameter intArrMessageMethodParam = new MethodParameter(intArrMessageMethod, 0);
-			assertEquals(MyInterfaceType[].class,
-							resolveType(intArrMessageMethodParam.getGenericParameterType(), new HashMap<TypeVariable, Type>()));
+	@Test
+	public void getGenericsOnArrayFromParamCannotBeResolved() throws Exception {
+		// SPR-11044
+		MethodParameter methodParameter = MethodParameter.forMethodOrConstructor(
+				WithArrayBase.class.getDeclaredMethod("array", Object[].class), 0);
+		Class<?> resolved = GenericTypeResolver.resolveParameterType(methodParameter, WithArray.class);
+		assertThat(resolved, equalTo((Class) Object[].class));
+	}
 
-			Method genericArrMessageMethod = findMethod(MySimpleTypeWithMethods.class, "readGenericArrayInputMessage", Object[].class);
-			MethodParameter genericArrMessageMethodParam = new MethodParameter(genericArrMessageMethod, 0);
-			Map<TypeVariable, Type> varMap = getTypeVariableMap(MySimpleTypeWithMethods.class);
-			assertEquals(Integer[].class, resolveType(genericArrMessageMethodParam.getGenericParameterType(), varMap));
+	@Test
+	public void getGenericsOnArrayFromReturnCannotBeResolved() throws Exception {
+		// SPR-11044
+		Class<?> resolved = GenericTypeResolver.resolveReturnType(
+				WithArrayBase.class.getDeclaredMethod("array", Object[].class), WithArray.class);
+		assertThat(resolved, equalTo((Class) Object[].class));
 	}
 
 
@@ -171,26 +189,44 @@ public class MyCollectionSuperclassType extends MySuperclassType<Collection<Stri
 	}
 
 	public static class MyTypeWithMethods<T> {
-		public MyInterfaceType<Integer> integer() { return null; }
-		public MySimpleInterfaceType string() { return null; }
-		public Object object() { return null; }
+
+		public MyInterfaceType<Integer> integer() {
+			return null;
+		}
+
+		public MySimpleInterfaceType string() {
+			return null;
+		}
+
+		public Object object() {
+			return null;
+		}
+
 		@SuppressWarnings("rawtypes")
-		public MyInterfaceType raw() { return null; }
-		public String notParameterized() { return null; }
-		public String notParameterizedWithArguments(Integer x, Boolean b) { return null; }
+		public MyInterfaceType raw() {
+			return null;
+		}
+
+		public String notParameterized() {
+			return null;
+		}
+
+		public String notParameterizedWithArguments(Integer x, Boolean b) {
+			return null;
+		}
 
 		/**
-		 * Simulates a factory method that wraps the supplied object in a proxy
-		 * of the same type.
+		 * Simulates a factory method that wraps the supplied object in a proxy of the
+		 * same type.
 		 */
 		public static <T> T createProxy(T object) {
 			return null;
 		}
 
 		/**
-		 * Similar to {@link #createProxy(Object)} but adds an additional argument
-		 * before the argument of type {@code T}. Note that they may potentially
-		 * be of the same time when invoked!
+		 * Similar to {@link #createProxy(Object)} but adds an additional argument before
+		 * the argument of type {@code T}. Note that they may potentially be of the same
+		 * time when invoked!
 		 */
 		public static <T> T createNamedProxy(String name, T object) {
 			return null;
@@ -204,8 +240,8 @@ public static <MOCK> MOCK createMock(Class<MOCK> toMock) {
 		}
 
 		/**
-		 * Similar to {@link #createMock(Class)} but adds an additional method
-		 * argument before the parameterized argument.
+		 * Similar to {@link #createMock(Class)} but adds an additional method argument
+		 * before the parameterized argument.
 		 */
 		public static <T> T createNamedMock(String name, Class<T> toMock) {
 			return null;
@@ -220,8 +256,8 @@ public static <V extends Object, T> T createVMock(V name, Class<T> toMock) {
 		}
 
 		/**
-		 * Extract some value of the type supported by the interface (i.e., by
-		 * a concrete, non-generic implementation of the interface).
+		 * Extract some value of the type supported by the interface (i.e., by a concrete,
+		 * non-generic implementation of the interface).
 		 */
 		public static <T> T extractValueFrom(MyInterfaceType<T> myInterfaceType) {
 			return null;
@@ -250,4 +286,31 @@ public static class MySimpleTypeWithMethods extends MyTypeWithMethods<Integer> {
 	static class GenericClass<T> {
 	}
 
+	class A{}
+
+	class B<T>{}
+
+	class ITest<T>{}
+
+	class TestImpl<I extends A, T extends B<I>> extends ITest<T>{
+	}
+
+	static class TopLevelClass<T> {
+		class Nested<X> {
+		}
+	}
+
+	static class TypedTopLevelClass extends TopLevelClass<Integer> {
+		class TypedNested extends Nested<Long> {
+		}
+	}
+
+	static abstract class WithArrayBase<T> {
+
+		public abstract T[] array(T... args);
+	}
+
+	static abstract class WithArray<T> extends WithArrayBase<T> {
+	}
+
 }
diff --git a/spring-core/src/test/java/org/springframework/core/ParameterizedTypeReferenceTest.java b/spring-core/src/test/java/org/springframework/core/ParameterizedTypeReferenceTests.java
similarity index 92%
rename from spring-core/src/test/java/org/springframework/core/ParameterizedTypeReferenceTest.java
rename to spring-core/src/test/java/org/springframework/core/ParameterizedTypeReferenceTests.java
index 7162d9ad93..56060b2468 100644
--- a/spring-core/src/test/java/org/springframework/core/ParameterizedTypeReferenceTest.java
+++ b/spring-core/src/test/java/org/springframework/core/ParameterizedTypeReferenceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,16 +20,17 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 /**
  * Test fixture for {@link ParameterizedTypeReference}.
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  */
-public class ParameterizedTypeReferenceTest {
+public class ParameterizedTypeReferenceTests {
 
 	@Test
 	public void map() throws NoSuchMethodException {
@@ -58,4 +59,5 @@ public static Map<Object, String> mapMethod() {
 	public static List<String> listMethod() {
 		return null;
 	}
+
 }
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAwareOrderComparatorTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAwareOrderComparatorTests.java
index 47634bb760..f2dcc480c4 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAwareOrderComparatorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationAwareOrderComparatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ public void instanceVariableIsAnAnnotationAwareOrderComparator() {
 
 	@Test
 	public void sortInstances() {
-		List<Object> list = new ArrayList<>();
+		List<Object> list = new ArrayList<Object>();
 		list.add(new B());
 		list.add(new A());
 		AnnotationAwareOrderComparator.sort(list);
@@ -45,9 +45,19 @@ public void sortInstances() {
 		assertTrue(list.get(1) instanceof B);
 	}
 
+	@Test
+	public void sortInstancesWithSubclass() {
+		List<Object> list = new ArrayList<Object>();
+		list.add(new B());
+		list.add(new C());
+		AnnotationAwareOrderComparator.sort(list);
+		assertTrue(list.get(0) instanceof C);
+		assertTrue(list.get(1) instanceof B);
+	}
+
 	@Test
 	public void sortClasses() {
-		List<Object> list = new ArrayList<>();
+		List<Object> list = new ArrayList<Object>();
 		list.add(B.class);
 		list.add(A.class);
 		AnnotationAwareOrderComparator.sort(list);
@@ -55,6 +65,16 @@ public void sortClasses() {
 		assertEquals(B.class, list.get(1));
 	}
 
+	@Test
+	public void sortClassesWithSubclass() {
+		List<Object> list = new ArrayList<Object>();
+		list.add(B.class);
+		list.add(C.class);
+		AnnotationAwareOrderComparator.sort(list);
+		assertEquals(C.class, list.get(0));
+		assertEquals(B.class, list.get(1));
+	}
+
 
 	@Order(1)
 	private static class A {
@@ -64,4 +84,7 @@ private static class A {
 	private static class B {
 	}
 
+	private static class C extends A {
+	}
+
 }
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
index 9f7e76b0c9..d4b6d5ee90 100644
--- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
@@ -16,15 +16,11 @@
 
 package org.springframework.core.annotation;
 
-import static org.junit.Assert.*;
-import static org.springframework.core.annotation.AnnotationUtils.*;
-
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
-
 import java.util.Arrays;
 import java.util.List;
 
@@ -33,6 +29,9 @@
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Component;
 
+import static org.junit.Assert.*;
+import static org.springframework.core.annotation.AnnotationUtils.*;
+
 /**
  * Unit tests for {@link AnnotationUtils}.
  *
@@ -44,54 +43,49 @@
 public class AnnotationUtilsTests {
 
 	@Test
-	public void testFindMethodAnnotationOnLeaf() throws SecurityException, NoSuchMethodException {
-
-		final Method m = Leaf.class.getMethod("annotatedOnLeaf", (Class[]) null);
+	public void findMethodAnnotationOnLeaf() throws Exception {
+		Method m = Leaf.class.getMethod("annotatedOnLeaf", (Class[]) null);
 		assertNotNull(m.getAnnotation(Order.class));
 		assertNotNull(getAnnotation(m, Order.class));
 		assertNotNull(findAnnotation(m, Order.class));
 	}
 
 	@Test
-	public void testFindMethodAnnotationOnRoot() throws SecurityException, NoSuchMethodException {
-
-		final Method m = Leaf.class.getMethod("annotatedOnRoot", (Class[]) null);
+	public void findMethodAnnotationOnRoot() throws Exception {
+		Method m = Leaf.class.getMethod("annotatedOnRoot", (Class[]) null);
 		assertNotNull(m.getAnnotation(Order.class));
 		assertNotNull(getAnnotation(m, Order.class));
 		assertNotNull(findAnnotation(m, Order.class));
 	}
 
 	@Test
-	public void testFindMethodAnnotationOnRootButOverridden() throws SecurityException, NoSuchMethodException {
-
-		final Method m = Leaf.class.getMethod("overrideWithoutNewAnnotation", (Class[]) null);
+	public void findMethodAnnotationOnRootButOverridden() throws Exception {
+		Method m = Leaf.class.getMethod("overrideWithoutNewAnnotation", (Class[]) null);
 		assertNull(m.getAnnotation(Order.class));
 		assertNull(getAnnotation(m, Order.class));
 		assertNotNull(findAnnotation(m, Order.class));
 	}
 
 	@Test
-	public void testFindMethodAnnotationNotAnnotated() throws SecurityException, NoSuchMethodException {
-
-		final Method m = Leaf.class.getMethod("notAnnotated", (Class[]) null);
+	public void findMethodAnnotationNotAnnotated() throws Exception {
+		Method m = Leaf.class.getMethod("notAnnotated", (Class[]) null);
 		assertNull(findAnnotation(m, Order.class));
 	}
 
 	@Test
-	public void testFindMethodAnnotationOnBridgeMethod() throws Exception {
-
-		final Method m = SimpleFoo.class.getMethod("something", Object.class);
+	public void findMethodAnnotationOnBridgeMethod() throws Exception {
+		Method m = SimpleFoo.class.getMethod("something", Object.class);
 		assertTrue(m.isBridge());
 		assertNull(m.getAnnotation(Order.class));
 		assertNull(getAnnotation(m, Order.class));
 		assertNotNull(findAnnotation(m, Order.class));
-		assertNull(m.getAnnotation(Transactional.class));
+		// TODO: actually found on OpenJDK 8 b99! assertNull(m.getAnnotation(Transactional.class));
 		assertNotNull(getAnnotation(m, Transactional.class));
 		assertNotNull(findAnnotation(m, Transactional.class));
 	}
 
 	// TODO consider whether we want this to handle annotations on interfaces
-	// public void testFindMethodAnnotationFromInterfaceImplementedByRoot()
+	// public void findMethodAnnotationFromInterfaceImplementedByRoot()
 	// throws Exception {
 	// Method m = Leaf.class.getMethod("fromInterfaceImplementedByRoot",
 	// (Class[]) null);
@@ -101,7 +95,6 @@ public void testFindMethodAnnotationOnBridgeMethod() throws Exception {
 
 	@Test
 	public void testFindAnnotationDeclaringClass() throws Exception {
-
 		// no class-level annotation
 		assertNull(findAnnotationDeclaringClass(Transactional.class, NonAnnotatedInterface.class));
 		assertNull(findAnnotationDeclaringClass(Transactional.class, NonAnnotatedClass.class));
@@ -128,7 +121,6 @@ public void testFindAnnotationDeclaringClass() throws Exception {
 
 	@Test
 	public void findAnnotationDeclaringClassForTypesWithSingleCandidateType() {
-
 		// no class-level annotation
 		List<Class<? extends Annotation>> transactionalCandidateList = Arrays.<Class<? extends Annotation>> asList(Transactional.class);
 		assertNull(findAnnotationDeclaringClassForTypes(transactionalCandidateList, NonAnnotatedInterface.class));
@@ -137,8 +129,7 @@ public void findAnnotationDeclaringClassForTypesWithSingleCandidateType() {
 		// inherited class-level annotation; note: @Transactional is inherited
 		assertEquals(InheritedAnnotationInterface.class,
 			findAnnotationDeclaringClassForTypes(transactionalCandidateList, InheritedAnnotationInterface.class));
-		assertNull(findAnnotationDeclaringClassForTypes(transactionalCandidateList,
-			SubInheritedAnnotationInterface.class));
+		assertNull(findAnnotationDeclaringClassForTypes(transactionalCandidateList, SubInheritedAnnotationInterface.class));
 		assertEquals(InheritedAnnotationClass.class,
 			findAnnotationDeclaringClassForTypes(transactionalCandidateList, InheritedAnnotationClass.class));
 		assertEquals(InheritedAnnotationClass.class,
@@ -158,9 +149,7 @@ public void findAnnotationDeclaringClassForTypesWithSingleCandidateType() {
 
 	@Test
 	public void findAnnotationDeclaringClassForTypesWithMultipleCandidateTypes() {
-
-		List<Class<? extends Annotation>> candidates = Arrays.<Class<? extends Annotation>> asList(Transactional.class,
-			Order.class);
+		List<Class<? extends Annotation>> candidates = Arrays.<Class<? extends Annotation>> asList(Transactional.class, Order.class);
 
 		// no class-level annotation
 		assertNull(findAnnotationDeclaringClassForTypes(candidates, NonAnnotatedInterface.class));
@@ -196,7 +185,6 @@ public void findAnnotationDeclaringClassForTypesWithMultipleCandidateTypes() {
 
 	@Test
 	public void testIsAnnotationDeclaredLocally() throws Exception {
-
 		// no class-level annotation
 		assertFalse(isAnnotationDeclaredLocally(Transactional.class, NonAnnotatedInterface.class));
 		assertFalse(isAnnotationDeclaredLocally(Transactional.class, NonAnnotatedClass.class));
@@ -216,7 +204,6 @@ public void testIsAnnotationDeclaredLocally() throws Exception {
 
 	@Test
 	public void testIsAnnotationInherited() throws Exception {
-
 		// no class-level annotation
 		assertFalse(isAnnotationInherited(Transactional.class, NonAnnotatedInterface.class));
 		assertFalse(isAnnotationInherited(Transactional.class, NonAnnotatedClass.class));
@@ -238,51 +225,48 @@ public void testIsAnnotationInherited() throws Exception {
 	}
 
 	@Test
-	public void testGetValueFromAnnotation() throws Exception {
-
-		final Method method = SimpleFoo.class.getMethod("something", Object.class);
-		final Order order = findAnnotation(method, Order.class);
+	public void getValueFromAnnotation() throws Exception {
+		Method method = SimpleFoo.class.getMethod("something", Object.class);
+		Order order = findAnnotation(method, Order.class);
 
 		assertEquals(1, AnnotationUtils.getValue(order, AnnotationUtils.VALUE));
 		assertEquals(1, AnnotationUtils.getValue(order));
 	}
 
 	@Test
-	public void testGetDefaultValueFromAnnotation() throws Exception {
-
-		final Method method = SimpleFoo.class.getMethod("something", Object.class);
-		final Order order = findAnnotation(method, Order.class);
+	public void getValueFromNonPublicAnnotation() throws Exception {
+		Method method = SimpleFoo.class.getMethod("something", Object.class);
+		Order order = findAnnotation(method, Order.class);
 
 		assertEquals(Ordered.LOWEST_PRECEDENCE, AnnotationUtils.getDefaultValue(order, AnnotationUtils.VALUE));
 		assertEquals(Ordered.LOWEST_PRECEDENCE, AnnotationUtils.getDefaultValue(order));
 	}
 
 	@Test
-	public void testGetDefaultValueFromAnnotationType() throws Exception {
+	public void getDefaultValueFromAnnotation() throws Exception {
+		Method method = SimpleFoo.class.getMethod("something", Object.class);
+		Order order = findAnnotation(method, Order.class);
 
-		assertEquals(Ordered.LOWEST_PRECEDENCE, AnnotationUtils.getDefaultValue(Order.class, AnnotationUtils.VALUE));
-		assertEquals(Ordered.LOWEST_PRECEDENCE, AnnotationUtils.getDefaultValue(Order.class));
+		assertEquals(Ordered.LOWEST_PRECEDENCE, AnnotationUtils.getDefaultValue(order, AnnotationUtils.VALUE));
+		assertEquals(Ordered.LOWEST_PRECEDENCE, AnnotationUtils.getDefaultValue(order));
 	}
 
 	@Test
-	public void testFindAnnotationFromInterface() throws Exception {
-
+	public void getDefaultValueFromNonPublicAnnotation() throws Exception {
 		Method method = ImplementsInterfaceWithAnnotatedMethod.class.getMethod("foo");
 		Order order = findAnnotation(method, Order.class);
 		assertNotNull(order);
 	}
 
 	@Test
-	public void testFindAnnotationFromInterfaceOnSuper() throws Exception {
-
+	public void findAnnotationFromInterfaceOnSuper() throws Exception {
 		Method method = SubOfImplementsInterfaceWithAnnotatedMethod.class.getMethod("foo");
 		Order order = findAnnotation(method, Order.class);
 		assertNotNull(order);
 	}
 
 	@Test
-	public void testFindAnnotationFromInterfaceWhenSuperDoesNotImplementMethod() throws Exception {
-
+	public void findAnnotationFromInterfaceWhenSuperDoesNotImplementMethod() throws Exception {
 		Method method = SubOfAbstractImplementsInterfaceWithAnnotatedMethod.class.getMethod("foo");
 		Order order = findAnnotation(method, Order.class);
 		assertNotNull(order);
@@ -356,6 +340,12 @@ public void overrideWithoutNewAnnotation() {
 		}
 	}
 
+	@Retention(RetentionPolicy.RUNTIME)
+	@Inherited
+	@interface Transactional {
+
+	}
+
 	public static abstract class Foo<T> {
 
 		@Order(1)
@@ -449,9 +439,3 @@ public void foo() {
 	}
 
 }
-
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@interface Transactional {
-
-}
diff --git a/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java b/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
index 6597ab46a7..7af9d19f87 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
@@ -16,6 +16,10 @@
 
 package org.springframework.core.convert;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -32,6 +36,7 @@
 import org.junit.Test;
 import org.springframework.core.MethodParameter;
 
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 /**
@@ -870,4 +875,16 @@ public void createStringArray() throws Exception {
 	public void createNullArray() throws Exception {
 		assertNull(TypeDescriptor.array(null));
 	}
+
+	@Test
+	public void serializable() throws Exception {
+		TypeDescriptor typeDescriptor = TypeDescriptor.forObject("");
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		ObjectOutputStream outputStream = new ObjectOutputStream(out);
+		outputStream.writeObject(typeDescriptor);
+		ObjectInputStream inputStream = new ObjectInputStream(new ByteArrayInputStream(
+				out.toByteArray()));
+		TypeDescriptor readObject = (TypeDescriptor) inputStream.readObject();
+		assertThat(readObject, equalTo(typeDescriptor));
+	}
 }
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
index 9e12a26d77..fc5093dd60 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,16 +43,20 @@
 
 /**
  * @author Keith Donald
+ * @author Juergen Hoeller
+ * @author Stephane Nicoll
  */
 public class CollectionToCollectionConverterTests {
 
 	private GenericConversionService conversionService = new GenericConversionService();
 
+
 	@Before
 	public void setUp() {
 		conversionService.addConverter(new CollectionToCollectionConverter(conversionService));
 	}
 
+
 	@Test
 	public void scalarList() throws Exception {
 		List<String> list = new ArrayList<String>();
@@ -63,20 +67,19 @@ public void scalarList() throws Exception {
 		assertTrue(conversionService.canConvert(sourceType, targetType));
 		try {
 			conversionService.convert(list, sourceType, targetType);
-		} catch (ConversionFailedException e) {
-			assertTrue(e.getCause() instanceof ConverterNotFoundException);
+		}
+		catch (ConversionFailedException ex) {
+			assertTrue(ex.getCause() instanceof ConverterNotFoundException);
 		}
 		conversionService.addConverterFactory(new StringToNumberConverterFactory());
 		assertTrue(conversionService.canConvert(sourceType, targetType));
 		@SuppressWarnings("unchecked")
-		List<String> result = (List<String>) conversionService.convert(list, sourceType, targetType);
+		List<Integer> result = (List<Integer>) conversionService.convert(list, sourceType, targetType);
 		assertFalse(list.equals(result));
-		assertEquals(9, result.get(0));
-		assertEquals(37, result.get(1));
+		assertEquals(9, result.get(0).intValue());
+		assertEquals(37, result.get(1).intValue());
 	}
 
-	public ArrayList<Integer> scalarListTarget;
-
 	@Test
 	public void emptyListToList() throws Exception {
 		conversionService.addConverter(new CollectionToCollectionConverter(conversionService));
@@ -88,8 +91,6 @@ public void emptyListToList() throws Exception {
 		assertEquals(list, conversionService.convert(list, sourceType, targetType));
 	}
 
-	public List<Integer> emptyListTarget;
-
 	@Test
 	public void emptyListToListDifferentTargetType() throws Exception {
 		conversionService.addConverter(new CollectionToCollectionConverter(conversionService));
@@ -104,8 +105,6 @@ public void emptyListToListDifferentTargetType() throws Exception {
 		assertTrue(result.isEmpty());
 	}
 
-	public LinkedList<Integer> emptyListDifferentTarget;
-
 	@Test
 	public void collectionToObjectInteraction() throws Exception {
 		List<List<String>> list = new ArrayList<List<String>>();
@@ -141,14 +140,12 @@ public void objectToCollection() throws Exception {
 		TypeDescriptor targetType = new TypeDescriptor(getClass().getField("objectToCollection"));
 		assertTrue(conversionService.canConvert(sourceType, targetType));
 		List<List<List<Integer>>> result = (List<List<List<Integer>>>) conversionService.convert(list, sourceType, targetType);
-		assertEquals((Integer)9, result.get(0).get(0).get(0));
-		assertEquals((Integer)12, result.get(0).get(1).get(0));
-		assertEquals((Integer)37, result.get(1).get(0).get(0));
-		assertEquals((Integer)23, result.get(1).get(1).get(0));
+		assertEquals((Integer) 9, result.get(0).get(0).get(0));
+		assertEquals((Integer) 12, result.get(0).get(1).get(0));
+		assertEquals((Integer) 37, result.get(1).get(0).get(0));
+		assertEquals((Integer) 23, result.get(1).get(1).get(0));
 	}
 
-	public List<List<List<Integer>>> objectToCollection;
-
 	@Test
 	@SuppressWarnings("unchecked")
 	public void stringToCollection() throws Exception {
@@ -163,10 +160,46 @@ public void stringToCollection() throws Exception {
 		TypeDescriptor targetType = new TypeDescriptor(getClass().getField("objectToCollection"));
 		assertTrue(conversionService.canConvert(sourceType, targetType));
 		List<List<List<Integer>>> result = (List<List<List<Integer>>>) conversionService.convert(list, sourceType, targetType);
-		assertEquals((Integer)9, result.get(0).get(0).get(0));
-		assertEquals((Integer)12, result.get(0).get(0).get(1));
-		assertEquals((Integer)37, result.get(1).get(0).get(0));
-		assertEquals((Integer)23, result.get(1).get(0).get(1));
+		assertEquals((Integer) 9, result.get(0).get(0).get(0));
+		assertEquals((Integer) 12, result.get(0).get(0).get(1));
+		assertEquals((Integer) 37, result.get(1).get(0).get(0));
+		assertEquals((Integer) 23, result.get(1).get(0).get(1));
+	}
+
+	@Test
+	public void convertEmptyVector_shouldReturnEmptyArrayList() {
+		Vector<String> vector = new Vector<String>();
+		vector.add("Element");
+		testCollectionConversionToArrayList(vector);
+	}
+
+	@Test
+	public void convertNonEmptyVector_shouldReturnNonEmptyArrayList() {
+		Vector<String> vector = new Vector<String>();
+		vector.add("Element");
+		testCollectionConversionToArrayList(vector);
+	}
+
+	@Test
+	public void testCollectionsEmptyList() throws Exception {
+		CollectionToCollectionConverter converter = new CollectionToCollectionConverter(new GenericConversionService());
+		TypeDescriptor type = new TypeDescriptor(getClass().getField("list"));
+		converter.convert(list, type, TypeDescriptor.valueOf(Class.forName("java.util.Collections$EmptyList")));
+	}
+
+	@SuppressWarnings("rawtypes")
+	private void testCollectionConversionToArrayList(Collection<String> aSource) {
+		Object myConverted = (new CollectionToCollectionConverter(new GenericConversionService())).convert(
+				aSource, TypeDescriptor.forObject(aSource), TypeDescriptor.forObject(new ArrayList()));
+		assertTrue(myConverted instanceof ArrayList<?>);
+		assertEquals(aSource.size(), ((ArrayList<?>) myConverted).size());
+	}
+
+	@Test
+	public void listToCollectionNoCopyRequired() throws NoSuchFieldException {
+		List<?> input = new ArrayList<String>(Arrays.asList("foo", "bar"));
+		assertSame(input, conversionService.convert(input, TypeDescriptor.forObject(input),
+				new TypeDescriptor(getClass().getField("wildcardCollection"))));
 	}
 
 	@Test
@@ -199,7 +232,7 @@ public void allNulls() throws Exception {
 		assertSame(resources, conversionService.convert(resources, sourceType, new TypeDescriptor(getClass().getField("resources"))));
 	}
 
-	@Test(expected=ConverterNotFoundException.class)
+	@Test(expected = ConverterNotFoundException.class)
 	public void elementTypesNotConvertible() throws Exception {
 		List<String> resources = new ArrayList<String>();
 		resources.add(null);
@@ -208,9 +241,7 @@ public void elementTypesNotConvertible() throws Exception {
 		assertEquals(resources, conversionService.convert(resources, sourceType, new TypeDescriptor(getClass().getField("resources"))));
 	}
 
-	public List<String> strings;
-
-	@Test(expected=ConversionFailedException.class)
+	@Test(expected = ConversionFailedException.class)
 	public void nothingInCommon() throws Exception {
 		List<Object> resources = new ArrayList<Object>();
 		resources.add(new ClassPathResource("test"));
@@ -219,8 +250,24 @@ public void nothingInCommon() throws Exception {
 		assertEquals(resources, conversionService.convert(resources, sourceType, new TypeDescriptor(getClass().getField("resources"))));
 	}
 
+
+	public ArrayList<Integer> scalarListTarget;
+
+	public List<Integer> emptyListTarget;
+
+	public LinkedList<Integer> emptyListDifferentTarget;
+
+	public List<List<List<Integer>>> objectToCollection;
+
+	public List<String> strings;
+
+	public List<?> list = Collections.emptyList();
+
+	public Collection<?> wildcardCollection = Collections.emptyList();
+
 	public List<Resource> resources;
 
+
 	public static abstract class BaseResource implements Resource {
 
 		@Override
@@ -284,39 +331,8 @@ public String getDescription() {
 		}
 	}
 
-	public static class TestResource extends BaseResource {
-
-	}
-
-	@Test
-	public void convertEmptyVector_shouldReturnEmptyArrayList() {
-		Vector<String> vector = new Vector<String>();
-		vector.add("Element");
-		testCollectionConversionToArrayList(vector);
-	}
 
-	@Test
-	public void convertNonEmptyVector_shouldReturnNonEmptyArrayList() {
-		Vector<String> vector = new Vector<String>();
-		vector.add("Element");
-		testCollectionConversionToArrayList(vector);
-	}
-
-	@Test
-	public void testCollectionsEmptyList() throws Exception {
-		CollectionToCollectionConverter converter = new CollectionToCollectionConverter(new GenericConversionService());
-		TypeDescriptor type = new TypeDescriptor(getClass().getField("list"));
-		converter.convert(list, type, TypeDescriptor.valueOf(Class.forName("java.util.Collections$EmptyList")));
-	}
-
-	public List list = Collections.emptyList();
-
-	@SuppressWarnings("rawtypes")
-	private void testCollectionConversionToArrayList(Collection<String> aSource) {
-		Object myConverted = (new CollectionToCollectionConverter(new GenericConversionService())).convert(
-				aSource, TypeDescriptor.forObject(aSource), TypeDescriptor.forObject(new ArrayList()));
-		assertTrue(myConverted instanceof ArrayList<?>);
-		assertEquals(aSource.size(), ((ArrayList<?>) myConverted).size());
+	public static class TestResource extends BaseResource {
 	}
 
 }
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java
index ba42cddf9d..f3498894c1 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,6 @@
 
 package org.springframework.core.convert.support;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
 import java.awt.Color;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -45,6 +35,7 @@
 import java.util.Set;
 
 import org.junit.Test;
+
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.ConverterNotFoundException;
@@ -52,13 +43,17 @@
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConverterRegistry;
 
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
 /**
  * @author Keith Donald
  * @author Juergen Hoeller
  */
 public class DefaultConversionTests {
 
-	private DefaultConversionService conversionService = new DefaultConversionService();
+	private final DefaultConversionService conversionService = new DefaultConversionService();
+
 
 	@Test
 	public void testStringToCharacter() {
@@ -214,7 +209,7 @@ public void testStringToEnum() throws Exception {
 	}
 
 	@Test
-	public void testStringToEnumWithSubclss() throws Exception {
+	public void testStringToEnumWithSubclass() throws Exception {
 		assertEquals(SubFoo.BAZ, conversionService.convert("BAZ", SubFoo.BAR.getClass()));
 	}
 
@@ -229,7 +224,7 @@ public void testEnumToString() {
 	}
 
 	public static enum Foo {
-		BAR, BAZ;
+		BAR, BAZ
 	}
 
 	public static enum SubFoo {
@@ -730,62 +725,6 @@ public void convertObjectToObjectNoValueOFMethodOrConstructor() {
 		conversionService.convert(new Long(3), SSN.class);
 	}
 
-	public Object assignableTarget;
-
-	private static class SSN {
-
-		private String value;
-
-		public SSN(String value) {
-			this.value = value;
-		}
-
-		public boolean equals(Object o) {
-			if (!(o instanceof SSN)) {
-				return false;
-			}
-			SSN ssn = (SSN) o;
-			return this.value.equals(ssn.value);
-		}
-
-		public int hashCode() {
-			return value.hashCode();
-		}
-
-		public String toString() {
-			return value;
-		}
-	}
-
-	private static class ISBN {
-
-		private String value;
-
-		private ISBN(String value) {
-			this.value = value;
-		}
-
-		public boolean equals(Object o) {
-			if (!(o instanceof ISBN)) {
-				return false;
-			}
-			ISBN isbn = (ISBN) o;
-			return this.value.equals(isbn.value);
-		}
-
-		public int hashCode() {
-			return value.hashCode();
-		}
-
-		public String toString() {
-			return value;
-		}
-
-		public static ISBN valueOf(String value) {
-			return new ISBN(value);
-		}
-	}
-
 	@Test
 	public void convertObjectToObjectFinderMethod() {
 		TestEntity e = conversionService.convert(1L, TestEntity.class);
@@ -828,6 +767,16 @@ public char[] convert(String source) {
 		assertThat(converted, equalTo(new char[] { 'a', 'b', 'c' }));
 	}
 
+	@Test
+	public void multidimensionalArrayToListConversionShouldConvertEntriesCorrectly() {
+		String[][] grid = new String[][] { new String[] { "1", "2", "3", "4" }, new String[] { "5", "6", "7", "8" },
+				new String[] { "9", "10", "11", "12" } };
+		List<String[]> converted = conversionService.convert(grid, List.class);
+		String[][] convertedBack = conversionService.convert(converted, String[][].class);
+		assertArrayEquals(grid, convertedBack);
+	}
+
+
 	public static class TestEntity {
 
 		private Long id;
@@ -845,6 +794,7 @@ public static TestEntity findTestEntity(Long id) {
 		}
 	}
 
+
 	private static class ListWrapper {
 
 		private List<?> list;
@@ -858,4 +808,69 @@ public List<?> getList() {
 		}
 	}
 
+
+	public Object assignableTarget;
+
+
+	private static class SSN {
+
+		private String value;
+
+		public SSN(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (!(o instanceof SSN)) {
+				return false;
+			}
+			SSN ssn = (SSN) o;
+			return this.value.equals(ssn.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return value.hashCode();
+		}
+
+		@Override
+		public String toString() {
+			return value;
+		}
+	}
+
+
+	private static class ISBN {
+
+		private String value;
+
+		private ISBN(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (!(o instanceof ISBN)) {
+				return false;
+			}
+			ISBN isbn = (ISBN) o;
+			return this.value.equals(isbn.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return value.hashCode();
+		}
+
+		@Override
+		public String toString() {
+			return value;
+		}
+
+		public static ISBN valueOf(String value) {
+			return new ISBN(value);
+		}
+	}
+
 }
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
index c08cdeebb7..8af4f8601f 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -49,18 +50,20 @@
 import org.springframework.util.StopWatch;
 import org.springframework.util.StringUtils;
 
-import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 /**
  * @author Keith Donald
  * @author Juergen Hoeller
  * @author Phillip Webb
+ * @author David Haraburda
  */
 public class GenericConversionServiceTests {
 
 	private GenericConversionService conversionService = new GenericConversionService();
 
+
 	@Test
 	public void canConvert() {
 		assertFalse(conversionService.canConvert(String.class, Integer.class));
@@ -81,14 +84,14 @@ public void canConvertIllegalArgumentNullTargetType() {
 		try {
 			assertFalse(conversionService.canConvert(String.class, null));
 			fail("Should have failed");
-		} catch (IllegalArgumentException e) {
-
+		}
+		catch (IllegalArgumentException ex) {
 		}
 		try {
 			assertFalse(conversionService.canConvert(TypeDescriptor.valueOf(String.class), null));
 			fail("Should have failed");
-		} catch (IllegalArgumentException e) {
-
+		}
+		catch (IllegalArgumentException ex) {
 		}
 	}
 
@@ -151,8 +154,8 @@ public Object convert(Object source) {
 				}
 			});
 			fail("Should have failed");
-		} catch (IllegalArgumentException e) {
-
+		}
+		catch (IllegalArgumentException ex) {
 		}
 	}
 
@@ -254,7 +257,8 @@ public void genericConverterDelegatingBackToConversionServiceConverterNotFound()
 		try {
 			conversionService.convert("3,4,5", Integer[].class);
 			fail("should have failed");
-		} catch (ConverterNotFoundException e) {
+		}
+		catch (ConverterNotFoundException ex) {
 		}
 	}
 
@@ -389,7 +393,7 @@ public void testIgnoreCopyConstructor() {
 	}
 
 	@Test
-	public void testConvertUUID() throws Exception {
+	public void testConvertUUID() {
 		GenericConversionService service = new DefaultConversionService();
 		UUID uuid = UUID.randomUUID();
 		String convertToString = service.convert(uuid, String.class);
@@ -472,7 +476,7 @@ public void testPerformance3() throws Exception {
 	public static Map<String, Integer> map;
 
 	@Test
-	public void emptyListToArray() throws Exception {
+	public void emptyListToArray() {
 		conversionService.addConverter(new CollectionToArrayConverter(conversionService));
 		conversionService.addConverterFactory(new StringToNumberConverterFactory());
 		List<String> list = new ArrayList<String>();
@@ -483,7 +487,7 @@ public void emptyListToArray() throws Exception {
 	}
 
 	@Test
-	public void emptyListToObject() throws Exception {
+	public void emptyListToObject() {
 		conversionService.addConverter(new CollectionToObjectConverter(conversionService));
 		conversionService.addConverterFactory(new StringToNumberConverterFactory());
 		List<String> list = new ArrayList<String>();
@@ -590,14 +594,14 @@ public void stringToCollectionCanConvert() throws Exception {
 	public Collection<Integer> stringToCollection;
 
 	@Test
-	public void testConvertiblePairsInSet() throws Exception {
+	public void testConvertiblePairsInSet() {
 		Set<GenericConverter.ConvertiblePair> set = new HashSet<GenericConverter.ConvertiblePair>();
 		set.add(new GenericConverter.ConvertiblePair(Number.class, String.class));
 		assert set.contains(new GenericConverter.ConvertiblePair(Number.class, String.class));
 	}
 
 	@Test
-	public void testConvertiblePairEqualsAndHash() throws Exception {
+	public void testConvertiblePairEqualsAndHash() {
 		GenericConverter.ConvertiblePair pair = new GenericConverter.ConvertiblePair(Number.class, String.class);
 		GenericConverter.ConvertiblePair pairEqual = new GenericConverter.ConvertiblePair(Number.class, String.class);
 		assertEquals(pair, pairEqual);
@@ -605,7 +609,7 @@ public void testConvertiblePairEqualsAndHash() throws Exception {
 	}
 
 	@Test
-	public void testConvertiblePairDifferentEqualsAndHash() throws Exception {
+	public void testConvertiblePairDifferentEqualsAndHash() {
 		GenericConverter.ConvertiblePair pair = new GenericConverter.ConvertiblePair(Number.class, String.class);
 		GenericConverter.ConvertiblePair pairOpposite = new GenericConverter.ConvertiblePair(String.class, Number.class);
 		assertFalse(pair.equals(pairOpposite));
@@ -613,11 +617,11 @@ public void testConvertiblePairDifferentEqualsAndHash() throws Exception {
 	}
 
 	@Test
-	public void convertPrimitiveArray() throws Exception {
+	public void convertPrimitiveArray() {
 		GenericConversionService conversionService = new DefaultConversionService();
 		byte[] byteArray = new byte[] { 1, 2, 3 };
 		Byte[] converted = conversionService.convert(byteArray, Byte[].class);
-		assertTrue(Arrays.equals(converted, new Byte[] { 1, 2, 3 }));
+		assertTrue(Arrays.equals(converted, new Byte[] {1, 2, 3}));
 	}
 
 	@Test
@@ -625,7 +629,8 @@ public void canConvertIllegalArgumentNullTargetTypeFromClass() {
 		try {
 			conversionService.canConvert(String.class, null);
 			fail("Did not thow IllegalArgumentException");
-		} catch(IllegalArgumentException e) {
+		}
+		catch (IllegalArgumentException ex) {
 		}
 	}
 
@@ -634,13 +639,14 @@ public void canConvertIllegalArgumentNullTargetTypeFromTypeDescriptor() {
 		try {
 			conversionService.canConvert(TypeDescriptor.valueOf(String.class), null);
 			fail("Did not thow IllegalArgumentException");
-		} catch(IllegalArgumentException e) {
+		}
+		catch(IllegalArgumentException ex) {
 		}
 	}
 
 	@Test
 	@SuppressWarnings({ "rawtypes" })
-	public void convertHashMapValuesToList() throws Exception {
+	public void convertHashMapValuesToList() {
 		GenericConversionService conversionService = new DefaultConversionService();
 		Map<String, Integer> hashMap = new LinkedHashMap<String, Integer>();
 		hashMap.put("1", 1);
@@ -650,7 +656,7 @@ public void convertHashMapValuesToList() throws Exception {
 	}
 
 	@Test
-	public void removeConvertible() throws Exception {
+	public void removeConvertible() {
 		conversionService.addConverter(new ColorConverter());
 		assertTrue(conversionService.canConvert(String.class, Color.class));
 		conversionService.removeConvertible(String.class, Color.class);
@@ -658,7 +664,7 @@ public void removeConvertible() throws Exception {
 	}
 
 	@Test
-	public void conditionalConverter() throws Exception {
+	public void conditionalConverter() {
 		GenericConversionService conversionService = new GenericConversionService();
 		MyConditionalConverter converter = new MyConditionalConverter();
 		conversionService.addConverter(new ColorConverter());
@@ -668,7 +674,7 @@ public void conditionalConverter() throws Exception {
 	}
 
 	@Test
-	public void conditionalConverterFactory() throws Exception {
+	public void conditionalConverterFactory() {
 		GenericConversionService conversionService = new GenericConversionService();
 		MyConditionalConverterFactory converter = new MyConditionalConverterFactory();
 		conversionService.addConverter(new ColorConverter());
@@ -679,32 +685,29 @@ public void conditionalConverterFactory() throws Exception {
 	}
 
 	@Test
-	public void shouldNotSuportNullConvertibleTypesFromNonConditionalGenericConverter()
-			throws Exception {
+	public void shouldNotSupportNullConvertibleTypesFromNonConditionalGenericConverter() {
 		GenericConversionService conversionService = new GenericConversionService();
 		GenericConverter converter = new GenericConverter() {
-
 			@Override
 			public Set<ConvertiblePair> getConvertibleTypes() {
 				return null;
 			}
-
 			@Override
-			public Object convert(Object source, TypeDescriptor sourceType,
-					TypeDescriptor targetType) {
+			public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 				return null;
 			}
 		};
 		try {
 			conversionService.addConverter(converter);
 			fail("Did not throw");
-		} catch (IllegalStateException e) {
-			assertEquals("Only conditional converters may return null convertible types", e.getMessage());
+		}
+		catch (IllegalStateException ex) {
+			assertEquals("Only conditional converters may return null convertible types", ex.getMessage());
 		}
 	}
 
 	@Test
-	public void conditionalConversionForAllTypes() throws Exception {
+	public void conditionalConversionForAllTypes() {
 		GenericConversionService conversionService = new GenericConversionService();
 		MyConditionalGenericConverter converter = new MyConditionalGenericConverter();
 		conversionService.addConverter(converter);
@@ -717,7 +720,7 @@ public void conditionalConversionForAllTypes() throws Exception {
 	}
 
 	@Test
-	public void convertOptimizeArray() throws Exception {
+	public void convertOptimizeArray() {
 		// SPR-9566
 		GenericConversionService conversionService = new DefaultConversionService();
 		byte[] byteArray = new byte[] { 1, 2, 3 };
@@ -726,7 +729,7 @@ public void convertOptimizeArray() throws Exception {
 	}
 
 	@Test
-	public void convertCannotOptimizeArray() throws Exception {
+	public void convertCannotOptimizeArray() {
 		GenericConversionService conversionService = new GenericConversionService();
 		conversionService.addConverter(new Converter<Byte, Byte>() {
 			@Override
@@ -738,7 +741,7 @@ public Byte convert(Byte source) {
 		byte[] byteArray = new byte[] { 1, 2, 3 };
 		byte[] converted = conversionService.convert(byteArray, byte[].class);
 		assertNotSame(byteArray, converted);
-		assertTrue(Arrays.equals(new byte[] { 2, 3, 4 }, converted));
+		assertTrue(Arrays.equals(new byte[] {2, 3, 4}, converted));
 	}
 
 	@Test
@@ -748,6 +751,13 @@ public void testEnumToStringConversion() {
 		assertEquals("A", result);
 	}
 
+	@Test
+	public void testSubclassOfEnumToString() throws Exception {
+		conversionService.addConverter(new EnumToStringConverter(conversionService));
+		String result = conversionService.convert(EnumWithSubclass.FIRST, String.class);
+		assertEquals("FIRST", result);
+	}
+
 	@Test
 	public void testEnumWithInterfaceToStringConversion() {
 		// SPR-9692
@@ -766,15 +776,92 @@ public void convertNullAnnotatedStringToString() throws Exception {
 		conversionService.convert(source, sourceType, targetType);
 	}
 
+	@Test
+	public void multipleCollectionTypesFromSameSourceType() throws Exception {
+		conversionService.addConverter(new MyStringToRawCollectionConverter());
+		conversionService.addConverter(new MyStringToGenericCollectionConverter());
+		conversionService.addConverter(new MyStringToStringCollectionConverter());
+		conversionService.addConverter(new MyStringToIntegerCollectionConverter());
+
+		assertEquals(Collections.singleton(4),  // should be "testX" from MyStringToStringCollectionConverter, ideally
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("stringCollection"))));
+		assertEquals(Collections.singleton(4),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("integerCollection"))));
+		assertEquals(Collections.singleton(4),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("rawCollection"))));
+		assertEquals(Collections.singleton(4),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("genericCollection"))));
+		assertEquals(Collections.singleton(4),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("rawCollection"))));
+		assertEquals(Collections.singleton(4),  // should be "testX" from MyStringToStringCollectionConverter, ideally
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("stringCollection"))));
+	}
+
+	@Test
+	public void adaptedCollectionTypesFromSameSourceType() throws Exception {
+		conversionService.addConverter(new MyStringToStringCollectionConverter());
+
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("stringCollection"))));
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("genericCollection"))));
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("rawCollection"))));
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("genericCollection"))));
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("stringCollection"))));
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("rawCollection"))));
+
+		// The following is unpleasant but simply a consequence of the raw type matching algorithm in Spring 3.x
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("integerCollection"))));
+	}
+
+	@Test
+	public void genericCollectionAsSource() throws Exception {
+		conversionService.addConverter(new MyStringToGenericCollectionConverter());
+
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("stringCollection"))));
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("genericCollection"))));
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("rawCollection"))));
+
+		// The following is unpleasant but a consequence of the generic collection converter above...
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("integerCollection"))));
+	}
+
+	@Test
+	public void rawCollectionAsSource() throws Exception {
+		conversionService.addConverter(new MyStringToRawCollectionConverter());
+
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("stringCollection"))));
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("genericCollection"))));
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("rawCollection"))));
+
+		// The following is unpleasant but a consequence of the raw collection converter above...
+		assertEquals(Collections.singleton("testX"),
+				conversionService.convert("test", TypeDescriptor.valueOf(String.class), new TypeDescriptor(getClass().getField("integerCollection"))));
+	}
+
+
 	@ExampleAnnotation
 	public String annotatedString;
 
+
 	@Retention(RetentionPolicy.RUNTIME)
 	public static @interface ExampleAnnotation {
 	}
 
-	private static class MyConditionalConverter implements Converter<String, Color>,
-			ConditionalConverter {
+
+	private static class MyConditionalConverter implements Converter<String, Color>, ConditionalConverter {
 
 		private int matchAttempts = 0;
 
@@ -794,8 +881,8 @@ public int getMatchAttempts() {
 		}
 	}
 
-	private static class MyConditionalGenericConverter implements GenericConverter,
-			ConditionalConverter {
+
+	private static class MyConditionalGenericConverter implements GenericConverter, ConditionalConverter {
 
 		private List<TypeDescriptor> sourceTypes = new ArrayList<TypeDescriptor>();
 
@@ -811,8 +898,7 @@ public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		}
 
 		@Override
-		public Object convert(Object source, TypeDescriptor sourceType,
-				TypeDescriptor targetType) {
+		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			return null;
 		}
 
@@ -821,8 +907,8 @@ public List<TypeDescriptor> getSourceTypes() {
 		}
 	}
 
-	private static class MyConditionalConverterFactory implements
-			ConverterFactory<String, Color>, ConditionalConverter {
+
+	private static class MyConditionalConverterFactory implements ConverterFactory<String, Color>, ConditionalConverter {
 
 		private MyConditionalConverter converter = new MyConditionalConverter();
 
@@ -849,24 +935,86 @@ public int getNestedMatchAttempts() {
 		}
 	}
 
+
 	interface MyEnumInterface {
+
 		String getCode();
 	}
 
+
 	public static enum MyEnum implements MyEnumInterface {
+
 		A {
 			@Override
 			public String getCode() {
 				return "1";
 			}
-		};
+		}
+	}
+
+
+	public enum EnumWithSubclass {
+
+		FIRST {
+			@Override
+			public String toString() {
+				return "1st";
+			}
+		}
 	}
 
-	private static class MyEnumInterfaceToStringConverter<T extends MyEnumInterface>
-			implements Converter<T, String> {
+
+	public static class MyStringToRawCollectionConverter implements Converter<String, Collection> {
+
+		@Override
+		public Collection convert(String source) {
+			return Collections.singleton(source + "X");
+		}
+	}
+
+
+	public static class MyStringToGenericCollectionConverter implements Converter<String, Collection<?>> {
+
+		@Override
+		public Collection<?> convert(String source) {
+			return Collections.singleton(source + "X");
+		}
+	}
+
+
+	private static class MyEnumInterfaceToStringConverter<T extends MyEnumInterface> implements Converter<T, String> {
+
 		@Override
 		public String convert(T source) {
 			return source.getCode();
 		}
 	}
+
+
+	public static class MyStringToStringCollectionConverter implements Converter<String, Collection<String>> {
+
+		@Override
+		public Collection<String> convert(String source) {
+			return Collections.singleton(source + "X");
+		}
+	}
+
+
+	public static class MyStringToIntegerCollectionConverter implements Converter<String, Collection<Integer>> {
+
+		@Override
+		public Collection<Integer> convert(String source) {
+			return Collections.singleton(source.length());
+		}
+	}
+
+
+	public Collection rawCollection;
+
+	public Collection<?> genericCollection;
+
+	public Collection<String> stringCollection;
+
+	public Collection<Integer> integerCollection;
+
 }
diff --git a/spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java b/spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java
index f998cc5366..84f6fce08a 100644
--- a/spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,8 +30,6 @@
 import static org.junit.Assert.*;
 
 /**
- * Unit tests for {@link PropertySourcesPropertyResolver}.
- *
  * @author Chris Beams
  * @since 3.1
  */
@@ -387,8 +385,8 @@ public void resolveNestedPropertyPlaceholders() {
 		try {
 			pr.getProperty("pL");
 		}
-		catch (StackOverflowError ex) {
-			// no explicit handling for cyclic references for now
+		catch (IllegalArgumentException ex) {
+			assertTrue(ex.getMessage().toLowerCase().contains("circular"));
 		}
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
index 131917c8cc..e094e342d2 100644
--- a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,19 +17,17 @@
 package org.springframework.core.env;
 
 import java.lang.reflect.Field;
-
 import java.security.AccessControlException;
 import java.security.Permission;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 
 import org.junit.Test;
-import org.springframework.mock.env.MockPropertySource;
 
+import org.springframework.core.SpringProperties;
+import org.springframework.mock.env.MockPropertySource;
 
-import static java.lang.String.*;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 import static org.springframework.core.env.AbstractEnvironment.*;
@@ -38,6 +36,7 @@
  * Unit tests for {@link StandardEnvironment}.
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  */
 public class StandardEnvironmentTests {
 
@@ -60,15 +59,15 @@ public void merge() {
 		child.setActiveProfiles("c1", "c2");
 		child.getPropertySources().addLast(
 				new MockPropertySource("childMock")
-					.withProperty("childKey", "childVal")
-					.withProperty("bothKey", "childBothVal"));
+						.withProperty("childKey", "childVal")
+						.withProperty("bothKey", "childBothVal"));
 
 		ConfigurableEnvironment parent = new StandardEnvironment();
 		parent.setActiveProfiles("p1", "p2");
 		parent.getPropertySources().addLast(
 				new MockPropertySource("parentMock")
-					.withProperty("parentKey", "parentVal")
-					.withProperty("bothKey", "parentBothVal"));
+						.withProperty("parentKey", "parentVal")
+						.withProperty("bothKey", "parentBothVal"));
 
 		assertThat(child.getProperty("childKey"), is("childVal"));
 		assertThat(child.getProperty("parentKey"), nullValue());
@@ -205,6 +204,17 @@ public void reservedDefaultProfile() {
 		System.getProperties().remove(DEFAULT_PROFILES_PROPERTY_NAME);
 	}
 
+	@Test(expected=IllegalArgumentException.class)
+	public void defaultProfileWithCircularPlaceholder() {
+		System.setProperty(DEFAULT_PROFILES_PROPERTY_NAME, "${spring.profiles.default}");
+		try {
+			environment.getDefaultProfiles();
+		}
+		finally {
+			System.getProperties().remove(DEFAULT_PROFILES_PROPERTY_NAME);
+		}
+	}
+
 	@Test
 	public void getActiveProfiles_systemPropertiesEmpty() {
 		assertThat(environment.getActiveProfiles().length, is(0));
@@ -334,12 +344,34 @@ protected void validateProfile(String profile) {
 		try {
 			env.addActiveProfile("invalid-profile");
 			fail("expected validation exception");
-		} catch (IllegalArgumentException ex) {
+		}
+		catch (IllegalArgumentException ex) {
 			assertThat(ex.getMessage(),
 					equalTo("Invalid profile [invalid-profile]: must not contain dash character"));
 		}
 	}
 
+	@Test
+	public void suppressGetenvAccessThroughSystemProperty() {
+		System.setProperty("spring.getenv.ignore", "true");
+		assertTrue(environment.getSystemEnvironment().isEmpty());
+		System.clearProperty("spring.getenv.ignore");
+	}
+
+	@Test
+	public void suppressGetenvAccessThroughSpringProperty() {
+		SpringProperties.setProperty("spring.getenv.ignore", "true");
+		assertTrue(environment.getSystemEnvironment().isEmpty());
+		SpringProperties.setProperty("spring.getenv.ignore", null);
+	}
+
+	@Test
+	public void suppressGetenvAccessThroughSpringFlag() {
+		SpringProperties.setFlag("spring.getenv.ignore");
+		assertTrue(environment.getSystemEnvironment().isEmpty());
+		SpringProperties.setProperty("spring.getenv.ignore", null);
+	}
+
 	@Test
 	public void getSystemProperties_withAndWithoutSecurityManager() {
 		System.setProperty(ALLOWED_PROPERTY_NAME, ALLOWED_PROPERTY_VALUE);
@@ -371,7 +403,7 @@ public void checkPropertyAccess(String key) {
 				// see http://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getProperty(java.lang.String)
 				if (DISALLOWED_PROPERTY_NAME.equals(key)) {
 					throw new AccessControlException(
-							format("Accessing the system property [%s] is disallowed", DISALLOWED_PROPERTY_NAME));
+							String.format("Accessing the system property [%s] is disallowed", DISALLOWED_PROPERTY_NAME));
 				}
 			}
 			@Override
@@ -402,7 +434,8 @@ public void checkPermission(Permission perm) {
 			try {
 				systemProperties.get(NON_STRING_PROPERTY_NAME);
 				fail("Expected IllegalArgumentException when searching with non-string key against ReadOnlySystemAttributesMap");
-			} catch (IllegalArgumentException ex) {
+			}
+			catch (IllegalArgumentException ex) {
 				// expected
 			}
 		}
@@ -436,7 +469,7 @@ public void checkPermission(Permission perm) {
 				//see http://download.oracle.com/javase/1.5.0/docs/api/java/lang/System.html#getenv(java.lang.String)
 				if (("getenv."+DISALLOWED_PROPERTY_NAME).equals(perm.getName())) {
 					throw new AccessControlException(
-							format("Accessing the system environment variable [%s] is disallowed", DISALLOWED_PROPERTY_NAME));
+							String.format("Accessing the system environment variable [%s] is disallowed", DISALLOWED_PROPERTY_NAME));
 				}
 			}
 		};
@@ -469,7 +502,8 @@ public static Map<String, String> getModifiableSystemEnvironment() {
 					if (obj != null && obj.getClass().getName().equals("java.lang.ProcessEnvironment$StringEnvironment")) {
 						return (Map<String, String>) obj;
 					}
-				} catch (Exception ex) {
+				}
+				catch (Exception ex) {
 					throw new RuntimeException(ex);
 				}
 			}
@@ -479,8 +513,9 @@ public static Map<String, String> getModifiableSystemEnvironment() {
 		Class<?> processEnvironmentClass;
 		try {
 			processEnvironmentClass = Class.forName("java.lang.ProcessEnvironment");
-		} catch (Exception e) {
-			throw new RuntimeException(e);
+		}
+		catch (Exception ex) {
+			throw new IllegalStateException(ex);
 		}
 
 		try {
@@ -488,10 +523,12 @@ public static Map<String, String> getModifiableSystemEnvironment() {
 			theCaseInsensitiveEnvironmentField.setAccessible(true);
 			Object obj = theCaseInsensitiveEnvironmentField.get(null);
 			return (Map<String, String>) obj;
-		} catch (NoSuchFieldException e) {
+		}
+		catch (NoSuchFieldException ex) {
 			// do nothing
-		} catch (Exception e) {
-			throw new RuntimeException(e);
+		}
+		catch (Exception ex) {
+			throw new IllegalStateException(ex);
 		}
 
 		try {
@@ -499,12 +536,15 @@ public static Map<String, String> getModifiableSystemEnvironment() {
 			theEnvironmentField.setAccessible(true);
 			Object obj = theEnvironmentField.get(null);
 			return (Map<String, String>) obj;
-		} catch (NoSuchFieldException e) {
+		}
+		catch (NoSuchFieldException ex) {
 			// do nothing
-		} catch (Exception e) {
-			throw new RuntimeException(e);
+		}
+		catch (Exception ex) {
+			throw new IllegalStateException(ex);
 		}
 
 		throw new IllegalStateException();
 	}
+
 }
diff --git a/spring-core/src/test/java/org/springframework/core/io/support/EncodedResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/support/EncodedResourceTests.java
new file mode 100644
index 0000000000..53f4cf4333
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/core/io/support/EncodedResourceTests.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2002-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.core.io.support;
+
+import java.nio.charset.Charset;
+
+import org.junit.Test;
+import org.springframework.core.io.DescriptiveResource;
+import org.springframework.core.io.Resource;
+
+import static org.junit.Assert.*;
+
+/**
+ * Unit tests for {@link EncodedResource}.
+ *
+ * @author Sam Brannen
+ * @since 3.2.14
+ */
+public class EncodedResourceTests {
+
+	private static final String UTF8 = "UTF-8";
+	private static final String UTF16 = "UTF-16";
+	private static final Charset UTF8_CS = Charset.forName(UTF8);
+	private static final Charset UTF16_CS = Charset.forName(UTF16);
+
+	private final Resource resource = new DescriptiveResource("test");
+
+
+	@Test
+	public void equalsWithNullOtherObject() {
+		assertFalse(new EncodedResource(resource).equals(null));
+	}
+
+	@Test
+	public void equalsWithSameEncoding() {
+		EncodedResource er1 = new EncodedResource(resource, UTF8);
+		EncodedResource er2 = new EncodedResource(resource, UTF8);
+		assertEquals(er1, er2);
+	}
+
+	@Test
+	public void equalsWithDifferentEncoding() {
+		EncodedResource er1 = new EncodedResource(resource, UTF8);
+		EncodedResource er2 = new EncodedResource(resource, UTF16);
+		assertNotEquals(er1, er2);
+	}
+
+	@Test
+	public void equalsWithSameCharset() {
+		EncodedResource er1 = new EncodedResource(resource, UTF8_CS);
+		EncodedResource er2 = new EncodedResource(resource, UTF8_CS);
+		assertEquals(er1, er2);
+	}
+
+	@Test
+	public void equalsWithDifferentCharset() {
+		EncodedResource er1 = new EncodedResource(resource, UTF8_CS);
+		EncodedResource er2 = new EncodedResource(resource, UTF16_CS);
+		assertNotEquals(er1, er2);
+	}
+
+	@Test
+	public void equalsWithEncodingAndCharset() {
+		EncodedResource er1 = new EncodedResource(resource, UTF8);
+		EncodedResource er2 = new EncodedResource(resource, UTF8_CS);
+		assertNotEquals(er1, er2);
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
index f353d34fb1..ea5e7d704a 100644
--- a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,71 +23,83 @@
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.springframework.util.ObjectUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Keith Donald
  */
-public class ToStringCreatorTests extends TestCase {
+public class ToStringCreatorTests {
 
 	private SomeObject s1, s2, s3;
 
-	@Override
-	protected void setUp() throws Exception {
+
+	@Before
+	public void setUp() throws Exception {
 		s1 = new SomeObject() {
+			@Override
 			public String toString() {
 				return "A";
 			}
 		};
 		s2 = new SomeObject() {
+			@Override
 			public String toString() {
 				return "B";
 			}
 		};
 		s3 = new SomeObject() {
+			@Override
 			public String toString() {
 				return "C";
 			}
 		};
 	}
 
-	public void testDefaultStyleMap() {
-		final Map map = getMap();
+	@Test
+	public void defaultStyleMap() {
+		final Map<String, String> map = getMap();
 		Object stringy = new Object() {
+			@Override
 			public String toString() {
 				return new ToStringCreator(this).append("familyFavoriteSport", map).toString();
 			}
 		};
-		assertEquals("[ToStringCreatorTests.4@" + ObjectUtils.getIdentityHexString(stringy)
-				+ " familyFavoriteSport = map['Keri' -> 'Softball', 'Scot' -> 'Fishing', 'Keith' -> 'Flag Football']]",
+		assertEquals("[ToStringCreatorTests.4@" + ObjectUtils.getIdentityHexString(stringy) +
+				" familyFavoriteSport = map['Keri' -> 'Softball', 'Scot' -> 'Fishing', 'Keith' -> 'Flag Football']]",
 				stringy.toString());
 	}
 
-	private Map getMap() {
-		Map map = new LinkedHashMap(3);
+	private Map<String, String> getMap() {
+		Map<String, String> map = new LinkedHashMap<String, String>();
 		map.put("Keri", "Softball");
 		map.put("Scot", "Fishing");
 		map.put("Keith", "Flag Football");
 		return map;
 	}
 
-	public void testDefaultStyleArray() {
-		SomeObject[] array = new SomeObject[] { s1, s2, s3 };
+	@Test
+	public void defaultStyleArray() {
+		SomeObject[] array = new SomeObject[] {s1, s2, s3};
 		String str = new ToStringCreator(array).toString();
-		assertEquals("[@" + ObjectUtils.getIdentityHexString(array)
-				+ " array<ToStringCreatorTests.SomeObject>[A, B, C]]", str);
+		assertEquals("[@" + ObjectUtils.getIdentityHexString(array) +
+				" array<ToStringCreatorTests.SomeObject>[A, B, C]]", str);
 	}
 
-	public void testPrimitiveArrays() {
-		int[] integers = new int[] { 0, 1, 2, 3, 4 };
+	@Test
+	public void primitiveArrays() {
+		int[] integers = new int[] {0, 1, 2, 3, 4};
 		String str = new ToStringCreator(integers).toString();
 		assertEquals("[@" + ObjectUtils.getIdentityHexString(integers) + " array<Integer>[0, 1, 2, 3, 4]]", str);
 	}
 
-	public void testList() {
-		List list = new ArrayList();
+	@Test
+	public void appendList() {
+		List<SomeObject> list = new ArrayList<SomeObject>();
 		list.add(s1);
 		list.add(s2);
 		list.add(s3);
@@ -96,32 +108,32 @@ public void testList() {
 				str);
 	}
 
-	public void testSet() {
-		Set set = new LinkedHashSet<>(3);
+	@Test
+	public void appendSet() {
+		Set<SomeObject> set = new LinkedHashSet<SomeObject>();
 		set.add(s1);
 		set.add(s2);
 		set.add(s3);
 		String str = new ToStringCreator(this).append("myLetters", set).toString();
-		assertEquals("[ToStringCreatorTests@" + ObjectUtils.getIdentityHexString(this) + " myLetters = set[A, B, C]]",
-				str);
+		assertEquals("[ToStringCreatorTests@" + ObjectUtils.getIdentityHexString(this) + " myLetters = set[A, B, C]]", str);
 	}
 
-	public void testClass() {
+	@Test
+	public void appendClass() {
 		String str = new ToStringCreator(this).append("myClass", this.getClass()).toString();
-		assertEquals("[ToStringCreatorTests@" + ObjectUtils.getIdentityHexString(this)
-				+ " myClass = ToStringCreatorTests]", str);
+		assertEquals("[ToStringCreatorTests@" + ObjectUtils.getIdentityHexString(this) +
+				" myClass = ToStringCreatorTests]", str);
 	}
 
-	public void testMethod() throws Exception {
-		String str = new ToStringCreator(this).append("myMethod", this.getClass().getMethod("testMethod"))
-				.toString();
-		assertEquals("[ToStringCreatorTests@" + ObjectUtils.getIdentityHexString(this)
-				+ " myMethod = testMethod@ToStringCreatorTests]", str);
+	@Test
+	public void appendMethod() throws Exception {
+		String str = new ToStringCreator(this).append("myMethod", this.getClass().getMethod("appendMethod")).toString();
+		assertEquals("[ToStringCreatorTests@" + ObjectUtils.getIdentityHexString(this) +
+				" myMethod = appendMethod@ToStringCreatorTests]", str);
 	}
 
 
 	public static class SomeObject {
-
 	}
 
 }
diff --git a/spring-core/src/test/java/org/springframework/tests/BuildTests.java b/spring-core/src/test/java/org/springframework/tests/BuildTests.java
new file mode 100644
index 0000000000..92008dfbe8
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/tests/BuildTests.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.tests;
+
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+/**
+ * General build related tests. Part of spring-core to ensure that they run early in the
+ * build process.
+ */
+public class BuildTests {
+
+	@Test
+	public void javaVersion() throws Exception {
+		Assume.group(TestGroup.CI);
+		assertThat("Java Version", JavaVersion.runningVersion(), equalTo(JavaVersion.JAVA_17));
+	}
+
+}
diff --git a/spring-core/src/test/java/org/springframework/tests/TestGroup.java b/spring-core/src/test/java/org/springframework/tests/TestGroup.java
index 662f0dab53..285341ef96 100644
--- a/spring-core/src/test/java/org/springframework/tests/TestGroup.java
+++ b/spring-core/src/test/java/org/springframework/tests/TestGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@
  */
 public enum TestGroup {
 
-
 	/**
 	 * Tests that take a considerable amount of time to run. Any test lasting longer than
 	 * 500ms should be considered a candidate in order to avoid making the overall test
@@ -54,7 +53,19 @@ public enum TestGroup {
 	 * Tests requiring the presence of jmxremote_optional.jar in jre/lib/ext in order to
 	 * avoid "Unsupported protocol: jmxmp" errors.
 	 */
-	JMXMP;
+	JMXMP,
+
+	/**
+	 * Tests that should only be run on the continuous integration server.
+	 */
+	CI,
+
+	/**
+	 * Tests that require custom compilation beyond that of the standard JDK. This helps to
+	 * allow running tests that will otherwise fail when using JDK >  1.8 b88. See
+	 * <a href="https://jira.springsource.org/browse/SPR-10558">SPR-10558</a>
+	 */
+	CUSTOM_COMPILATION;
 
 
 	/**
@@ -82,4 +93,5 @@ public static Set<TestGroup> parse(String value) {
 		}
 		return groups;
 	}
+
 }
diff --git a/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java b/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java
index 7f9fe924c4..2d519345f2 100644
--- a/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java
+++ b/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java
@@ -64,7 +64,7 @@ public void parseMissing() throws Exception {
 		thrown.expect(IllegalArgumentException.class);
 		thrown.expectMessage("Unable to find test group 'missing' when parsing " +
 				"testGroups value: 'performance, missing'. Available groups include: " +
-				"[LONG_RUNNING,PERFORMANCE,JMXMP]");
+				"[LONG_RUNNING,PERFORMANCE,JMXMP,CI,CUSTOM_COMPILATION]");
 		TestGroup.parse("performance, missing");
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/tests/TestResourceUtils.java b/spring-core/src/test/java/org/springframework/tests/TestResourceUtils.java
index 93aab19448..0144f65d79 100644
--- a/spring-core/src/test/java/org/springframework/tests/TestResourceUtils.java
+++ b/spring-core/src/test/java/org/springframework/tests/TestResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.tests;
 
-import static java.lang.String.format;
-
 import org.springframework.core.io.ClassPathResource;
 
 /**
@@ -25,22 +23,17 @@
  *
  * @author Chris Beams
  */
-public class TestResourceUtils {
+public abstract class TestResourceUtils {
 
 	/**
-	 * Loads a {@link ClassPathResource} qualified by the simple name of clazz,
+	 * Load a {@link ClassPathResource} qualified by the simple name of clazz,
 	 * and relative to the package for clazz.
-	 *
 	 * <p>Example: given a clazz 'com.foo.BarTests' and a resourceSuffix of 'context.xml',
 	 * this method will return a ClassPathResource representing com/foo/BarTests-context.xml
-	 *
 	 * <p>Intended for use loading context configuration XML files within JUnit tests.
-	 *
-	 * @param clazz
-	 * @param resourceSuffix
 	 */
 	public static ClassPathResource qualifiedResource(Class<?> clazz, String resourceSuffix) {
-			return new ClassPathResource(format("%s-%s", clazz.getSimpleName(), resourceSuffix), clazz);
+		return new ClassPathResource(String.format("%s-%s", clazz.getSimpleName(), resourceSuffix), clazz);
 	}
 
 }
diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
index ce187d7c71..f29b8b6198 100644
--- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
@@ -20,41 +20,48 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-
-import junit.framework.TestCase;
+import java.util.Set;
 
 import org.springframework.tests.sample.objects.DerivedTestObject;
 import org.springframework.tests.sample.objects.ITestInterface;
 import org.springframework.tests.sample.objects.ITestObject;
 import org.springframework.tests.sample.objects.TestObject;
 
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
 /**
  * @author Colin Sampaleanu
  * @author Juergen Hoeller
  * @author Rob Harrop
  * @author Rick Evans
  */
-public class ClassUtilsTests extends TestCase {
+public class ClassUtilsTests {
 
 	private ClassLoader classLoader = getClass().getClassLoader();
 
-	@Override
+	@Before
 	public void setUp() {
 		InnerClass.noArgCalled = false;
 		InnerClass.argCalled = false;
 		InnerClass.overloadedCalled = false;
 	}
 
+	@Test
 	public void testIsPresent() throws Exception {
 		assertTrue(ClassUtils.isPresent("java.lang.String", classLoader));
 		assertFalse(ClassUtils.isPresent("java.lang.MySpecialString", classLoader));
 	}
 
+	@Test
 	public void testForName() throws ClassNotFoundException {
 		assertEquals(String.class, ClassUtils.forName("java.lang.String", classLoader));
 		assertEquals(String[].class, ClassUtils.forName("java.lang.String[]", classLoader));
@@ -69,6 +76,7 @@ public void testForName() throws ClassNotFoundException {
 		assertEquals(short[][][].class, ClassUtils.forName("[[[S", classLoader));
 	}
 
+	@Test
 	public void testForNameWithPrimitiveClasses() throws ClassNotFoundException {
 		assertEquals(boolean.class, ClassUtils.forName("boolean", classLoader));
 		assertEquals(byte.class, ClassUtils.forName("byte", classLoader));
@@ -81,6 +89,7 @@ public void testForNameWithPrimitiveClasses() throws ClassNotFoundException {
 		assertEquals(void.class, ClassUtils.forName("void", classLoader));
 	}
 
+	@Test
 	public void testForNameWithPrimitiveArrays() throws ClassNotFoundException {
 		assertEquals(boolean[].class, ClassUtils.forName("boolean[]", classLoader));
 		assertEquals(byte[].class, ClassUtils.forName("byte[]", classLoader));
@@ -92,6 +101,7 @@ public void testForNameWithPrimitiveArrays() throws ClassNotFoundException {
 		assertEquals(double[].class, ClassUtils.forName("double[]", classLoader));
 	}
 
+	@Test
 	public void testForNameWithPrimitiveArraysInternalName() throws ClassNotFoundException {
 		assertEquals(boolean[].class, ClassUtils.forName(boolean[].class.getName(), classLoader));
 		assertEquals(byte[].class, ClassUtils.forName(byte[].class.getName(), classLoader));
@@ -103,76 +113,91 @@ public void testForNameWithPrimitiveArraysInternalName() throws ClassNotFoundExc
 		assertEquals(double[].class, ClassUtils.forName(double[].class.getName(), classLoader));
 	}
 
+	@Test
 	public void testGetShortName() {
 		String className = ClassUtils.getShortName(getClass());
 		assertEquals("Class name did not match", "ClassUtilsTests", className);
 	}
 
+	@Test
 	public void testGetShortNameForObjectArrayClass() {
 		String className = ClassUtils.getShortName(Object[].class);
 		assertEquals("Class name did not match", "Object[]", className);
 	}
 
+	@Test
 	public void testGetShortNameForMultiDimensionalObjectArrayClass() {
 		String className = ClassUtils.getShortName(Object[][].class);
 		assertEquals("Class name did not match", "Object[][]", className);
 	}
 
+	@Test
 	public void testGetShortNameForPrimitiveArrayClass() {
 		String className = ClassUtils.getShortName(byte[].class);
 		assertEquals("Class name did not match", "byte[]", className);
 	}
 
+	@Test
 	public void testGetShortNameForMultiDimensionalPrimitiveArrayClass() {
 		String className = ClassUtils.getShortName(byte[][][].class);
 		assertEquals("Class name did not match", "byte[][][]", className);
 	}
 
+	@Test
 	public void testGetShortNameForInnerClass() {
 		String className = ClassUtils.getShortName(InnerClass.class);
 		assertEquals("Class name did not match", "ClassUtilsTests.InnerClass", className);
 	}
 
+	@Test
 	public void testGetShortNameAsProperty() {
 		String shortName = ClassUtils.getShortNameAsProperty(this.getClass());
 		assertEquals("Class name did not match", "classUtilsTests", shortName);
 	}
 
+	@Test
 	public void testGetClassFileName() {
 		assertEquals("String.class", ClassUtils.getClassFileName(String.class));
 		assertEquals("ClassUtilsTests.class", ClassUtils.getClassFileName(getClass()));
 	}
 
+	@Test
 	public void testGetPackageName() {
 		assertEquals("java.lang", ClassUtils.getPackageName(String.class));
 		assertEquals(getClass().getPackage().getName(), ClassUtils.getPackageName(getClass()));
 	}
 
+	@Test
 	public void testGetQualifiedName() {
 		String className = ClassUtils.getQualifiedName(getClass());
 		assertEquals("Class name did not match", "org.springframework.util.ClassUtilsTests", className);
 	}
 
+	@Test
 	public void testGetQualifiedNameForObjectArrayClass() {
 		String className = ClassUtils.getQualifiedName(Object[].class);
 		assertEquals("Class name did not match", "java.lang.Object[]", className);
 	}
 
+	@Test
 	public void testGetQualifiedNameForMultiDimensionalObjectArrayClass() {
 		String className = ClassUtils.getQualifiedName(Object[][].class);
 		assertEquals("Class name did not match", "java.lang.Object[][]", className);
 	}
 
+	@Test
 	public void testGetQualifiedNameForPrimitiveArrayClass() {
 		String className = ClassUtils.getQualifiedName(byte[].class);
 		assertEquals("Class name did not match", "byte[]", className);
 	}
 
+	@Test
 	public void testGetQualifiedNameForMultiDimensionalPrimitiveArrayClass() {
 		String className = ClassUtils.getQualifiedName(byte[][].class);
 		assertEquals("Class name did not match", "byte[][]", className);
 	}
 
+	@Test
 	public void testHasMethod() throws Exception {
 		assertTrue(ClassUtils.hasMethod(Collection.class, "size"));
 		assertTrue(ClassUtils.hasMethod(Collection.class, "remove", Object.class));
@@ -180,6 +205,7 @@ public void testHasMethod() throws Exception {
 		assertFalse(ClassUtils.hasMethod(Collection.class, "someOtherMethod"));
 	}
 
+	@Test
 	public void testGetMethodIfAvailable() throws Exception {
 		Method method = ClassUtils.getMethodIfAvailable(Collection.class, "size");
 		assertNotNull(method);
@@ -193,6 +219,7 @@ public void testGetMethodIfAvailable() throws Exception {
 		assertNull(ClassUtils.getMethodIfAvailable(Collection.class, "someOtherMethod"));
 	}
 
+	@Test
 	public void testGetMethodCountForName() {
 		assertEquals("Verifying number of overloaded 'print' methods for OverloadedMethodsClass.", 2,
 				ClassUtils.getMethodCountForName(OverloadedMethodsClass.class, "print"));
@@ -200,6 +227,7 @@ public void testGetMethodCountForName() {
 				ClassUtils.getMethodCountForName(SubOverloadedMethodsClass.class, "print"));
 	}
 
+	@Test
 	public void testCountOverloadedMethods() {
 		assertFalse(ClassUtils.hasAtLeastOneMethodWithName(TestObject.class, "foobar"));
 		// no args
@@ -208,6 +236,7 @@ public void testCountOverloadedMethods() {
 		assertTrue(ClassUtils.hasAtLeastOneMethodWithName(TestObject.class, "setAge"));
 	}
 
+	@Test
 	public void testNoArgsStaticMethod() throws IllegalAccessException, InvocationTargetException {
 		Method method = ClassUtils.getStaticMethod(InnerClass.class, "staticMethod", (Class[]) null);
 		method.invoke(null, (Object[]) null);
@@ -215,6 +244,7 @@ public void testNoArgsStaticMethod() throws IllegalAccessException, InvocationTa
 				InnerClass.noArgCalled);
 	}
 
+	@Test
 	public void testArgsStaticMethod() throws IllegalAccessException, InvocationTargetException {
 		Method method = ClassUtils.getStaticMethod(InnerClass.class, "argStaticMethod",
 				new Class[] {String.class});
@@ -222,6 +252,7 @@ public void testArgsStaticMethod() throws IllegalAccessException, InvocationTarg
 		assertTrue("argument method was not invoked.", InnerClass.argCalled);
 	}
 
+	@Test
 	public void testOverloadedStaticMethod() throws IllegalAccessException, InvocationTargetException {
 		Method method = ClassUtils.getStaticMethod(InnerClass.class, "staticMethod",
 				new Class[] {String.class});
@@ -230,6 +261,7 @@ public void testOverloadedStaticMethod() throws IllegalAccessException, Invocati
 				InnerClass.overloadedCalled);
 	}
 
+	@Test
 	public void testIsAssignable() {
 		assertTrue(ClassUtils.isAssignable(Object.class, Object.class));
 		assertTrue(ClassUtils.isAssignable(String.class, String.class));
@@ -245,11 +277,13 @@ public void testIsAssignable() {
 		assertFalse(ClassUtils.isAssignable(double.class, Integer.class));
 	}
 
+	@Test
 	public void testClassPackageAsResourcePath() {
 		String result = ClassUtils.classPackageAsResourcePath(Proxy.class);
 		assertTrue(result.equals("java/lang/reflect"));
 	}
 
+	@Test
 	public void testAddResourcePathToPackagePath() {
 		String result = "java/lang/reflect/xyzabc.xml";
 		assertEquals(result, ClassUtils.addResourcePathToPackagePath(Proxy.class, "xyzabc.xml"));
@@ -259,6 +293,7 @@ public void testAddResourcePathToPackagePath() {
 				ClassUtils.addResourcePathToPackagePath(Proxy.class, "a/b/c/d.xml"));
 	}
 
+	@Test
 	public void testGetAllInterfaces() {
 		DerivedTestObject testBean = new DerivedTestObject();
 		List ifcs = Arrays.asList(ClassUtils.getAllInterfaces(testBean));
@@ -268,6 +303,7 @@ public void testGetAllInterfaces() {
 		assertTrue("Contains IOther", ifcs.contains(ITestInterface.class));
 	}
 
+	@Test
 	public void testClassNamesToString() {
 		List ifcs = new LinkedList();
 		ifcs.add(Serializable.class);
@@ -288,6 +324,36 @@ public void testClassNamesToString() {
 		assertEquals("[]", ClassUtils.classNamesToString(Collections.EMPTY_LIST));
 	}
 
+	@Test
+	public void testDetermineCommonAncestor() {
+		assertEquals(Number.class, ClassUtils.determineCommonAncestor(Integer.class, Number.class));
+		assertEquals(Number.class, ClassUtils.determineCommonAncestor(Number.class, Integer.class));
+		assertEquals(Number.class, ClassUtils.determineCommonAncestor(Number.class, null));
+		assertEquals(Integer.class, ClassUtils.determineCommonAncestor(null, Integer.class));
+		assertEquals(Integer.class, ClassUtils.determineCommonAncestor(Integer.class, Integer.class));
+
+		assertEquals(Number.class, ClassUtils.determineCommonAncestor(Integer.class, Float.class));
+		assertEquals(Number.class, ClassUtils.determineCommonAncestor(Float.class, Integer.class));
+		assertNull(ClassUtils.determineCommonAncestor(Integer.class, String.class));
+		assertNull(ClassUtils.determineCommonAncestor(String.class, Integer.class));
+
+		assertEquals(Collection.class, ClassUtils.determineCommonAncestor(List.class, Collection.class));
+		assertEquals(Collection.class, ClassUtils.determineCommonAncestor(Collection.class, List.class));
+		assertEquals(Collection.class, ClassUtils.determineCommonAncestor(Collection.class, null));
+		assertEquals(List.class, ClassUtils.determineCommonAncestor(null, List.class));
+		assertEquals(List.class, ClassUtils.determineCommonAncestor(List.class, List.class));
+
+		assertNull(ClassUtils.determineCommonAncestor(List.class, Set.class));
+		assertNull(ClassUtils.determineCommonAncestor(Set.class, List.class));
+		assertNull(ClassUtils.determineCommonAncestor(List.class, Runnable.class));
+		assertNull(ClassUtils.determineCommonAncestor(Runnable.class, List.class));
+
+		assertEquals(List.class, ClassUtils.determineCommonAncestor(List.class, ArrayList.class));
+		assertEquals(List.class, ClassUtils.determineCommonAncestor(ArrayList.class, List.class));
+		assertNull(ClassUtils.determineCommonAncestor(List.class, String.class));
+		assertNull(ClassUtils.determineCommonAncestor(String.class, List.class));
+	}
+
 
 	public static class InnerClass {
 
diff --git a/spring-core/src/test/java/org/springframework/util/CompositeIteratorTests.java b/spring-core/src/test/java/org/springframework/util/CompositeIteratorTests.java
index d27cb93109..124bc04a3f 100644
--- a/spring-core/src/test/java/org/springframework/util/CompositeIteratorTests.java
+++ b/spring-core/src/test/java/org/springframework/util/CompositeIteratorTests.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.util;
 
 import java.util.Arrays;
@@ -5,29 +21,36 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
 
 /**
  * Test case for {@link CompositeIterator}.
  *
  * @author Erwin Vervaet
+ * @author Juergen Hoeller
  */
-public class CompositeIteratorTests extends TestCase {
+public class CompositeIteratorTests {
 
+	@Test
 	public void testNoIterators() {
-		CompositeIterator it = new CompositeIterator();
+		CompositeIterator<String> it = new CompositeIterator<String>();
 		assertFalse(it.hasNext());
 		try {
 			it.next();
 			fail();
-		} catch (NoSuchElementException e) {
+		}
+		catch (NoSuchElementException ex) {
 			// expected
 		}
 	}
 
+	@Test
 	public void testSingleIterator() {
-		CompositeIterator it = new CompositeIterator();
-		it.add(Arrays.asList(new String[] { "0", "1" }).iterator());
+		CompositeIterator<String> it = new CompositeIterator<String>();
+		it.add(Arrays.asList("0", "1").iterator());
 		for (int i = 0; i < 2; i++) {
 			assertTrue(it.hasNext());
 			assertEquals(String.valueOf(i), it.next());
@@ -36,16 +59,18 @@ public void testSingleIterator() {
 		try {
 			it.next();
 			fail();
-		} catch (NoSuchElementException e) {
+		}
+		catch (NoSuchElementException ex) {
 			// expected
 		}
 	}
 
+	@Test
 	public void testMultipleIterators() {
-		CompositeIterator it = new CompositeIterator();
-		it.add(Arrays.asList(new String[] { "0", "1" }).iterator());
-		it.add(Arrays.asList(new String[] { "2" }).iterator());
-		it.add(Arrays.asList(new String[] { "3", "4" }).iterator());
+		CompositeIterator<String> it = new CompositeIterator<String>();
+		it.add(Arrays.asList("0", "1").iterator());
+		it.add(Arrays.asList("2").iterator());
+		it.add(Arrays.asList("3", "4").iterator());
 		for (int i = 0; i < 5; i++) {
 			assertTrue(it.hasNext());
 			assertEquals(String.valueOf(i), it.next());
@@ -54,43 +79,49 @@ public void testMultipleIterators() {
 		try {
 			it.next();
 			fail();
-		} catch (NoSuchElementException e) {
+		}
+		catch (NoSuchElementException ex) {
 			// expected
 		}
 	}
 
+	@Test
 	public void testInUse() {
-		List list = Arrays.asList(new String[] { "0", "1" });
-		CompositeIterator it = new CompositeIterator();
+		List<String> list = Arrays.asList("0", "1");
+		CompositeIterator<String> it = new CompositeIterator<String>();
 		it.add(list.iterator());
 		it.hasNext();
 		try {
 			it.add(list.iterator());
 			fail();
-		} catch (IllegalStateException e) {
+		}
+		catch (IllegalStateException ex) {
 			// expected
 		}
-		it = new CompositeIterator();
+		it = new CompositeIterator<String>();
 		it.add(list.iterator());
 		it.next();
 		try {
 			it.add(list.iterator());
 			fail();
-		} catch (IllegalStateException e) {
+		}
+		catch (IllegalStateException ex) {
 			// expected
 		}
 	}
 
+	@Test
 	public void testDuplicateIterators() {
-		List list = Arrays.asList(new String[] { "0", "1" });
-		Iterator iterator = list.iterator();
-		CompositeIterator it = new CompositeIterator();
+		List<String> list = Arrays.asList("0", "1");
+		Iterator<String> iterator = list.iterator();
+		CompositeIterator<String> it = new CompositeIterator<String>();
 		it.add(iterator);
 		it.add(list.iterator());
 		try {
 			it.add(iterator);
 			fail();
-		} catch (IllegalArgumentException e) {
+		}
+		catch (IllegalArgumentException ex) {
 			// expected
 		}
 	}
diff --git a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
index f9a6d1070e..d585d0aef1 100644
--- a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.springframework.util;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -36,14 +33,19 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+
 import org.springframework.util.ConcurrentReferenceHashMap.Entry;
 import org.springframework.util.ConcurrentReferenceHashMap.Reference;
 import org.springframework.util.ConcurrentReferenceHashMap.Restructure;
 import org.springframework.util.comparator.ComparableComparator;
 import org.springframework.util.comparator.NullSafeComparator;
 
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Tests for {@link ConcurrentReferenceHashMap}.
+ *
  * @author Phillip Webb
  */
 public class ConcurrentReferenceHashMapTests {
@@ -56,6 +58,7 @@ public class ConcurrentReferenceHashMapTests {
 
 	private TestWeakConcurrentCache<Integer, String> map = new TestWeakConcurrentCache<Integer, String>();
 
+
 	@Test
 	public void shouldCreateWithDefaults() throws Exception {
 		ConcurrentReferenceHashMap<Integer, String> map = new ConcurrentReferenceHashMap<Integer, String>();
@@ -66,8 +69,7 @@ public void shouldCreateWithDefaults() throws Exception {
 
 	@Test
 	public void shouldCreateWithInitialCapacity() throws Exception {
-		ConcurrentReferenceHashMap<Integer, String> map = new ConcurrentReferenceHashMap<Integer, String>(
-				32);
+		ConcurrentReferenceHashMap<Integer, String> map = new ConcurrentReferenceHashMap<Integer, String>(32);
 		assertThat(map.getSegmentsSize(), is(16));
 		assertThat(map.getSegment(0).getSize(), is(2));
 		assertThat(map.getLoadFactor(), is(0.75f));
@@ -75,8 +77,7 @@ public void shouldCreateWithInitialCapacity() throws Exception {
 
 	@Test
 	public void shouldCreateWithInitialCapacityAndLoadFactor() throws Exception {
-		ConcurrentReferenceHashMap<Integer, String> map = new ConcurrentReferenceHashMap<Integer, String>(
-				32, 0.5f);
+		ConcurrentReferenceHashMap<Integer, String> map = new ConcurrentReferenceHashMap<Integer, String>(32, 0.5f);
 		assertThat(map.getSegmentsSize(), is(16));
 		assertThat(map.getSegment(0).getSize(), is(2));
 		assertThat(map.getLoadFactor(), is(0.5f));
@@ -84,8 +85,7 @@ public void shouldCreateWithInitialCapacityAndLoadFactor() throws Exception {
 
 	@Test
 	public void shouldCreateWithInitialCapacityAndConcurrenyLevel() throws Exception {
-		ConcurrentReferenceHashMap<Integer, String> map = new ConcurrentReferenceHashMap<Integer, String>(
-				16, 2);
+		ConcurrentReferenceHashMap<Integer, String> map = new ConcurrentReferenceHashMap<Integer, String>(16, 2);
 		assertThat(map.getSegmentsSize(), is(2));
 		assertThat(map.getSegment(0).getSize(), is(8));
 		assertThat(map.getLoadFactor(), is(0.75f));
@@ -93,8 +93,7 @@ public void shouldCreateWithInitialCapacityAndConcurrenyLevel() throws Exception
 
 	@Test
 	public void shouldCreateFullyCustom() throws Exception {
-		ConcurrentReferenceHashMap<Integer, String> map = new ConcurrentReferenceHashMap<Integer, String>(
-				5, 0.5f, 3);
+		ConcurrentReferenceHashMap<Integer, String> map = new ConcurrentReferenceHashMap<Integer, String>(5, 0.5f, 3);
 		// concurrencyLevel of 3 ends up as 4 (nearest power of 2)
 		assertThat(map.getSegmentsSize(), is(4));
 		// initialCapacity is 5/4 (rounded up, to nearest power of 2)
@@ -102,19 +101,11 @@ public void shouldCreateFullyCustom() throws Exception {
 		assertThat(map.getLoadFactor(), is(0.5f));
 	}
 
-	@Test
-	public void shouldNeedPositiveConcurrenyLevel() throws Exception {
-		new ConcurrentReferenceHashMap<Integer, String>(1, 1);
-		this.thrown.expect(IllegalArgumentException.class);
-		this.thrown.expectMessage("ConcurrencyLevel must be positive");
-		new TestWeakConcurrentCache<Integer, String>(1, 0);
-	}
-
 	@Test
 	public void shouldNeedNonNegativeInitialCapacity() throws Exception {
 		new ConcurrentReferenceHashMap<Integer, String>(0, 1);
 		this.thrown.expect(IllegalArgumentException.class);
-		this.thrown.expectMessage("InitialCapacity must not be negative");
+		this.thrown.expectMessage("Initial capacity must not be negative");
 		new TestWeakConcurrentCache<Integer, String>(-1, 1);
 	}
 
@@ -122,10 +113,18 @@ public void shouldNeedNonNegativeInitialCapacity() throws Exception {
 	public void shouldNeedPositiveLoadFactor() throws Exception {
 		new ConcurrentReferenceHashMap<Integer, String>(0, 0.1f, 1);
 		this.thrown.expect(IllegalArgumentException.class);
-		this.thrown.expectMessage("LoadFactor must be positive");
+		this.thrown.expectMessage("Load factor must be positive");
 		new TestWeakConcurrentCache<Integer, String>(0, 0.0f, 1);
 	}
 
+	@Test
+	public void shouldNeedPositiveConcurrencyLevel() throws Exception {
+		new ConcurrentReferenceHashMap<Integer, String>(1, 1);
+		this.thrown.expect(IllegalArgumentException.class);
+		this.thrown.expectMessage("Concurrency level must be positive");
+		new TestWeakConcurrentCache<Integer, String>(1, 0);
+	}
+
 	@Test
 	public void shouldPutAndGet() throws Exception {
 		// NOTE we are using mock references so we don't need to worry about GC
@@ -521,13 +520,11 @@ public void shouldSupportNullReference() throws Exception {
 
 	/**
 	 * Time a multi-threaded access to a cache.
-	 *
-	 * @param cache the cache to test
 	 * @return the timing stopwatch
-	 * @throws InterruptedException
 	 */
 	private <V> StopWatch timeMultiThreaded(String id, final Map<Integer, V> map,
 			ValueFactory<V> factory) throws InterruptedException {
+
 		StopWatch stopWatch = new StopWatch(id);
 		for (int i = 0; i < 500; i++) {
 			map.put(i, factory.newValue(i));
@@ -536,7 +533,6 @@ private <V> StopWatch timeMultiThreaded(String id, final Map<Integer, V> map,
 		stopWatch.start("Running threads");
 		for (int threadIndex = 0; threadIndex < threads.length; threadIndex++) {
 			threads[threadIndex] = new Thread("Cache access thread " + threadIndex) {
-
 				@Override
 				public void run() {
 					for (int j = 0; j < 1000; j++) {
@@ -544,29 +540,30 @@ public void run() {
 							map.get(i);
 						}
 					}
-				};
+				}
 			};
 		}
-		for (int i = 0; i < threads.length; i++) {
-			threads[i].start();
+		for (Thread thread : threads) {
+			thread.start();
 		}
 
-		for (int i = 0; i < threads.length; i++) {
-			if (threads[i].isAlive()) {
-				threads[i].join(2000);
+		for (Thread thread : threads) {
+			if (thread.isAlive()) {
+				thread.join(2000);
 			}
 		}
 		stopWatch.stop();
 		return stopWatch;
 	}
 
+
 	private static interface ValueFactory<V> {
 
 		V newValue(int k);
 	}
 
-	private static class TestWeakConcurrentCache<K, V> extends
-			ConcurrentReferenceHashMap<K, V> {
+
+	private static class TestWeakConcurrentCache<K, V> extends ConcurrentReferenceHashMap<K, V> {
 
 		private int supplimentalHash;
 
@@ -582,8 +579,7 @@ public void setDisableTestHooks(boolean disableTestHooks) {
 			this.disableTestHooks = disableTestHooks;
 		}
 
-		public TestWeakConcurrentCache(int initialCapacity, float loadFactor,
-				int concurrencyLevel) {
+		public TestWeakConcurrentCache(int initialCapacity, float loadFactor, int concurrencyLevel) {
 			super(initialCapacity, loadFactor, concurrencyLevel);
 		}
 
@@ -607,9 +603,7 @@ public int getSupplimentalHash() {
 
 		@Override
 		protected ReferenceManager createReferenceManager() {
-
 			return new ReferenceManager() {
-
 				@Override
 				public Reference<K, V> createReference(Entry<K, V> entry, int hash,
 						Reference<K, V> next) {
@@ -618,7 +612,6 @@ public Reference<K, V> createReference(Entry<K, V> entry, int hash,
 					}
 					return new MockReference<K, V>(entry, hash, next, TestWeakConcurrentCache.this.queue);
 				}
-
 				@Override
 				public Reference<K, V> pollForPurge() {
 					if (TestWeakConcurrentCache.this.disableTestHooks) {
@@ -634,6 +627,7 @@ public MockReference<K, V> getMockReference(K key, Restructure restructure) {
 		}
 	}
 
+
 	private static class MockReference<K, V> implements Reference<K, V> {
 
 		private final int hash;
@@ -644,8 +638,7 @@ private static class MockReference<K, V> implements Reference<K, V> {
 
 		private final LinkedList<MockReference<K, V>> queue;
 
-		public MockReference(Entry<K, V> entry, int hash, Reference<K, V> next,
-				LinkedList<MockReference<K, V>> queue) {
+		public MockReference(Entry<K, V> entry, int hash, Reference<K, V> next, LinkedList<MockReference<K, V>> queue) {
 			this.hash = hash;
 			this.entry = entry;
 			this.next = next;
@@ -677,4 +670,5 @@ public void queueForPurge() {
 			this.queue.add(this);
 		}
 	}
+
 }
diff --git a/spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java b/spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java
index 7d3b171ba7..40ce65c8d9 100644
--- a/spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java
+++ b/spring-core/src/test/java/org/springframework/util/LinkedCaseInsensitiveMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.util;
 
-import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -26,12 +25,8 @@
  */
 public class LinkedCaseInsensitiveMapTests {
 
-	private LinkedCaseInsensitiveMap<String> map;
+	private final LinkedCaseInsensitiveMap<String> map = new LinkedCaseInsensitiveMap<String>();
 
-	@Before
-	public void setUp() {
-		map = new LinkedCaseInsensitiveMap<String>();
-	}
 
 	@Test
 	public void putAndGet() {
@@ -55,4 +50,26 @@ public void putWithOverlappingKeys() {
 		assertEquals("value3", map.get("Key"));
 	}
 
+	@Test
+	@SuppressWarnings("unchecked")
+	public void mapClone() {
+		map.put("key", "value1");
+		LinkedCaseInsensitiveMap<String> copy = (LinkedCaseInsensitiveMap<String>) map.clone();
+		assertEquals("value1", map.get("key"));
+		assertEquals("value1", map.get("KEY"));
+		assertEquals("value1", map.get("Key"));
+		assertEquals("value1", copy.get("key"));
+		assertEquals("value1", copy.get("KEY"));
+		assertEquals("value1", copy.get("Key"));
+		copy.put("Key", "value2");
+		assertEquals(1, map.size());
+		assertEquals(1, copy.size());
+		assertEquals("value1", map.get("key"));
+		assertEquals("value1", map.get("KEY"));
+		assertEquals("value1", map.get("Key"));
+		assertEquals("value2", copy.get("key"));
+		assertEquals("value2", copy.get("KEY"));
+		assertEquals("value2", copy.get("Key"));
+	}
+
 }
diff --git a/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java
index 679ab9566e..c3b380bd89 100644
--- a/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java
+++ b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,16 +20,26 @@
 import java.util.Collection;
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Colin Sampaleanu
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 21.11.2003
  */
-public class MethodInvokerTests extends TestCase {
+public class MethodInvokerTests {
+
+	@Rule
+	public final ExpectedException exception = ExpectedException.none();
 
-	public void testPlainMethodInvoker() throws Exception {
+
+	@Test
+	public void plainMethodInvoker() throws Exception {
 		// sanity check: singleton, non-static should work
 		TestClass1 tc1 = new TestClass1();
 		MethodInvoker mi = new MethodInvoker();
@@ -43,14 +53,14 @@ public void testPlainMethodInvoker() throws Exception {
 		mi = new MethodInvoker();
 		mi.setTargetClass(TestClass1.class);
 		mi.setTargetMethod("supertypes");
-		mi.setArguments(new Object[] {new ArrayList<>(), new ArrayList<>(), "hello"});
+		mi.setArguments(new Object[] {new ArrayList<Object>(), new ArrayList<Object>(), "hello"});
 		mi.prepare();
 		assertEquals("hello", mi.invoke());
 
 		mi = new MethodInvoker();
 		mi.setTargetClass(TestClass1.class);
 		mi.setTargetMethod("supertypes2");
-		mi.setArguments(new Object[] {new ArrayList<>(), new ArrayList<>(), "hello", "bogus"});
+		mi.setArguments(new Object[] {new ArrayList<Object>(), new ArrayList<Object>(), "hello", "bogus"});
 		mi.prepare();
 		assertEquals("hello", mi.invoke());
 
@@ -58,31 +68,25 @@ public void testPlainMethodInvoker() throws Exception {
 		mi = new MethodInvoker();
 		mi.setTargetClass(TestClass1.class);
 		mi.setTargetMethod("supertypes2");
-		mi.setArguments(new Object[] {new ArrayList<>(), new ArrayList<>(), "hello", Boolean.TRUE});
-		try {
-			mi.prepare();
-			fail("Shouldn't have matched without argument conversion");
-		}
-		catch (NoSuchMethodException ex) {
-			// expected
-		}
+		mi.setArguments(new Object[] {new ArrayList<Object>(), new ArrayList<Object>(), "hello", Boolean.TRUE});
+
+		exception.expect(NoSuchMethodException.class);
+		mi.prepare();
 	}
 
-	public void testStringWithMethodInvoker() throws Exception {
-		try {
-			MethodInvoker methodInvoker = new MethodInvoker();
-			methodInvoker.setTargetObject(new Greeter());
-			methodInvoker.setTargetMethod("greet");
-			methodInvoker.setArguments(new Object[] {new String("no match")});
-			methodInvoker.prepare();
-			fail("Should have thrown a NoSuchMethodException");
-		}
-		catch (NoSuchMethodException e) {
-			// expected
-		}
+	@Test
+	public void stringWithMethodInvoker() throws Exception {
+		MethodInvoker methodInvoker = new MethodInvoker();
+		methodInvoker.setTargetObject(new Greeter());
+		methodInvoker.setTargetMethod("greet");
+		methodInvoker.setArguments(new Object[] {"no match"});
+
+		exception.expect(NoSuchMethodException.class);
+		methodInvoker.prepare();
 	}
 
-	public void testPurchaserWithMethodInvoker() throws Exception {
+	@Test
+	public void purchaserWithMethodInvoker() throws Exception {
 		MethodInvoker methodInvoker = new MethodInvoker();
 		methodInvoker.setTargetObject(new Greeter());
 		methodInvoker.setTargetMethod("greet");
@@ -92,7 +96,8 @@ public void testPurchaserWithMethodInvoker() throws Exception {
 		assertEquals("purchaser: hello", greeting);
 	}
 
-	public void testShopperWithMethodInvoker() throws Exception {
+	@Test
+	public void shopperWithMethodInvoker() throws Exception {
 		MethodInvoker methodInvoker = new MethodInvoker();
 		methodInvoker.setTargetObject(new Greeter());
 		methodInvoker.setTargetMethod("greet");
@@ -102,7 +107,8 @@ public void testShopperWithMethodInvoker() throws Exception {
 		assertEquals("purchaser: may I help you?", greeting);
 	}
 
-	public void testSalesmanWithMethodInvoker() throws Exception {
+	@Test
+	public void salesmanWithMethodInvoker() throws Exception {
 		MethodInvoker methodInvoker = new MethodInvoker();
 		methodInvoker.setTargetObject(new Greeter());
 		methodInvoker.setTargetMethod("greet");
@@ -112,7 +118,8 @@ public void testSalesmanWithMethodInvoker() throws Exception {
 		assertEquals("greetable: how are sales?", greeting);
 	}
 
-	public void testCustomerWithMethodInvoker() throws Exception {
+	@Test
+	public void customerWithMethodInvoker() throws Exception {
 		MethodInvoker methodInvoker = new MethodInvoker();
 		methodInvoker.setTargetObject(new Greeter());
 		methodInvoker.setTargetMethod("greet");
@@ -122,7 +129,8 @@ public void testCustomerWithMethodInvoker() throws Exception {
 		assertEquals("customer: good day", greeting);
 	}
 
-	public void testRegularWithMethodInvoker() throws Exception {
+	@Test
+	public void regularWithMethodInvoker() throws Exception {
 		MethodInvoker methodInvoker = new MethodInvoker();
 		methodInvoker.setTargetObject(new Greeter());
 		methodInvoker.setTargetMethod("greet");
@@ -132,7 +140,8 @@ public void testRegularWithMethodInvoker() throws Exception {
 		assertEquals("regular: welcome back Kotter", greeting);
 	}
 
-	public void testVIPWithMethodInvoker() throws Exception {
+	@Test
+	public void vipWithMethodInvoker() throws Exception {
 		MethodInvoker methodInvoker = new MethodInvoker();
 		methodInvoker.setTargetObject(new Greeter());
 		methodInvoker.setTargetMethod("greet");
@@ -216,13 +225,13 @@ private String greet(Regular regular) {
 	}
 
 
-	private static interface Greetable {
+	private interface Greetable {
 
 		String getGreeting();
 	}
 
 
-	private static interface Person extends Greetable {
+	private interface Person extends Greetable {
 	}
 
 
diff --git a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
index fcfe1b38d4..8f4c1e2822 100644
--- a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,23 +16,24 @@
 
 package org.springframework.util;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
 import java.io.IOException;
 import java.sql.SQLException;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import org.springframework.core.task.TaskRejectedException;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Rick Evans
  */
-public final class ObjectUtilsTests extends TestCase {
+public class ObjectUtilsTests {
 
+	@Test
 	public void testIsCheckedException() {
 		assertTrue(ObjectUtils.isCheckedException(new Exception()));
 		assertTrue(ObjectUtils.isCheckedException(new SQLException()));
@@ -45,37 +46,39 @@ public void testIsCheckedException() {
 		assertTrue(ObjectUtils.isCheckedException(new Throwable()));
 	}
 
+	@Test
 	public void testIsCompatibleWithThrowsClause() {
 		Class<?>[] empty = new Class[0];
 		Class<?>[] exception = new Class[] {Exception.class};
 		Class<?>[] sqlAndIO = new Class[] {SQLException.class, IOException.class};
 		Class<?>[] throwable = new Class[] {Throwable.class};
 
-		assertTrue(ObjectUtils.isCompatibleWithThrowsClause(new RuntimeException(), null));
+		assertTrue(ObjectUtils.isCompatibleWithThrowsClause(new RuntimeException()));
 		assertTrue(ObjectUtils.isCompatibleWithThrowsClause(new RuntimeException(), empty));
 		assertTrue(ObjectUtils.isCompatibleWithThrowsClause(new RuntimeException(), exception));
 		assertTrue(ObjectUtils.isCompatibleWithThrowsClause(new RuntimeException(), sqlAndIO));
 		assertTrue(ObjectUtils.isCompatibleWithThrowsClause(new RuntimeException(), throwable));
 
-		assertFalse(ObjectUtils.isCompatibleWithThrowsClause(new Exception(), null));
+		assertFalse(ObjectUtils.isCompatibleWithThrowsClause(new Exception()));
 		assertFalse(ObjectUtils.isCompatibleWithThrowsClause(new Exception(), empty));
 		assertTrue(ObjectUtils.isCompatibleWithThrowsClause(new Exception(), exception));
 		assertFalse(ObjectUtils.isCompatibleWithThrowsClause(new Exception(), sqlAndIO));
 		assertTrue(ObjectUtils.isCompatibleWithThrowsClause(new Exception(), throwable));
 
-		assertFalse(ObjectUtils.isCompatibleWithThrowsClause(new SQLException(), null));
+		assertFalse(ObjectUtils.isCompatibleWithThrowsClause(new SQLException()));
 		assertFalse(ObjectUtils.isCompatibleWithThrowsClause(new SQLException(), empty));
 		assertTrue(ObjectUtils.isCompatibleWithThrowsClause(new SQLException(), exception));
 		assertTrue(ObjectUtils.isCompatibleWithThrowsClause(new SQLException(), sqlAndIO));
 		assertTrue(ObjectUtils.isCompatibleWithThrowsClause(new SQLException(), throwable));
 
-		assertFalse(ObjectUtils.isCompatibleWithThrowsClause(new Throwable(), null));
+		assertFalse(ObjectUtils.isCompatibleWithThrowsClause(new Throwable()));
 		assertFalse(ObjectUtils.isCompatibleWithThrowsClause(new Throwable(), empty));
 		assertFalse(ObjectUtils.isCompatibleWithThrowsClause(new Throwable(), exception));
 		assertFalse(ObjectUtils.isCompatibleWithThrowsClause(new Throwable(), sqlAndIO));
 		assertTrue(ObjectUtils.isCompatibleWithThrowsClause(new Throwable(), throwable));
 	}
 
+	@Test
 	public void testToObjectArray() {
 		int[] a = new int[] {1, 2, 3, 4, 5};
 		Integer[] wrapper = (Integer[]) ObjectUtils.toObjectArray(a);
@@ -85,18 +88,21 @@ public void testToObjectArray() {
 		}
 	}
 
+	@Test
 	public void testToObjectArrayWithNull() {
 		Object[] objects = ObjectUtils.toObjectArray(null);
 		assertNotNull(objects);
 		assertEquals(0, objects.length);
 	}
 
+	@Test
 	public void testToObjectArrayWithEmptyPrimitiveArray() {
 		Object[] objects = ObjectUtils.toObjectArray(new byte[] {});
 		assertNotNull(objects);
 		assertEquals(0, objects.length);
 	}
 
+	@Test
 	public void testToObjectArrayWithNonArrayType() {
 		try {
 			ObjectUtils.toObjectArray("Not an []");
@@ -106,11 +112,13 @@ public void testToObjectArrayWithNonArrayType() {
 		}
 	}
 
+	@Test
 	public void testToObjectArrayWithNonPrimitiveArray() {
 		String[] source = new String[] {"Bingo"};
-		assertEquals(source, ObjectUtils.toObjectArray(source));
+		assertArrayEquals(source, ObjectUtils.toObjectArray(source));
 	}
 
+	@Test
 	public void testAddObjectToArraySunnyDay() {
 		String[] array = new String[] {"foo", "bar"};
 		String newElement = "baz";
@@ -119,6 +127,7 @@ public void testAddObjectToArraySunnyDay() {
 		assertEquals(newElement, newArray[2]);
 	}
 
+	@Test
 	public void testAddObjectToArrayWhenEmpty() {
 		String[] array = new String[0];
 		String newElement = "foo";
@@ -127,6 +136,7 @@ public void testAddObjectToArrayWhenEmpty() {
 		assertEquals(newElement, newArray[0]);
 	}
 
+	@Test
 	public void testAddObjectToSingleNonNullElementArray() {
 		String existingElement = "foo";
 		String[] array = new String[] {existingElement};
@@ -137,6 +147,7 @@ public void testAddObjectToSingleNonNullElementArray() {
 		assertEquals(newElement, newArray[1]);
 	}
 
+	@Test
 	public void testAddObjectToSingleNullElementArray() {
 		String[] array = new String[] {null};
 		String newElement = "bar";
@@ -146,6 +157,7 @@ public void testAddObjectToSingleNullElementArray() {
 		assertEquals(newElement, newArray[1]);
 	}
 
+	@Test
 	public void testAddObjectToNullArray() throws Exception {
 		String newElement = "foo";
 		String[] newArray = ObjectUtils.addObjectToArray(null, newElement);
@@ -153,136 +165,166 @@ public void testAddObjectToNullArray() throws Exception {
 		assertEquals(newElement, newArray[0]);
 	}
 
+	@Test
 	public void testAddNullObjectToNullArray() throws Exception {
 		Object[] newArray = ObjectUtils.addObjectToArray(null, null);
 		assertEquals(1, newArray.length);
 		assertEquals(null, newArray[0]);
 	}
 
+	@Test
 	public void testNullSafeEqualsWithArrays() throws Exception {
 		assertTrue(ObjectUtils.nullSafeEquals(new String[] {"a", "b", "c"}, new String[] {"a", "b", "c"}));
 		assertTrue(ObjectUtils.nullSafeEquals(new int[] {1, 2, 3}, new int[] {1, 2, 3}));
 	}
 
+	@Test
 	public void testHashCodeWithBooleanFalse() {
 		int expected = Boolean.FALSE.hashCode();
 		assertEquals(expected, ObjectUtils.hashCode(false));
 	}
 
+	@Test
 	public void testHashCodeWithBooleanTrue() {
 		int expected = Boolean.TRUE.hashCode();
 		assertEquals(expected, ObjectUtils.hashCode(true));
 	}
 
+	@Test
 	public void testHashCodeWithDouble() {
 		double dbl = 9830.43;
 		int expected = (new Double(dbl)).hashCode();
 		assertEquals(expected, ObjectUtils.hashCode(dbl));
 	}
 
+	@Test
 	public void testHashCodeWithFloat() {
 		float flt = 34.8f;
 		int expected = (new Float(flt)).hashCode();
 		assertEquals(expected, ObjectUtils.hashCode(flt));
 	}
 
+	@Test
 	public void testHashCodeWithLong() {
 		long lng = 883l;
 		int expected = (new Long(lng)).hashCode();
 		assertEquals(expected, ObjectUtils.hashCode(lng));
 	}
 
+	@Test
 	public void testIdentityToString() {
 		Object obj = new Object();
 		String expected = obj.getClass().getName() + "@" + ObjectUtils.getIdentityHexString(obj);
 		String actual = ObjectUtils.identityToString(obj);
-		assertEquals(expected.toString(), actual);
+		assertEquals(expected, actual);
 	}
 
+	@Test
 	public void testIdentityToStringWithNullObject() {
 		assertEquals("", ObjectUtils.identityToString(null));
 	}
 
+	@Test
 	public void testIsArrayOfPrimitivesWithBooleanArray() {
 		assertTrue(ClassUtils.isPrimitiveArray(boolean[].class));
 	}
 
+	@Test
 	public void testIsArrayOfPrimitivesWithObjectArray() {
 		assertFalse(ClassUtils.isPrimitiveArray(Object[].class));
 	}
 
+	@Test
 	public void testIsArrayOfPrimitivesWithNonArray() {
 		assertFalse(ClassUtils.isPrimitiveArray(String.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithBooleanPrimitiveClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(boolean.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithBooleanWrapperClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(Boolean.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithBytePrimitiveClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(byte.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithByteWrapperClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(Byte.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithCharacterClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(Character.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithCharClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(char.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithDoublePrimitiveClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(double.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithDoubleWrapperClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(Double.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithFloatPrimitiveClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(float.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithFloatWrapperClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(Float.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithIntClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(int.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithIntegerClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(Integer.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithLongPrimitiveClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(long.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithLongWrapperClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(Long.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithNonPrimitiveOrWrapperClass() {
 		assertFalse(ClassUtils.isPrimitiveOrWrapper(Object.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithShortPrimitiveClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(short.class));
 	}
 
+	@Test
 	public void testIsPrimitiveOrWrapperWithShortWrapperClass() {
 		assertTrue(ClassUtils.isPrimitiveOrWrapper(Short.class));
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithBooleanArray() {
 		int expected = 31 * 7 + Boolean.TRUE.hashCode();
 		expected = 31 * expected + Boolean.FALSE.hashCode();
@@ -293,10 +335,12 @@ public void testNullSafeHashCodeWithBooleanArray() {
 		assertEquals(expected, actual);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithBooleanArrayEqualToNull() {
 		assertEquals(0, ObjectUtils.nullSafeHashCode((boolean[]) null));
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithByteArray() {
 		int expected = 31 * 7 + 8;
 		expected = 31 * expected + 10;
@@ -307,10 +351,12 @@ public void testNullSafeHashCodeWithByteArray() {
 		assertEquals(expected, actual);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithByteArrayEqualToNull() {
 		assertEquals(0, ObjectUtils.nullSafeHashCode((byte[]) null));
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithCharArray() {
 		int expected = 31 * 7 + 'a';
 		expected = 31 * expected + 'E';
@@ -321,10 +367,12 @@ public void testNullSafeHashCodeWithCharArray() {
 		assertEquals(expected, actual);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithCharArrayEqualToNull() {
 		assertEquals(0, ObjectUtils.nullSafeHashCode((char[]) null));
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithDoubleArray() {
 		long bits = Double.doubleToLongBits(8449.65);
 		int expected = 31 * 7 + (int) (bits ^ (bits >>> 32));
@@ -337,10 +385,12 @@ public void testNullSafeHashCodeWithDoubleArray() {
 		assertEquals(expected, actual);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithDoubleArrayEqualToNull() {
 		assertEquals(0, ObjectUtils.nullSafeHashCode((double[]) null));
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithFloatArray() {
 		int expected = 31 * 7 + Float.floatToIntBits(9.6f);
 		expected = 31 * expected + Float.floatToIntBits(7.4f);
@@ -351,10 +401,12 @@ public void testNullSafeHashCodeWithFloatArray() {
 		assertEquals(expected, actual);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithFloatArrayEqualToNull() {
 		assertEquals(0, ObjectUtils.nullSafeHashCode((float[]) null));
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithIntArray() {
 		int expected = 31 * 7 + 884;
 		expected = 31 * expected + 340;
@@ -365,10 +417,12 @@ public void testNullSafeHashCodeWithIntArray() {
 		assertEquals(expected, actual);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithIntArrayEqualToNull() {
 		assertEquals(0, ObjectUtils.nullSafeHashCode((int[]) null));
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithLongArray() {
 		long lng = 7993l;
 		int expected = 31 * 7 + (int) (lng ^ (lng >>> 32));
@@ -381,15 +435,18 @@ public void testNullSafeHashCodeWithLongArray() {
 		assertEquals(expected, actual);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithLongArrayEqualToNull() {
 		assertEquals(0, ObjectUtils.nullSafeHashCode((long[]) null));
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObject() {
 		String str = "Luke";
 		assertEquals(str.hashCode(), ObjectUtils.nullSafeHashCode(str));
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObjectArray() {
 		int expected = 31 * 7 + "Leia".hashCode();
 		expected = 31 * expected + "Han".hashCode();
@@ -400,68 +457,80 @@ public void testNullSafeHashCodeWithObjectArray() {
 		assertEquals(expected, actual);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObjectArrayEqualToNull() {
 		assertEquals(0, ObjectUtils.nullSafeHashCode((Object[]) null));
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObjectBeingBooleanArray() {
 		Object array = new boolean[] {true, false};
 		int expected = ObjectUtils.nullSafeHashCode((boolean[]) array);
 		assertEqualHashCodes(expected, array);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObjectBeingByteArray() {
 		Object array = new byte[] {6, 39};
 		int expected = ObjectUtils.nullSafeHashCode((byte[]) array);
 		assertEqualHashCodes(expected, array);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObjectBeingCharArray() {
 		Object array = new char[] {'l', 'M'};
 		int expected = ObjectUtils.nullSafeHashCode((char[]) array);
 		assertEqualHashCodes(expected, array);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObjectBeingDoubleArray() {
 		Object array = new double[] {68930.993, 9022.009};
 		int expected = ObjectUtils.nullSafeHashCode((double[]) array);
 		assertEqualHashCodes(expected, array);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObjectBeingFloatArray() {
 		Object array = new float[] {9.9f, 9.54f};
 		int expected = ObjectUtils.nullSafeHashCode((float[]) array);
 		assertEqualHashCodes(expected, array);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObjectBeingIntArray() {
 		Object array = new int[] {89, 32};
 		int expected = ObjectUtils.nullSafeHashCode((int[]) array);
 		assertEqualHashCodes(expected, array);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObjectBeingLongArray() {
 		Object array = new long[] {4389, 320};
 		int expected = ObjectUtils.nullSafeHashCode((long[]) array);
 		assertEqualHashCodes(expected, array);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObjectBeingObjectArray() {
 		Object array = new Object[] {"Luke", "Anakin"};
 		int expected = ObjectUtils.nullSafeHashCode((Object[]) array);
 		assertEqualHashCodes(expected, array);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObjectBeingShortArray() {
 		Object array = new short[] {5, 3};
 		int expected = ObjectUtils.nullSafeHashCode((short[]) array);
 		assertEqualHashCodes(expected, array);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithObjectEqualToNull() {
 		assertEquals(0, ObjectUtils.nullSafeHashCode((Object) null));
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithShortArray() {
 		int expected = 31 * 7 + 70;
 		expected = 31 * expected + 8;
@@ -472,156 +541,187 @@ public void testNullSafeHashCodeWithShortArray() {
 		assertEquals(expected, actual);
 	}
 
+	@Test
 	public void testNullSafeHashCodeWithShortArrayEqualToNull() {
 		assertEquals(0, ObjectUtils.nullSafeHashCode((short[]) null));
 	}
 
+	@Test
 	public void testNullSafeToStringWithBooleanArray() {
 		boolean[] array = {true, false};
 		assertEquals("{true, false}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithBooleanArrayBeingEmpty() {
 		boolean[] array = {};
 		assertEquals("{}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithBooleanArrayEqualToNull() {
 		assertEquals("null", ObjectUtils.nullSafeToString((boolean[]) null));
 	}
 
+	@Test
 	public void testNullSafeToStringWithByteArray() {
 		byte[] array = {5, 8};
 		assertEquals("{5, 8}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithByteArrayBeingEmpty() {
 		byte[] array = {};
 		assertEquals("{}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithByteArrayEqualToNull() {
 		assertEquals("null", ObjectUtils.nullSafeToString((byte[]) null));
 	}
 
+	@Test
 	public void testNullSafeToStringWithCharArray() {
 		char[] array = {'A', 'B'};
 		assertEquals("{'A', 'B'}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithCharArrayBeingEmpty() {
 		char[] array = {};
 		assertEquals("{}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithCharArrayEqualToNull() {
 		assertEquals("null", ObjectUtils.nullSafeToString((char[]) null));
 	}
 
+	@Test
 	public void testNullSafeToStringWithDoubleArray() {
 		double[] array = {8594.93, 8594023.95};
 		assertEquals("{8594.93, 8594023.95}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithDoubleArrayBeingEmpty() {
 		double[] array = {};
 		assertEquals("{}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithDoubleArrayEqualToNull() {
 		assertEquals("null", ObjectUtils.nullSafeToString((double[]) null));
 	}
 
+	@Test
 	public void testNullSafeToStringWithFloatArray() {
 		float[] array = {8.6f, 43.8f};
 		assertEquals("{8.6, 43.8}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithFloatArrayBeingEmpty() {
 		float[] array = {};
 		assertEquals("{}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithFloatArrayEqualToNull() {
 		assertEquals("null", ObjectUtils.nullSafeToString((float[]) null));
 	}
 
+	@Test
 	public void testNullSafeToStringWithIntArray() {
 		int[] array = {9, 64};
 		assertEquals("{9, 64}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithIntArrayBeingEmpty() {
 		int[] array = {};
 		assertEquals("{}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithIntArrayEqualToNull() {
 		assertEquals("null", ObjectUtils.nullSafeToString((int[]) null));
 	}
 
+	@Test
 	public void testNullSafeToStringWithLongArray() {
 		long[] array = {434l, 23423l};
 		assertEquals("{434, 23423}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithLongArrayBeingEmpty() {
 		long[] array = {};
 		assertEquals("{}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithLongArrayEqualToNull() {
 		assertEquals("null", ObjectUtils.nullSafeToString((long[]) null));
 	}
 
+	@Test
 	public void testNullSafeToStringWithPlainOldString() {
 		assertEquals("I shoh love tha taste of mangoes", ObjectUtils.nullSafeToString("I shoh love tha taste of mangoes"));
 	}
 
+	@Test
 	public void testNullSafeToStringWithObjectArray() {
 		Object[] array = {"Han", new Long(43)};
 		assertEquals("{Han, 43}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithObjectArrayBeingEmpty() {
 		Object[] array = {};
 		assertEquals("{}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithObjectArrayEqualToNull() {
 		assertEquals("null", ObjectUtils.nullSafeToString((Object[]) null));
 	}
 
+	@Test
 	public void testNullSafeToStringWithShortArray() {
 		short[] array = {7, 9};
 		assertEquals("{7, 9}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithShortArrayBeingEmpty() {
 		short[] array = {};
 		assertEquals("{}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithShortArrayEqualToNull() {
 		assertEquals("null", ObjectUtils.nullSafeToString((short[]) null));
 	}
 
+	@Test
 	public void testNullSafeToStringWithStringArray() {
 		String[] array = {"Luke", "Anakin"};
 		assertEquals("{Luke, Anakin}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithStringArrayBeingEmpty() {
 		String[] array = {};
 		assertEquals("{}", ObjectUtils.nullSafeToString(array));
 	}
 
+	@Test
 	public void testNullSafeToStringWithStringArrayEqualToNull() {
 		assertEquals("null", ObjectUtils.nullSafeToString((String[]) null));
 	}
 
-	enum Tropes { FOO, BAR, baz };
-
+	@Test
 	public void testContainsConstant() {
 		assertThat(ObjectUtils.containsConstant(Tropes.values(), "FOO"), is(true));
 		assertThat(ObjectUtils.containsConstant(Tropes.values(), "foo"), is(true));
@@ -636,13 +736,15 @@ public void testContainsConstant() {
 		assertThat(ObjectUtils.containsConstant(Tropes.values(), "foo", true), is(false));
 	}
 
+	@Test
 	public void testCaseInsensitiveValueOf() {
 		assertThat(ObjectUtils.caseInsensitiveValueOf(Tropes.values(), "foo"), is(Tropes.FOO));
 		assertThat(ObjectUtils.caseInsensitiveValueOf(Tropes.values(), "BAR"), is(Tropes.BAR));
 		try {
 			ObjectUtils.caseInsensitiveValueOf(Tropes.values(), "bogus");
 			fail("expected IllegalArgumentException");
-		} catch (IllegalArgumentException ex) {
+		}
+		catch (IllegalArgumentException ex) {
 			assertThat(ex.getMessage(),
 					is("constant [bogus] does not exist in enum type " +
 					"org.springframework.util.ObjectUtilsTests$Tropes"));
@@ -655,4 +757,7 @@ private void assertEqualHashCodes(int expected, Object array) {
 		assertTrue(array.hashCode() != actual);
 	}
 
+
+	enum Tropes { FOO, BAR, baz }
+
 }
diff --git a/spring-core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java b/spring-core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java
index 8128cee620..df116ee53b 100644
--- a/spring-core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,17 @@
 
 package org.springframework.util;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Juergen Hoeller
  * @author Johan Gorter
  */
-public class PatternMatchUtilsTests extends TestCase {
+public class PatternMatchUtilsTests {
 
+	@Test
 	public void testTrivial() {
 		assertEquals(false, PatternMatchUtils.simpleMatch((String) null, ""));
 		assertEquals(false, PatternMatchUtils.simpleMatch("1", null));
@@ -31,16 +34,19 @@ public void testTrivial() {
 		doTest("123", "123", true);
 	}
 
+	@Test
 	public void testStartsWith() {
 		doTest("get*", "getMe", true);
 		doTest("get*", "setMe", false);
 	}
 
+	@Test
 	public void testEndsWith() {
 		doTest("*Test", "getMeTest", true);
 		doTest("*Test", "setMe", false);
 	}
 
+	@Test
 	public void testBetween() {
 		doTest("*stuff*", "getMeTest", false);
 		doTest("*stuff*", "getstuffTest", true);
@@ -49,6 +55,7 @@ public void testBetween() {
 		doTest("*stuff*", "stuff", true);
 	}
 
+	@Test
 	public void testStartsEnds() {
 		doTest("on*Event", "onMyEvent", true);
 		doTest("on*Event", "onEvent", true);
@@ -56,6 +63,7 @@ public void testStartsEnds() {
 		doTest("3*3", "33", true);
 	}
 
+	@Test
 	public void testStartsEndsBetween() {
 		doTest("12*45*78", "12345678", true);
 		doTest("12*45*78", "123456789", false);
@@ -66,6 +74,7 @@ public void testStartsEndsBetween() {
 		doTest("3*3*3", "333", true);
 	}
 
+	@Test
 	public void testRidiculous() {
 		doTest("*1*2*3*", "0011002001010030020201030", true);
 		doTest("1*2*3*4", "10300204", false);
@@ -74,6 +83,22 @@ public void testRidiculous() {
 		doTest("*1*2*3*", "132", false);
 	}
 
+	@Test
+	public void testPatternVariants() {
+		doTest("*a", "*", false);
+		doTest("*a", "a", true);
+		doTest("*a", "b", false);
+		doTest("*a", "aa", true);
+		doTest("*a", "ba", true);
+		doTest("*a", "ab", false);
+		doTest("**a", "*", false);
+		doTest("**a", "a", true);
+		doTest("**a", "b", false);
+		doTest("**a", "aa", true);
+		doTest("**a", "ba", true);
+		doTest("**a", "ab", false);
+	}
+
 	private void doTest(String pattern, String str, boolean shouldMatch) {
 		assertEquals(shouldMatch, PatternMatchUtils.simpleMatch(pattern, str));
 	}
diff --git a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
index 7d555076ba..3c0c8f84b8 100644
--- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import java.util.List;
 
 import org.hamcrest.Matchers;
-
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -33,7 +32,7 @@
 import org.springframework.tests.TestGroup;
 import org.springframework.tests.sample.objects.TestObject;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 /**
@@ -67,8 +66,8 @@ public void findField() {
 
 	@Test
 	public void setField() {
-		final TestObjectSubclassWithNewField testBean = new TestObjectSubclassWithNewField();
-		final Field field = ReflectionUtils.findField(TestObjectSubclassWithNewField.class, "name", String.class);
+		TestObjectSubclassWithNewField testBean = new TestObjectSubclassWithNewField();
+		Field field = ReflectionUtils.findField(TestObjectSubclassWithNewField.class, "name", String.class);
 
 		ReflectionUtils.makeAccessible(field);
 
@@ -80,13 +79,6 @@ public void setField() {
 		assertNull(testBean.getName());
 	}
 
-	@Test(expected = IllegalStateException.class)
-	public void setFieldIllegal() {
-		final TestObjectSubclassWithNewField testBean = new TestObjectSubclassWithNewField();
-		final Field field = ReflectionUtils.findField(TestObjectSubclassWithNewField.class, "name", String.class);
-		ReflectionUtils.setField(field, testBean, "FooBar");
-	}
-
 	@Test
 	public void invokeMethod() throws Exception {
 		String rob = "Rob Harrop";
@@ -95,65 +87,50 @@ public void invokeMethod() throws Exception {
 		bean.setName(rob);
 
 		Method getName = TestObject.class.getMethod("getName", (Class[]) null);
-		Method setName = TestObject.class.getMethod("setName", new Class[] { String.class });
+		Method setName = TestObject.class.getMethod("setName", String.class);
 
 		Object name = ReflectionUtils.invokeMethod(getName, bean);
 		assertEquals("Incorrect name returned", rob, name);
 
 		String juergen = "Juergen Hoeller";
-		ReflectionUtils.invokeMethod(setName, bean, new Object[] { juergen });
+		ReflectionUtils.invokeMethod(setName, bean, juergen);
 		assertEquals("Incorrect name set", juergen, bean.getName());
 	}
 
 	@Test
 	public void declaresException() throws Exception {
-		Method remoteExMethod = A.class.getDeclaredMethod("foo", new Class[] { Integer.class });
+		Method remoteExMethod = A.class.getDeclaredMethod("foo", Integer.class);
 		assertTrue(ReflectionUtils.declaresException(remoteExMethod, RemoteException.class));
 		assertTrue(ReflectionUtils.declaresException(remoteExMethod, ConnectException.class));
 		assertFalse(ReflectionUtils.declaresException(remoteExMethod, NoSuchMethodException.class));
 		assertFalse(ReflectionUtils.declaresException(remoteExMethod, Exception.class));
 
-		Method illegalExMethod = B.class.getDeclaredMethod("bar", new Class[] { String.class });
+		Method illegalExMethod = B.class.getDeclaredMethod("bar", String.class);
 		assertTrue(ReflectionUtils.declaresException(illegalExMethod, IllegalArgumentException.class));
 		assertTrue(ReflectionUtils.declaresException(illegalExMethod, NumberFormatException.class));
 		assertFalse(ReflectionUtils.declaresException(illegalExMethod, IllegalStateException.class));
 		assertFalse(ReflectionUtils.declaresException(illegalExMethod, Exception.class));
 	}
 
-	@Test
+	@Test(expected = IllegalArgumentException.class)
 	public void copySrcToDestinationOfIncorrectClass() {
 		TestObject src = new TestObject();
 		String dest = new String();
-		try {
-			ReflectionUtils.shallowCopyFieldState(src, dest);
-			fail();
-		} catch (IllegalArgumentException ex) {
-			// Ok
-		}
+		ReflectionUtils.shallowCopyFieldState(src, dest);
 	}
 
-	@Test
+	@Test(expected = IllegalArgumentException.class)
 	public void rejectsNullSrc() {
 		TestObject src = null;
 		String dest = new String();
-		try {
-			ReflectionUtils.shallowCopyFieldState(src, dest);
-			fail();
-		} catch (IllegalArgumentException ex) {
-			// Ok
-		}
+		ReflectionUtils.shallowCopyFieldState(src, dest);
 	}
 
-	@Test
+	@Test(expected = IllegalArgumentException.class)
 	public void rejectsNullDest() {
 		TestObject src = new TestObject();
 		String dest = null;
-		try {
-			ReflectionUtils.shallowCopyFieldState(src, dest);
-			fail();
-		} catch (IllegalArgumentException ex) {
-			// Ok
-		}
+		ReflectionUtils.shallowCopyFieldState(src, dest);
 	}
 
 	@Test
diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
index b366ed7f96..2153267b36 100644
--- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,29 +20,35 @@
 import java.util.Locale;
 import java.util.Properties;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Rick Evans
  */
-public class StringUtilsTests extends TestCase {
+public class StringUtilsTests {
 
+	@Test
 	public void testHasTextBlank() throws Exception {
 		String blank = "          ";
 		assertEquals(false, StringUtils.hasText(blank));
 	}
 
+	@Test
 	public void testHasTextNullEmpty() throws Exception {
 		assertEquals(false, StringUtils.hasText(null));
 		assertEquals(false, StringUtils.hasText(""));
 	}
 
+	@Test
 	public void testHasTextValid() throws Exception {
 		assertEquals(true, StringUtils.hasText("t"));
 	}
 
+	@Test
 	public void testContainsWhitespace() throws Exception {
 		assertFalse(StringUtils.containsWhitespace(null));
 		assertFalse(StringUtils.containsWhitespace(""));
@@ -55,6 +61,7 @@ public void testContainsWhitespace() throws Exception {
 		assertTrue(StringUtils.containsWhitespace("a  b"));
 	}
 
+	@Test
 	public void testTrimWhitespace() throws Exception {
 		assertEquals(null, StringUtils.trimWhitespace(null));
 		assertEquals("", StringUtils.trimWhitespace(""));
@@ -67,6 +74,7 @@ public void testTrimWhitespace() throws Exception {
 		assertEquals("a b  c", StringUtils.trimWhitespace(" a b  c "));
 	}
 
+	@Test
 	public void testTrimAllWhitespace() throws Exception {
 		assertEquals("", StringUtils.trimAllWhitespace(""));
 		assertEquals("", StringUtils.trimAllWhitespace(" "));
@@ -78,6 +86,7 @@ public void testTrimAllWhitespace() throws Exception {
 		assertEquals("abc", StringUtils.trimAllWhitespace(" a b  c "));
 	}
 
+	@Test
 	public void testTrimLeadingWhitespace() throws Exception {
 		assertEquals(null, StringUtils.trimLeadingWhitespace(null));
 		assertEquals("", StringUtils.trimLeadingWhitespace(""));
@@ -90,6 +99,7 @@ public void testTrimLeadingWhitespace() throws Exception {
 		assertEquals("a b  c ", StringUtils.trimLeadingWhitespace(" a b  c "));
 	}
 
+	@Test
 	public void testTrimTrailingWhitespace() throws Exception {
 		assertEquals(null, StringUtils.trimTrailingWhitespace(null));
 		assertEquals("", StringUtils.trimTrailingWhitespace(""));
@@ -102,6 +112,7 @@ public void testTrimTrailingWhitespace() throws Exception {
 		assertEquals(" a b  c", StringUtils.trimTrailingWhitespace(" a b  c "));
 	}
 
+	@Test
 	public void testTrimLeadingCharacter() throws Exception {
 		assertEquals(null, StringUtils.trimLeadingCharacter(null, ' '));
 		assertEquals("", StringUtils.trimLeadingCharacter("", ' '));
@@ -114,6 +125,7 @@ public void testTrimLeadingCharacter() throws Exception {
 		assertEquals("a b  c ", StringUtils.trimLeadingCharacter(" a b  c ", ' '));
 	}
 
+	@Test
 	public void testTrimTrailingCharacter() throws Exception {
 		assertEquals(null, StringUtils.trimTrailingCharacter(null, ' '));
 		assertEquals("", StringUtils.trimTrailingCharacter("", ' '));
@@ -126,6 +138,7 @@ public void testTrimTrailingCharacter() throws Exception {
 		assertEquals(" a b  c", StringUtils.trimTrailingCharacter(" a b  c ", ' '));
 	}
 
+	@Test
 	public void testCountOccurrencesOf() {
 		assertTrue("nullx2 = 0",
 				StringUtils.countOccurrencesOf(null, null) == 0);
@@ -152,6 +165,7 @@ public void testCountOccurrencesOf() {
 		assertTrue("test last", StringUtils.countOccurrencesOf(s, "r") == 2);
 	}
 
+	@Test
 	public void testReplace() throws Exception {
 		String inString = "a6AazAaa77abaa";
 		String oldPattern = "aa";
@@ -174,6 +188,7 @@ public void testReplace() throws Exception {
 		assertTrue("Replace non matched is equal", s.equals(inString));
 	}
 
+	@Test
 	public void testDelete() throws Exception {
 		String inString = "The quick brown fox jumped over the lazy dog";
 
@@ -200,6 +215,7 @@ public void testDelete() throws Exception {
 		assertTrue("Result is unchanged", nochange.equals(inString));
 	}
 
+	@Test
 	public void testDeleteAny() throws Exception {
 		String inString = "Able was I ere I saw Elba";
 
@@ -213,45 +229,51 @@ public void testDeleteAny() throws Exception {
 		assertTrue("Result is unchanged", mismatch.equals(inString));
 
 		String whitespace = "This is\n\n\n    \t   a messagy string with whitespace\n";
-		assertTrue("Has CR", whitespace.indexOf("\n") != -1);
-		assertTrue("Has tab", whitespace.indexOf("\t") != -1);
-		assertTrue("Has  sp", whitespace.indexOf(" ") != -1);
+		assertTrue("Has CR", whitespace.contains("\n"));
+		assertTrue("Has tab", whitespace.contains("\t"));
+		assertTrue("Has  sp", whitespace.contains(" "));
 		String cleaned = StringUtils.deleteAny(whitespace, "\n\t ");
-		assertTrue("Has no CR", cleaned.indexOf("\n") == -1);
-		assertTrue("Has no tab", cleaned.indexOf("\t") == -1);
-		assertTrue("Has no sp", cleaned.indexOf(" ") == -1);
+		assertTrue("Has no CR", !cleaned.contains("\n"));
+		assertTrue("Has no tab", !cleaned.contains("\t"));
+		assertTrue("Has no sp", !cleaned.contains(" "));
 		assertTrue("Still has chars", cleaned.length() > 10);
 	}
 
 
+	@Test
 	public void testQuote() {
 		assertEquals("'myString'", StringUtils.quote("myString"));
 		assertEquals("''", StringUtils.quote(""));
 		assertNull(StringUtils.quote(null));
 	}
 
+	@Test
 	public void testQuoteIfString() {
 		assertEquals("'myString'", StringUtils.quoteIfString("myString"));
 		assertEquals("''", StringUtils.quoteIfString(""));
-		assertEquals(new Integer(5), StringUtils.quoteIfString(new Integer(5)));
+		assertEquals(new Integer(5), StringUtils.quoteIfString(5));
 		assertNull(StringUtils.quoteIfString(null));
 	}
 
+	@Test
 	public void testUnqualify() {
 		String qualified = "i.am.not.unqualified";
 		assertEquals("unqualified", StringUtils.unqualify(qualified));
 	}
 
+	@Test
 	public void testCapitalize() {
 		String capitalized = "i am not capitalized";
 		assertEquals("I am not capitalized", StringUtils.capitalize(capitalized));
 	}
 
+	@Test
 	public void testUncapitalize() {
 		String capitalized = "I am capitalized";
 		assertEquals("i am capitalized", StringUtils.uncapitalize(capitalized));
 	}
 
+	@Test
 	public void testGetFilename() {
 		assertEquals(null, StringUtils.getFilename(null));
 		assertEquals("", StringUtils.getFilename(""));
@@ -263,6 +285,7 @@ public void testGetFilename() {
 		assertEquals("myfile.txt", StringUtils.getFilename("mypath/myfile.txt"));
 	}
 
+	@Test
 	public void testGetFilenameExtension() {
 		assertEquals(null, StringUtils.getFilenameExtension(null));
 		assertEquals(null, StringUtils.getFilenameExtension(""));
@@ -276,6 +299,7 @@ public void testGetFilenameExtension() {
 		assertEquals("txt", StringUtils.getFilenameExtension("/home/user/.m2/settings/myfile.txt"));
 	}
 
+	@Test
 	public void testStripFilenameExtension() {
 		assertEquals(null, StringUtils.stripFilenameExtension(null));
 		assertEquals("", StringUtils.stripFilenameExtension(""));
@@ -290,6 +314,7 @@ public void testStripFilenameExtension() {
 		assertEquals("/home/user/.m2/settings/myfile", StringUtils.stripFilenameExtension("/home/user/.m2/settings/myfile.txt"));
 	}
 
+	@Test
 	public void testCleanPath() {
 		assertEquals("mypath/myfile", StringUtils.cleanPath("mypath/myfile"));
 		assertEquals("mypath/myfile", StringUtils.cleanPath("mypath\\myfile"));
@@ -299,8 +324,11 @@ public void testCleanPath() {
 		assertEquals("../mypath/myfile", StringUtils.cleanPath("../mypath/../mypath/myfile"));
 		assertEquals("../mypath/myfile", StringUtils.cleanPath("mypath/../../mypath/myfile"));
 		assertEquals("/../mypath/myfile", StringUtils.cleanPath("/../mypath/myfile"));
+		assertEquals("/mypath/myfile", StringUtils.cleanPath("/a/:b/../../mypath/myfile"));
+		assertEquals("file:///c:/path/to/the%20file.txt", StringUtils.cleanPath("file:///c:/some/../path/to/the%20file.txt"));
 	}
 
+	@Test
 	public void testPathEquals() {
 		assertTrue("Must be true for the same strings",
 				StringUtils.pathEquals("/dummy1/dummy2/dummy3",
@@ -346,6 +374,7 @@ public void testPathEquals() {
 						"/dummy1/dummy2/dummy4"));
 	}
 
+	@Test
 	public void testConcatenateStringArrays() {
 		String[] input1 = new String[] {"myString2"};
 		String[] input2 = new String[] {"myString1", "myString2"};
@@ -355,11 +384,12 @@ public void testConcatenateStringArrays() {
 		assertEquals("myString1", result[1]);
 		assertEquals("myString2", result[2]);
 
-		assertEquals(input1, StringUtils.concatenateStringArrays(input1, null));
-		assertEquals(input2, StringUtils.concatenateStringArrays(null, input2));
+		assertArrayEquals(input1, StringUtils.concatenateStringArrays(input1, null));
+		assertArrayEquals(input2, StringUtils.concatenateStringArrays(null, input2));
 		assertNull(StringUtils.concatenateStringArrays(null, null));
 	}
 
+	@Test
 	public void testMergeStringArrays() {
 		String[] input1 = new String[] {"myString2"};
 		String[] input2 = new String[] {"myString1", "myString2"};
@@ -368,11 +398,12 @@ public void testMergeStringArrays() {
 		assertEquals("myString2", result[0]);
 		assertEquals("myString1", result[1]);
 
-		assertEquals(input1, StringUtils.mergeStringArrays(input1, null));
-		assertEquals(input2, StringUtils.mergeStringArrays(null, input2));
+		assertArrayEquals(input1, StringUtils.mergeStringArrays(input1, null));
+		assertArrayEquals(input2, StringUtils.mergeStringArrays(null, input2));
 		assertNull(StringUtils.mergeStringArrays(null, null));
 	}
 
+	@Test
 	public void testSortStringArray() {
 		String[] input = new String[] {"myString2"};
 		input = StringUtils.addStringToArray(input, "myString1");
@@ -384,6 +415,7 @@ public void testSortStringArray() {
 		assertEquals("myString2", input[1]);
 	}
 
+	@Test
 	public void testRemoveDuplicateStrings() {
 		String[] input = new String[] {"myString2", "myString1", "myString2"};
 		input = StringUtils.removeDuplicateStrings(input);
@@ -391,6 +423,7 @@ public void testRemoveDuplicateStrings() {
 		assertEquals("myString2", input[1]);
 	}
 
+	@Test
 	public void testSplitArrayElementsIntoProperties() {
 		String[] input = new String[] {"key1=value1 ", "key2 =\"value2\""};
 		Properties result = StringUtils.splitArrayElementsIntoProperties(input, "=");
@@ -398,6 +431,7 @@ public void testSplitArrayElementsIntoProperties() {
 		assertEquals("\"value2\"", result.getProperty("key2"));
 	}
 
+	@Test
 	public void testSplitArrayElementsIntoPropertiesAndDeletedChars() {
 		String[] input = new String[] {"key1=value1 ", "key2 =\"value2\""};
 		Properties result = StringUtils.splitArrayElementsIntoProperties(input, "=", "\"");
@@ -405,6 +439,7 @@ public void testSplitArrayElementsIntoPropertiesAndDeletedChars() {
 		assertEquals("value2", result.getProperty("key2"));
 	}
 
+	@Test
 	public void testTokenizeToStringArray() {
 		String[] sa = StringUtils.tokenizeToStringArray("a,b , ,c", ",");
 		assertEquals(3, sa.length);
@@ -412,6 +447,7 @@ public void testTokenizeToStringArray() {
 				sa[0].equals("a") && sa[1].equals("b") && sa[2].equals("c"));
 	}
 
+	@Test
 	public void testTokenizeToStringArrayWithNotIgnoreEmptyTokens() {
 		String[] sa = StringUtils.tokenizeToStringArray("a,b , ,c", ",", true, false);
 		assertEquals(4, sa.length);
@@ -419,6 +455,7 @@ public void testTokenizeToStringArrayWithNotIgnoreEmptyTokens() {
 				sa[0].equals("a") && sa[1].equals("b") && sa[2].equals("") && sa[3].equals("c"));
 	}
 
+	@Test
 	public void testTokenizeToStringArrayWithNotTrimTokens() {
 		String[] sa = StringUtils.tokenizeToStringArray("a,b ,c", ",", false, true);
 		assertEquals(3, sa.length);
@@ -426,26 +463,21 @@ public void testTokenizeToStringArrayWithNotTrimTokens() {
 				sa[0].equals("a") && sa[1].equals("b ") && sa[2].equals("c"));
 	}
 
+	@Test
 	public void testCommaDelimitedListToStringArrayWithNullProducesEmptyArray() {
 		String[] sa = StringUtils.commaDelimitedListToStringArray(null);
 		assertTrue("String array isn't null with null input", sa != null);
 		assertTrue("String array length == 0 with null input", sa.length == 0);
 	}
 
+	@Test
 	public void testCommaDelimitedListToStringArrayWithEmptyStringProducesEmptyArray() {
 		String[] sa = StringUtils.commaDelimitedListToStringArray("");
 		assertTrue("String array isn't null with null input", sa != null);
 		assertTrue("String array length == 0 with null input", sa.length == 0);
 	}
 
-	private void testStringArrayReverseTransformationMatches(String[] sa) {
-		String[] reverse =
-				StringUtils.commaDelimitedListToStringArray(StringUtils.arrayToCommaDelimitedString(sa));
-		assertEquals("Reverse transformation is equal",
-				Arrays.asList(sa),
-				Arrays.asList(reverse));
-	}
-
+	@Test
 	public void testDelimitedListToStringArrayWithComma() {
 		String[] sa = StringUtils.delimitedListToStringArray("a,b", ",");
 		assertEquals(2, sa.length);
@@ -453,6 +485,7 @@ public void testDelimitedListToStringArrayWithComma() {
 		assertEquals("b", sa[1]);
 	}
 
+	@Test
 	public void testDelimitedListToStringArrayWithSemicolon() {
 		String[] sa = StringUtils.delimitedListToStringArray("a;b", ";");
 		assertEquals(2, sa.length);
@@ -460,6 +493,7 @@ public void testDelimitedListToStringArrayWithSemicolon() {
 		assertEquals("b", sa[1]);
 	}
 
+	@Test
 	public void testDelimitedListToStringArrayWithEmptyString() {
 		String[] sa = StringUtils.delimitedListToStringArray("a,b", "");
 		assertEquals(3, sa.length);
@@ -468,28 +502,39 @@ public void testDelimitedListToStringArrayWithEmptyString() {
 		assertEquals("b", sa[2]);
 	}
 
+	@Test
 	public void testDelimitedListToStringArrayWithNullDelimiter() {
 		String[] sa = StringUtils.delimitedListToStringArray("a,b", null);
 		assertEquals(1, sa.length);
 		assertEquals("a,b", sa[0]);
 	}
 
+	@Test
 	public void testCommaDelimitedListToStringArrayMatchWords() {
 		// Could read these from files
 		String[] sa = new String[] {"foo", "bar", "big"};
 		doTestCommaDelimitedListToStringArrayLegalMatch(sa);
-		testStringArrayReverseTransformationMatches(sa);
+		doTestStringArrayReverseTransformationMatches(sa);
 
 		sa = new String[] {"a", "b", "c"};
 		doTestCommaDelimitedListToStringArrayLegalMatch(sa);
-		testStringArrayReverseTransformationMatches(sa);
+		doTestStringArrayReverseTransformationMatches(sa);
 
 		// Test same words
 		sa = new String[] {"AA", "AA", "AA", "AA", "AA"};
 		doTestCommaDelimitedListToStringArrayLegalMatch(sa);
-		testStringArrayReverseTransformationMatches(sa);
+		doTestStringArrayReverseTransformationMatches(sa);
 	}
 
+	private void doTestStringArrayReverseTransformationMatches(String[] sa) {
+		String[] reverse =
+				StringUtils.commaDelimitedListToStringArray(StringUtils.arrayToCommaDelimitedString(sa));
+		assertEquals("Reverse transformation is equal",
+				Arrays.asList(sa),
+				Arrays.asList(reverse));
+	}
+
+	@Test
 	public void testCommaDelimitedListToStringArraySingleString() {
 		// Could read these from files
 		String s = "woeirqupoiewuropqiewuorpqiwueopriquwopeiurqopwieur";
@@ -499,6 +544,7 @@ public void testCommaDelimitedListToStringArraySingleString() {
 				sa[0].equals(s));
 	}
 
+	@Test
 	public void testCommaDelimitedListToStringArrayWithOtherPunctuation() {
 		// Could read these from files
 		String[] sa = new String[] {"xcvwert4456346&*.", "///", ".!", ".", ";"};
@@ -508,6 +554,7 @@ public void testCommaDelimitedListToStringArrayWithOtherPunctuation() {
 	/**
 	 * We expect to see the empty Strings in the output.
 	 */
+	@Test
 	public void testCommaDelimitedListToStringArrayEmptyStrings() {
 		// Could read these from files
 		String[] sa = StringUtils.commaDelimitedListToStringArray("a,,b");
@@ -520,19 +567,20 @@ public void testCommaDelimitedListToStringArrayEmptyStrings() {
 	}
 
 	private void doTestCommaDelimitedListToStringArrayLegalMatch(String[] components) {
-		StringBuffer sbuf = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		for (int i = 0; i < components.length; i++) {
 			if (i != 0) {
-				sbuf.append(",");
+				sb.append(",");
 			}
-			sbuf.append(components[i]);
+			sb.append(components[i]);
 		}
-		String[] sa = StringUtils.commaDelimitedListToStringArray(sbuf.toString());
+		String[] sa = StringUtils.commaDelimitedListToStringArray(sb.toString());
 		assertTrue("String array isn't null with legal match", sa != null);
 		assertEquals("String array length is correct with legal match", components.length, sa.length);
 		assertTrue("Output equals input", Arrays.equals(sa, components));
 	}
 
+	@Test
 	public void testEndsWithIgnoreCase() {
 		String suffix = "fOo";
 		assertTrue(StringUtils.endsWithIgnoreCase("foo", suffix));
@@ -549,6 +597,8 @@ public void testEndsWithIgnoreCase() {
 		assertFalse(StringUtils.endsWithIgnoreCase("b", suffix));
 	}
 
+
+	@Test
 	public void testParseLocaleStringSunnyDay() throws Exception {
 		Locale expectedLocale = Locale.UK;
 		Locale locale = StringUtils.parseLocaleString(expectedLocale.toString());
@@ -556,79 +606,67 @@ public void testParseLocaleStringSunnyDay() throws Exception {
 		assertEquals(expectedLocale, locale);
 	}
 
+	@Test
 	public void testParseLocaleStringWithMalformedLocaleString() throws Exception {
 		Locale locale = StringUtils.parseLocaleString("_banjo_on_my_knee");
 		assertNotNull("When given a malformed Locale string, must not return null.", locale);
 	}
 
+	@Test
 	public void testParseLocaleStringWithEmptyLocaleStringYieldsNullLocale() throws Exception {
 		Locale locale = StringUtils.parseLocaleString("");
 		assertNull("When given an empty Locale string, must return null.", locale);
 	}
 
-	/**
-	 * <a href="http://opensource.atlassian.com/projects/spring/browse/SPR-8637">See SPR-8637</a>.
-	 */
+	@Test  // SPR-8637
 	public void testParseLocaleWithMultiSpecialCharactersInVariant() throws Exception {
-		final String variant = "proper-northern";
-		final String localeString = "en_GB_" + variant;
+		String variant = "proper-northern";
+		String localeString = "en_GB_" + variant;
 		Locale locale = StringUtils.parseLocaleString(localeString);
 		assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant());
 	}
 
-	/**
-	 * <a href="http://opensource.atlassian.com/projects/spring/browse/SPR-3671">See SPR-3671</a>.
-	 */
+	@Test  // SPR-3671
 	public void testParseLocaleWithMultiValuedVariant() throws Exception {
-		final String variant = "proper_northern";
-		final String localeString = "en_GB_" + variant;
+		String variant = "proper_northern";
+		String localeString = "en_GB_" + variant;
 		Locale locale = StringUtils.parseLocaleString(localeString);
 		assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant());
 	}
 
-	/**
-	 * <a href="http://opensource.atlassian.com/projects/spring/browse/SPR-3671">See SPR-3671</a>.
-	 */
+	@Test  // SPR-3671
 	public void testParseLocaleWithMultiValuedVariantUsingSpacesAsSeparators() throws Exception {
-		final String variant = "proper northern";
-		final String localeString = "en GB " + variant;
+		String variant = "proper northern";
+		String localeString = "en GB " + variant;
 		Locale locale = StringUtils.parseLocaleString(localeString);
 		assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant());
 	}
 
-	/**
-	 * <a href="http://opensource.atlassian.com/projects/spring/browse/SPR-3671">See SPR-3671</a>.
-	 */
+	@Test  // SPR-3671
 	public void testParseLocaleWithMultiValuedVariantUsingMixtureOfUnderscoresAndSpacesAsSeparators() throws Exception {
-		final String variant = "proper northern";
-		final String localeString = "en_GB_" + variant;
+		String variant = "proper northern";
+		String localeString = "en_GB_" + variant;
 		Locale locale = StringUtils.parseLocaleString(localeString);
 		assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant());
 	}
 
-	/**
-	 * <a href="http://opensource.atlassian.com/projects/spring/browse/SPR-3671">See SPR-3671</a>.
-	 */
+	@Test  // SPR-3671
 	public void testParseLocaleWithMultiValuedVariantUsingSpacesAsSeparatorsWithLotsOfLeadingWhitespace() throws Exception {
-		final String variant = "proper northern";
-		final String localeString = "en GB            " + variant; // lots of whitespace
+		String variant = "proper northern";
+		String localeString = "en GB            " + variant;  // lots of whitespace
 		Locale locale = StringUtils.parseLocaleString(localeString);
 		assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant());
 	}
 
-	/**
-	 * <a href="http://opensource.atlassian.com/projects/spring/browse/SPR-3671">See SPR-3671</a>.
-	 */
+	@Test  // SPR-3671
 	public void testParseLocaleWithMultiValuedVariantUsingUnderscoresAsSeparatorsWithLotsOfLeadingWhitespace() throws Exception {
-		final String variant = "proper_northern";
-		final String localeString = "en_GB_____" + variant; // lots of underscores
+		String variant = "proper_northern";
+		String localeString = "en_GB_____" + variant;  // lots of underscores
 		Locale locale = StringUtils.parseLocaleString(localeString);
 		assertEquals("Multi-valued variant portion of the Locale not extracted correctly.", variant, locale.getVariant());
 	}
 
-	/**
-	 * <a href="http://opensource.atlassian.com/projects/spring/browse/SPR-7779">See SPR-7779</a>.
-	 */
+	@Test  // SPR-7779
 	public void testParseLocaleWithInvalidCharacters() {
 		try {
 			StringUtils.parseLocaleString("%0D%0AContent-length:30%0D%0A%0D%0A%3Cscript%3Ealert%28123%29%3C/script%3E");
@@ -639,11 +677,23 @@ public void testParseLocaleWithInvalidCharacters() {
 		}
 	}
 
-	/**
-	 * See SPR-9420.
-	 */
+	@Test  // SPR-9420
 	public void testParseLocaleWithSameLowercaseTokenForLanguageAndCountry() {
 		assertEquals("tr_TR", StringUtils.parseLocaleString("tr_tr").toString());
 		assertEquals("bg_BG_vnt", StringUtils.parseLocaleString("bg_bg_vnt").toString());
 	}
+
+	@Test  // SPR-11806
+	public void testParseLocaleWithVariantContainingCountryCode() {
+		String variant = "GBtest";
+		String localeString = "en_GB_" + variant;
+		Locale locale = StringUtils.parseLocaleString(localeString);
+		assertEquals("Variant containing country code not extracted correctly", variant, locale.getVariant());
+	}
+
+	@Test  // SPR-14718
+	public void testParseJava7Variant() {
+		assertEquals("sr_#LATN", StringUtils.parseLocaleString("sr_#LATN").toString());
+	}
+
 }
diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java
index 3ced43ba0c..d28ad6e34b 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,19 +16,22 @@
 
 package org.springframework.util.xml;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.sax.SAXSource;
 
+import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
+import static org.mockito.BDDMockito.*;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.tests.MockitoUtils;
-import org.springframework.tests.MockitoUtils.InvocationArgumentsAdapter;
+import org.w3c.dom.Node;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -38,7 +41,10 @@
 import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.XMLReaderFactory;
 
-import static org.mockito.BDDMockito.*;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.tests.MockitoUtils;
+import org.springframework.tests.MockitoUtils.InvocationArgumentsAdapter;
 
 public abstract class AbstractStaxXMLReaderTestCase {
 
@@ -104,6 +110,25 @@ public void contentHandlerNoNamespacesPrefixes() throws Exception {
 		verifyIdenticalInvocations(standardContentHandler, contentHandler);
 	}
 
+	@Test
+	public void whitespace() throws Exception {
+		String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><test><node1> </node1><node2> Some text </node2></test>";
+
+		Transformer transformer = TransformerFactory.newInstance().newTransformer();
+
+		AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(
+				new ByteArrayInputStream(xml.getBytes("UTF-8")));
+
+		SAXSource source = new SAXSource(staxXmlReader, new InputSource());
+		DOMResult result = new DOMResult();
+
+		transformer.transform(source, result);
+
+		Node node1 = result.getNode().getFirstChild().getFirstChild();
+		assertEquals(" ", node1.getTextContent());
+		assertEquals(" Some text ", node1.getNextSibling().getTextContent());
+	}
+
 	@Test
 	public void lexicalHandler() throws Exception {
 		Resource testLexicalHandlerXml = new ClassPathResource("testLexicalHandler.xml", getClass());
@@ -130,7 +155,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
 		verifyIdenticalInvocations(expectedLexicalHandler, actualLexicalHandler);
 	}
 
-	private final LexicalHandler mockLexicalHandler() throws Exception {
+	private LexicalHandler mockLexicalHandler() throws Exception {
 		LexicalHandler lexicalHandler = mock(LexicalHandler.class);
 		willAnswer(new CopyCharsAnswer()).given(lexicalHandler).comment(any(char[].class), anyInt(), anyInt());
 		return lexicalHandler;
@@ -218,6 +243,9 @@ public int hashCode() {
 		@Override
 		public boolean equals(Object obj) {
 			Attributes other = ((PartialAttributes) obj).attributes;
+			if (this.attributes.getLength() != other.getLength()) {
+				return false;
+			}
 			for (int i = 0; i < other.getLength(); i++) {
 				boolean found = false;
 				for (int j = 0; j < attributes.getLength(); j++) {
diff --git a/spring-core/src/test/resources/org/springframework/util/xml/testContentHandler.xml b/spring-core/src/test/resources/org/springframework/util/xml/testContentHandler.xml
index 27129db12f..062b7b79b9 100644
--- a/spring-core/src/test/resources/org/springframework/util/xml/testContentHandler.xml
+++ b/spring-core/src/test/resources/org/springframework/util/xml/testContentHandler.xml
@@ -1,2 +1,2 @@
-<h:hello xmlns:h="http://www.greeting.com/hello/" id="a1" h:person="David"><goodbye
-		xmlns="http://www.greeting.com/goodbye/" h:person="Arjen"/></h:hello>
\ No newline at end of file
+<h:hello xmlns:h="http://www.greeting.com/hello/" id="a1" h:person="David"><prefix:goodbye
+		xmlns:prefix="http://www.greeting.com/goodbye/" h:person="Arjen"> Some text </prefix:goodbye><h:so-long> </h:so-long></h:hello>
\ No newline at end of file
diff --git a/spring-expression/src/main/java/org/springframework/expression/EvaluationContext.java b/spring-expression/src/main/java/org/springframework/expression/EvaluationContext.java
index 27a83cab37..9d509c6121 100644
--- a/spring-expression/src/main/java/org/springframework/expression/EvaluationContext.java
+++ b/spring-expression/src/main/java/org/springframework/expression/EvaluationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@
 import java.util.List;
 
 /**
- * Expressions are executed in an evaluation context. It is in this context that references
- * are resolved when encountered during expression evaluation.
+ * Expressions are executed in an evaluation context. It is in this context that
+ * references are resolved when encountered during expression evaluation.
  *
  * <p>There is a default implementation of the EvaluationContext,
- * {@link org.springframework.expression.spel.support.StandardEvaluationContext}
- * that can be extended, rather than having to implement everything.
+ * {@link org.springframework.expression.spel.support.StandardEvaluationContext} that can
+ * be extended, rather than having to implement everything.
  *
  * @author Andy Clement
  * @author Juergen Hoeller
@@ -33,49 +33,51 @@
 public interface EvaluationContext {
 
 	/**
-	 * @return the default root context object against which unqualified properties/methods/etc
-	 * should be resolved. This can be overridden when evaluating an expression.
+	 * Return the default root context object against which unqualified
+	 * properties/methods/etc should be resolved. This can be overridden
+	 * when evaluating an expression.
 	 */
 	TypedValue getRootObject();
 
 	/**
-	 * @return a list of resolvers that will be asked in turn to locate a constructor
+	 * Return a list of resolvers that will be asked in turn to locate a constructor.
 	 */
 	List<ConstructorResolver> getConstructorResolvers();
 
 	/**
-	 * @return a list of resolvers that will be asked in turn to locate a method
+	 * Return a list of resolvers that will be asked in turn to locate a method.
 	 */
 	List<MethodResolver> getMethodResolvers();
 
 	/**
-	 * @return a list of accessors that will be asked in turn to read/write a property
+	 * Return a list of accessors that will be asked in turn to read/write a property.
 	 */
 	List<PropertyAccessor> getPropertyAccessors();
 
 	/**
-	 * @return a type locator that can be used to find types, either by short or fully qualified name.
+	 * Return a type locator that can be used to find types, either by short or
+	 * fully qualified name.
 	 */
 	TypeLocator getTypeLocator();
 
 	/**
-	 * @return a type converter that can convert (or coerce) a value from one type to another.
+	 * Return a type converter that can convert (or coerce) a value from one type to another.
 	 */
 	TypeConverter getTypeConverter();
 
 	/**
-	 * @return a type comparator for comparing pairs of objects for equality.
+	 * Return a type comparator for comparing pairs of objects for equality.
 	 */
 	TypeComparator getTypeComparator();
 
 	/**
-	 * @return an operator overloader that may support mathematical operations
-	 * between more than the standard set of types
+	 * Return an operator overloader that may support mathematical operations
+	 * between more than the standard set of types.
 	 */
 	OperatorOverloader getOperatorOverloader();
 
 	/**
-	 * @return a bean resolver that can look up beans by name
+	 * Return a bean resolver that can look up beans by name.
 	 */
 	BeanResolver getBeanResolver();
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/MethodExecutor.java b/spring-expression/src/main/java/org/springframework/expression/MethodExecutor.java
index bd4dd74516..6b94e4fbac 100644
--- a/spring-expression/src/main/java/org/springframework/expression/MethodExecutor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/MethodExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,15 @@
 package org.springframework.expression;
 
 /**
- * MethodExecutors are built by the resolvers and can be cached by the infrastructure to repeat an operation quickly
- * without going back to the resolvers. For example, the particular method to run on an object may be discovered by the
- * reflection method resolver - it will then build a MethodExecutor that executes that method and the MethodExecutor can
- * be reused without needing to go back to the resolver to discover the method again.
+ * MethodExecutors are built by the resolvers and can be cached by the infrastructure to
+ * repeat an operation quickly without going back to the resolvers. For example, the
+ * particular method to run on an object may be discovered by the reflection method
+ * resolver - it will then build a MethodExecutor that executes that method and the
+ * MethodExecutor can be reused without needing to go back to the resolver to discover
+ * the method again.
  *
- * <p>They can become stale, and in that case should throw an AccessException - this will cause the infrastructure to go
- * back to the resolvers to ask for a new one.
+ * <p>They can become stale, and in that case should throw an AccessException:
+ * This will cause the infrastructure to go back to the resolvers to ask for a new one.
  *
  * @author Andy Clement
  * @since 3.0
@@ -34,10 +36,11 @@ public interface MethodExecutor {
 	 * Execute a command using the specified arguments, and using the specified expression state.
 	 * @param context the evaluation context in which the command is being executed
 	 * @param target the target object of the call - null for static methods
-	 * @param arguments the arguments to the executor, should match (in terms of number and type) whatever the
-	 * command will need to run
+	 * @param arguments the arguments to the executor, should match (in terms of number
+	 * and type) whatever the command will need to run
 	 * @return the value returned from execution
-	 * @throws AccessException if there is a problem executing the command or the MethodExecutor is no longer valid
+	 * @throws AccessException if there is a problem executing the command or the
+	 * MethodExecutor is no longer valid
 	 */
 	TypedValue execute(EvaluationContext context, Object target, Object... arguments) throws AccessException;
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java b/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java
index 75cdc5eab8..e33dc8423f 100644
--- a/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java
+++ b/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,9 @@
 import org.springframework.core.convert.TypeDescriptor;
 
 /**
- * A method resolver attempts locate a method and returns a command executor that can be used to invoke that method.
- * The command executor will be cached but if it 'goes stale' the resolvers will be called again.
+ * A method resolver attempts locate a method and returns a command executor that can be
+ * used to invoke that method. The command executor will be cached but if it 'goes stale'
+ * the resolvers will be called again.
  *
  * @author Andy Clement
  * @since 3.0
@@ -30,9 +31,9 @@
 public interface MethodResolver {
 
 	/**
-	 * Within the supplied context determine a suitable method on the supplied object that can handle the
-	 * specified arguments. Return a MethodExecutor that can be used to invoke that method
-	 * (or {@code null} if no method could be found).
+	 * Within the supplied context determine a suitable method on the supplied object that
+	 * can handle the specified arguments. Return a {@link MethodExecutor} that can be used
+	 * to invoke that method, or {@code null} if no method could be found.
 	 * @param context the current evaluation context
 	 * @param targetObject the object upon which the method is being called
 	 * @param argumentTypes the arguments that the constructor must be able to handle
diff --git a/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java
index e14c30ba68..e6c78b14de 100644
--- a/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,18 @@
 
 
 /**
- * A property accessor is able to read (and possibly write) to object properties. The interface places no restrictions
- * and so implementors are free to access properties directly as fields or through getters or in any other way they see
- * as appropriate. A resolver can optionally specify an array of target classes for which it should be called - but if
- * it returns null from getSpecificTargetClasses() then it will be called for all property references and given a chance
- * to determine if it can read or write them. Property resolvers are considered to be ordered and each will be called in
- * turn. The only rule that affects the call order is that any naming the target class directly in
- * getSpecifiedTargetClasses() will be called first, before the general resolvers.
+ * A property accessor is able to read from (and possibly write to) an object's properties.
+ * This interface places no restrictions, and so implementors are free to access properties
+ * directly as fields or through getters or in any other way they see as appropriate.
+ *
+ * <p>A resolver can optionally specify an array of target classes for which it should be
+ * called. However, if it returns {@code null} from {@link #getSpecificTargetClasses()},
+ * it will be called for all property references and given a chance to determine if it
+ * can read or write them.
+ *
+ * <p>Property resolvers are considered to be ordered and each will be called in turn.
+ * The only rule that affects the call order is that any naming the target class directly
+ * in {@link #getSpecificTargetClasses()} will be called first, before the general resolvers.
  *
  * @author Andy Clement
  * @since 3.0
@@ -32,14 +37,17 @@
 public interface PropertyAccessor {
 
 	/**
-	 * Return an array of classes for which this resolver should be called. Returning null indicates this is a general
-	 * resolver that can be called in an attempt to resolve a property on any type.
-	 * @return an array of classes that this resolver is suitable for (or null if a general resolver)
+	 * Return an array of classes for which this resolver should be called.
+	 * <p>>Returning {@code null} indicates this is a general resolver that
+	 * can be called in an attempt to resolve a property on any type.
+	 * @return an array of classes that this resolver is suitable for
+	 * (or {@code null} if a general resolver)
 	 */
-	Class[] getSpecificTargetClasses();
+	Class<?>[] getSpecificTargetClasses();
 
 	/**
-	 * Called to determine if a resolver instance is able to access a specified property on a specified target object.
+	 * Called to determine if a resolver instance is able to access a specified property
+	 * on a specified target object.
 	 * @param context the evaluation context in which the access is being attempted
 	 * @param target the target object upon which the property is being accessed
 	 * @param name the name of the property being accessed
@@ -49,7 +57,8 @@ public interface PropertyAccessor {
 	boolean canRead(EvaluationContext context, Object target, String name) throws AccessException;
 
 	/**
-	 * Called to read a property from a specified target object
+	 * Called to read a property from a specified target object.
+	 * Should only succeed if {@link #canRead} also returns {@code true}.
 	 * @param context the evaluation context in which the access is being attempted
 	 * @param target the target object upon which the property is being accessed
 	 * @param name the name of the property being accessed
@@ -59,17 +68,20 @@ public interface PropertyAccessor {
 	TypedValue read(EvaluationContext context, Object target, String name) throws AccessException;
 
 	/**
-	 * Called to determine if a resolver instance is able to write to a specified property on a specified target object.
+	 * Called to determine if a resolver instance is able to write to a specified
+	 * property on a specified target object.
 	 * @param context the evaluation context in which the access is being attempted
 	 * @param target the target object upon which the property is being accessed
 	 * @param name the name of the property being accessed
 	 * @return true if this resolver is able to write to the property
-	 * @throws AccessException if there is any problem determining whether the property can be written to
+	 * @throws AccessException if there is any problem determining whether the
+	 * property can be written to
 	 */
 	boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException;
 
 	/**
-	 * Called to write to a property on a specified target object. Should only succeed if canWrite() also returns true.
+	 * Called to write to a property on a specified target object.
+	 * Should only succeed if {@link #canWrite} also returns {@code true}.
 	 * @param context the evaluation context in which the access is being attempted
 	 * @param target the target object upon which the property is being accessed
 	 * @param name the name of the property being accessed
diff --git a/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java b/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java
index 1dfb41adc7..d12122dbbc 100644
--- a/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,30 +17,32 @@
 package org.springframework.expression;
 
 /**
- * Instances of a type comparator should be able to compare pairs of objects for equality, the specification of the
- * return value is the same as for {@link Comparable}.
+ * Instances of a type comparator should be able to compare pairs of objects for equality.
+ * The specification of the return value is the same as for {@link java.lang.Comparable}.
  *
  * @author Andy Clement
  * @since 3.0
+ * @see java.lang.Comparable
  */
 public interface TypeComparator {
 
 	/**
-	 * Compare two objects.
+	 * Return {@code true} if the comparator can compare these two objects.
 	 * @param firstObject the first object
 	 * @param secondObject the second object
-	 * @return 0 if they are equal, <0 if the first is smaller than the second, or >0 if the first is larger than the
-	 * second
-	 * @throws EvaluationException if a problem occurs during comparison (or they are not comparable)
+	 * @return {@code true} if the comparator can compare these objects
 	 */
-	int compare(Object firstObject, Object secondObject) throws EvaluationException;
+	boolean canCompare(Object firstObject, Object secondObject);
 
 	/**
-	 * Return true if the comparator can compare these two objects
+	 * Compare two given objects.
 	 * @param firstObject the first object
 	 * @param secondObject the second object
-	 * @return true if the comparator can compare these objects
+	 * @return 0 if they are equal, <0 if the first is smaller than the second,
+	 * or >0 if the first is larger than the second
+	 * @throws EvaluationException if a problem occurs during comparison
+	 * (or if they are not comparable in the first place)
 	 */
-	boolean canCompare(Object firstObject, Object secondObject);
+	int compare(Object firstObject, Object secondObject) throws EvaluationException;
 
 }
diff --git a/spring-expression/src/main/java/org/springframework/expression/TypeConverter.java b/spring-expression/src/main/java/org/springframework/expression/TypeConverter.java
index e6145ab20e..ee78104dca 100644
--- a/spring-expression/src/main/java/org/springframework/expression/TypeConverter.java
+++ b/spring-expression/src/main/java/org/springframework/expression/TypeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@
 import org.springframework.core.convert.TypeDescriptor;
 
 /**
- * A type converter can convert values between different types encountered
- * during expression evaluation. This is an SPI for the expression parser;
- * see {@link org.springframework.core.convert.ConversionService} for the
- * primary user API to Spring's conversion facilities.
+ * A type converter can convert values between different types encountered during
+ * expression evaluation. This is an SPI for the expression parser; see
+ * {@link org.springframework.core.convert.ConversionService} for the primary
+ * user API to Spring's conversion facilities.
  *
  * @author Andy Clement
  * @author Juergen Hoeller
@@ -31,22 +31,27 @@
 public interface TypeConverter {
 
 	/**
-	 * Return true if the type converter can convert the specified type to the desired target type.
+	 * Return {@code true} if the type converter can convert the specified type
+	 * to the desired target type.
 	 * @param sourceType a type descriptor that describes the source type
 	 * @param targetType a type descriptor that describes the requested result type
-	 * @return true if that conversion can be performed
+	 * @return {@code true} if that conversion can be performed
 	 */
 	boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType);
 
 	/**
-	 * Convert (may coerce) a value from one type to another, for example from a boolean to a string.
-	 * The typeDescriptor parameter enables support for typed collections - if the caller really wishes they
-	 * can have a List&lt;Integer&gt; for example, rather than simply a List.
+	 * Convert (or coerce) a value from one type to another, for example from a
+	 * {@code boolean} to a {@code String}.
+	 * <p>The {@link TypeDescriptor} parameters enable support for typed collections:
+	 * A caller may prefer a {@code List&lt;Integer&gt;}, for example, rather than
+	 * simply any {@code List}.
 	 * @param value the value to be converted
-	 * @param sourceType a type descriptor that supplies extra information about the source object
-	 * @param targetType a type descriptor that supplies extra information about the requested result type
+	 * @param sourceType a type descriptor that supplies extra information about the
+	 * source object
+	 * @param targetType a type descriptor that supplies extra information about the
+	 * requested result type
 	 * @return the converted value
-	 * @throws EvaluationException if conversion is not possible
+	 * @throws EvaluationException if conversion failed or is not possible to begin with
 	 */
 	Object convertValue(Object value, TypeDescriptor sourceType, TypeDescriptor targetType);
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/TypeLocator.java b/spring-expression/src/main/java/org/springframework/expression/TypeLocator.java
index 4a22a82c19..e969626895 100644
--- a/spring-expression/src/main/java/org/springframework/expression/TypeLocator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/TypeLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,12 @@
 package org.springframework.expression;
 
 /**
- * Implementors of this interface are expected to be able to locate types. They may use custom classloaders
- * or the and deal with common package prefixes (java.lang, etc) however they wish. See
- * {@link org.springframework.expression.spel.support.StandardTypeLocator} for an example implementation.
+ * Implementers of this interface are expected to be able to locate types.
+ * They may use a custom {@link ClassLoader} and/or deal with common
+ * package prefixes (e.g. {@code java.lang}) however they wish.
+ *
+ * <p>See {@link org.springframework.expression.spel.support.StandardTypeLocator}
+ * for an example implementation.
  *
  * @author Andy Clement
  * @since 3.0
@@ -27,11 +30,12 @@
 public interface TypeLocator {
 
 	/**
-	 * Find a type by name. The name may or may not be fully qualified (eg. String or java.lang.String)
-	 * @param typename the type to be located
-	 * @return the class object representing that type
-	 * @throws EvaluationException if there is a problem finding it
+	 * Find a type by name. The name may or may not be fully qualified
+	 * (e.g. {@code String} or {@code java.lang.String}).
+	 * @param typeName the type to be located
+	 * @return the {@code Class} object representing that type
+	 * @throws EvaluationException if there is a problem finding the type
 	 */
-	Class<?> findType(String typename) throws EvaluationException;
+	Class<?> findType(String typeName) throws EvaluationException;
 
 }
diff --git a/spring-expression/src/main/java/org/springframework/expression/TypedValue.java b/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
index 67ecb99ad2..785f5a81f2 100644
--- a/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
+++ b/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
@@ -73,7 +73,7 @@ public TypeDescriptor getTypeDescriptor() {
 	@Override
 	public String toString() {
 		StringBuilder str = new StringBuilder();
-		str.append("TypedValue: '").append(this.value).append("' of [").append(getTypeDescriptor() + "]");
+		str.append("TypedValue: '").append(this.value).append("' of [").append(getTypeDescriptor()).append("]");
 		return str.toString();
 	}
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java b/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java
index ae7713c50f..8740322c72 100644
--- a/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java
+++ b/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,7 +102,7 @@ public String getValue(EvaluationContext context, Object rootObject) throws Eval
 
 	public <T> T getValue(EvaluationContext context, Object rootObject, Class<T> desiredResultType) throws EvaluationException {
 		Object value = getValue(context, rootObject);
-		return ExpressionUtils.convert(null, value, desiredResultType);
+		return ExpressionUtils.convert(context, value, desiredResultType);
 	}
 
 	public Class getValueType(Object rootObject) throws EvaluationException {
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java b/spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
index 85c1727c5c..bf4866660a 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,14 +30,18 @@
 import org.springframework.expression.TypeComparator;
 import org.springframework.expression.TypeConverter;
 import org.springframework.expression.TypedValue;
+import org.springframework.util.Assert;
 
 /**
- * An ExpressionState is for maintaining per-expression-evaluation state, any changes to it are not seen by other
- * expressions but it gives a place to hold local variables and for component expressions in a compound expression to
- * communicate state. This is in contrast to the EvaluationContext, which is shared amongst expression evaluations, and
- * any changes to it will be seen by other expressions or any code that chooses to ask questions of the context.
+ * An ExpressionState is for maintaining per-expression-evaluation state, any changes to
+ * it are not seen by other expressions but it gives a place to hold local variables and
+ * for component expressions in a compound expression to communicate state. This is in
+ * contrast to the EvaluationContext, which is shared amongst expression evaluations, and
+ * any changes to it will be seen by other expressions or any code that chooses to ask
+ * questions of the context.
  *
- * <p>It also acts as a place for to define common utility routines that the various Ast nodes might need.
+ * <p>It also acts as a place for to define common utility routines that the various AST
+ * nodes might need.
  *
  * @author Andy Clement
  * @since 3.0
@@ -46,35 +50,33 @@ public class ExpressionState {
 
 	private final EvaluationContext relatedContext;
 
-	private Stack<VariableScope> variableScopes;
+	private final TypedValue rootObject;
 
-	private Stack<TypedValue> contextObjects;
+	private final SpelParserConfiguration configuration;
 
-	private final TypedValue rootObject;
+	private Stack<VariableScope> variableScopes;
 
-	private SpelParserConfiguration configuration;
+	private Stack<TypedValue> contextObjects;
 
 
 	public ExpressionState(EvaluationContext context) {
-		this.relatedContext = context;
-		this.rootObject = context.getRootObject();
+		this(context, context.getRootObject(), new SpelParserConfiguration(false, false));
 	}
 
 	public ExpressionState(EvaluationContext context, SpelParserConfiguration configuration) {
-		this.relatedContext = context;
-		this.configuration = configuration;
-		this.rootObject = context.getRootObject();
+		this(context, context.getRootObject(), configuration);
 	}
 
 	public ExpressionState(EvaluationContext context, TypedValue rootObject) {
-		this.relatedContext = context;
-		this.rootObject = rootObject;
+		this(context, rootObject, new SpelParserConfiguration(false, false));
 	}
 
 	public ExpressionState(EvaluationContext context, TypedValue rootObject, SpelParserConfiguration configuration) {
+		Assert.notNull(context, "EvaluationContext must not be null");
+		Assert.notNull(configuration, "SpelParserConfiguration must not be null");
 		this.relatedContext = context;
-		this.configuration = configuration;
 		this.rootObject = rootObject;
+		this.configuration = configuration;
 	}
 
 
@@ -90,23 +92,22 @@ private void ensureVariableScopesInitialized() {
 	 * The active context object is what unqualified references to properties/etc are resolved against.
 	 */
 	public TypedValue getActiveContextObject() {
-		if (this.contextObjects==null || this.contextObjects.isEmpty()) {
+		if (this.contextObjects == null || this.contextObjects.isEmpty()) {
 			return this.rootObject;
 		}
-
 		return this.contextObjects.peek();
 	}
 
 	public void pushActiveContextObject(TypedValue obj) {
-		if (this.contextObjects==null) {
-			this.contextObjects =  new Stack<TypedValue>();
+		if (this.contextObjects == null) {
+			this.contextObjects = new Stack<TypedValue>();
 		}
 		this.contextObjects.push(obj);
 	}
 
 	public void popActiveContextObject() {
-		if (this.contextObjects==null) {
-			this.contextObjects =  new Stack<TypedValue>();
+		if (this.contextObjects == null) {
+			this.contextObjects = new Stack<TypedValue>();
 		}
 		this.contextObjects.pop();
 	}
@@ -138,7 +139,8 @@ public Class<?> findType(String type) throws EvaluationException {
 	}
 
 	public Object convertValue(Object value, TypeDescriptor targetTypeDescriptor) throws EvaluationException {
-		return this.relatedContext.getTypeConverter().convertValue(value, TypeDescriptor.forObject(value), targetTypeDescriptor);
+		return this.relatedContext.getTypeConverter().convertValue(value,
+				TypeDescriptor.forObject(value), targetTypeDescriptor);
 	}
 
 	public TypeConverter getTypeConverter() {
@@ -151,9 +153,8 @@ public Object convertValue(TypedValue value, TypeDescriptor targetTypeDescriptor
 	}
 
 	/*
-	 * A new scope is entered when a function is invoked
+	 * A new scope is entered when a function is invoked.
 	 */
-
 	public void enterScope(Map<String, Object> argMap) {
 		ensureVariableScopesInitialized();
 		this.variableScopes.push(new VariableScope(argMap));
@@ -192,8 +193,8 @@ public TypedValue operate(Operation op, Object left, Object right) throws Evalua
 			return new TypedValue(returnValue);
 		}
 		else {
-			String leftType = (left==null?"null":left.getClass().getName());
-			String rightType = (right==null?"null":right.getClass().getName());
+			String leftType = (left == null ? "null" : left.getClass().getName());
+			String rightType = (right == null? "null" : right.getClass().getName());
 			throw new SpelEvaluationException(SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES, op, leftType, rightType);
 		}
 	}
@@ -210,16 +211,20 @@ public SpelParserConfiguration getConfiguration() {
 		return this.configuration;
 	}
 
+
 	/**
-	 * A new scope is entered when a function is called and it is used to hold the parameters to the function call.  If the names
-	 * of the parameters clash with those in a higher level scope, those in the higher level scope will not be accessible whilst
-	 * the function is executing.  When the function returns the scope is exited.
+	 * A new scope is entered when a function is called and it is used to hold the
+	 * parameters to the function call. If the names of the parameters clash with
+	 * those in a higher level scope, those in the higher level scope will not be
+	 * accessible whilst the function is executing. When the function returns,
+	 * the scope is exited.
 	 */
 	private static class VariableScope {
 
 		private final Map<String, Object> vars = new HashMap<String, Object>();
 
-		public VariableScope() { }
+		public VariableScope() {
+		}
 
 		public VariableScope(Map<String, Object> arguments) {
 			if (arguments != null) {
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
index 3f89bed512..9a42cedbe3 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,102 +19,103 @@
 import java.text.MessageFormat;
 
 /**
- * Contains all the messages that can be produced by the Spring Expression Language. Each message has a kind (info,
- * warn, error) and a code number. Tests can be written to expect particular code numbers rather than particular text,
- * enabling the message text to more easily be modified and the tests to run successfully in different locales.
- * <p>
- * When a message is formatted, it will have this kind of form
+ * Contains all the messages that can be produced by the Spring Expression Language.
+ * Each message has a kind (info, warn, error) and a code number. Tests can be written to
+ * expect particular code numbers rather than particular text, enabling the message text
+ * to more easily be modified and the tests to run successfully in different locales.
  *
- * <pre>
+ * <p>When a message is formatted, it will have this kind of form
+ *
+ * <pre class="code">
  * EL1004E: (pos 34): Type cannot be found 'String'
  * </pre>
  *
- * </code> The prefix captures the code and the error kind, whilst the position is included if it is known.
+ * The prefix captures the code and the error kind, whilst the position is included
+ * if it is known.
  *
  * @author Andy Clement
  * @since 3.0
  */
 public enum SpelMessage {
 
-	TYPE_CONVERSION_ERROR(Kind.ERROR, 1001, "Type conversion problem, cannot convert from {0} to {1}"), //
-	CONSTRUCTOR_NOT_FOUND(Kind.ERROR, 1002, "Constructor call: No suitable constructor found on type {0} for arguments {1}"), //
-	CONSTRUCTOR_INVOCATION_PROBLEM(Kind.ERROR, 1003, "A problem occurred whilst attempting to construct an object of type ''{0}'' using arguments ''{1}''"), //
-	METHOD_NOT_FOUND(Kind.ERROR, 1004, "Method call: Method {0} cannot be found on {1} type"), //
-	TYPE_NOT_FOUND(Kind.ERROR, 1005, "Type cannot be found ''{0}''"), //
-	FUNCTION_NOT_DEFINED(Kind.ERROR, 1006, "The function ''{0}'' could not be found"), //
-	PROPERTY_OR_FIELD_NOT_READABLE_ON_NULL(Kind.ERROR, 1007, "Field or property ''{0}'' cannot be found on null"), //
-	PROPERTY_OR_FIELD_NOT_READABLE(Kind.ERROR, 1008, "Field or property ''{0}'' cannot be found on object of type ''{1}''"), //
-	PROPERTY_OR_FIELD_NOT_WRITABLE_ON_NULL(Kind.ERROR, 1009, "Field or property ''{0}'' cannot be set on null"), //
-	PROPERTY_OR_FIELD_NOT_WRITABLE(Kind.ERROR, 1010, "Field or property ''{0}'' cannot be set on object of type ''{1}''"), //
-	METHOD_CALL_ON_NULL_OBJECT_NOT_ALLOWED(Kind.ERROR, 1011, "Method call: Attempted to call method {0} on null context object"), //
+	TYPE_CONVERSION_ERROR(Kind.ERROR, 1001, "Type conversion problem, cannot convert from {0} to {1}"),
+	CONSTRUCTOR_NOT_FOUND(Kind.ERROR, 1002, "Constructor call: No suitable constructor found on type {0} for arguments {1}"),
+	CONSTRUCTOR_INVOCATION_PROBLEM(Kind.ERROR, 1003, "A problem occurred whilst attempting to construct an object of type ''{0}'' using arguments ''{1}''"),
+	METHOD_NOT_FOUND(Kind.ERROR, 1004, "Method call: Method {0} cannot be found on {1} type"),
+	TYPE_NOT_FOUND(Kind.ERROR, 1005, "Type cannot be found ''{0}''"),
+	FUNCTION_NOT_DEFINED(Kind.ERROR, 1006, "The function ''{0}'' could not be found"),
+	PROPERTY_OR_FIELD_NOT_READABLE_ON_NULL(Kind.ERROR, 1007, "Property or field ''{0}'' cannot be found on null"),
+	PROPERTY_OR_FIELD_NOT_READABLE(Kind.ERROR, 1008, "Property or field ''{0}'' cannot be found on object of type ''{1}'' - maybe not public?"),
+	PROPERTY_OR_FIELD_NOT_WRITABLE_ON_NULL(Kind.ERROR, 1009, "Property or field ''{0}'' cannot be set on null"),
+	PROPERTY_OR_FIELD_NOT_WRITABLE(Kind.ERROR, 1010, "Property or field ''{0}'' cannot be set on object of type ''{1}'' - maybe not public?"),
+	METHOD_CALL_ON_NULL_OBJECT_NOT_ALLOWED(Kind.ERROR, 1011, "Method call: Attempted to call method {0} on null context object"),
 	CANNOT_INDEX_INTO_NULL_VALUE(Kind.ERROR, 1012, "Cannot index into a null value"),
-	NOT_COMPARABLE(Kind.ERROR, 1013, "Cannot compare instances of {0} and {1}"), //
-	INCORRECT_NUMBER_OF_ARGUMENTS_TO_FUNCTION(Kind.ERROR, 1014, "Incorrect number of arguments for function, {0} supplied but function takes {1}"), //
-	INVALID_TYPE_FOR_SELECTION(Kind.ERROR, 1015, "Cannot perform selection on input data of type ''{0}''"), //
-	RESULT_OF_SELECTION_CRITERIA_IS_NOT_BOOLEAN(Kind.ERROR, 1016, "Result of selection criteria is not boolean"), //
-	BETWEEN_RIGHT_OPERAND_MUST_BE_TWO_ELEMENT_LIST(Kind.ERROR, 1017, "Right operand for the 'between' operator has to be a two-element list"), //
-	INVALID_PATTERN(Kind.ERROR, 1018, "Pattern is not valid ''{0}''"), //
-	PROJECTION_NOT_SUPPORTED_ON_TYPE(Kind.ERROR, 1019, "Projection is not supported on the type ''{0}''"), //
-	ARGLIST_SHOULD_NOT_BE_EVALUATED(Kind.ERROR, 1020, "The argument list of a lambda expression should never have getValue() called upon it"), //
-	EXCEPTION_DURING_PROPERTY_READ(Kind.ERROR, 1021, "A problem occurred whilst attempting to access the property ''{0}'': ''{1}''"), //
-	FUNCTION_REFERENCE_CANNOT_BE_INVOKED(Kind.ERROR, 1022, "The function ''{0}'' mapped to an object of type ''{1}'' which cannot be invoked"), //
-	EXCEPTION_DURING_FUNCTION_CALL(Kind.ERROR, 1023, "A problem occurred whilst attempting to invoke the function ''{0}'': ''{1}''"), //
-	ARRAY_INDEX_OUT_OF_BOUNDS(Kind.ERROR, 1024, "The array has ''{0}'' elements, index ''{1}'' is invalid"), //
-	COLLECTION_INDEX_OUT_OF_BOUNDS(Kind.ERROR, 1025, "The collection has ''{0}'' elements, index ''{1}'' is invalid"), //
-	STRING_INDEX_OUT_OF_BOUNDS(Kind.ERROR, 1026, "The string has ''{0}'' characters, index ''{1}'' is invalid"), //
-	INDEXING_NOT_SUPPORTED_FOR_TYPE(Kind.ERROR, 1027, "Indexing into type ''{0}'' is not supported"), //
-	INSTANCEOF_OPERATOR_NEEDS_CLASS_OPERAND(Kind.ERROR, 1028, "The operator 'instanceof' needs the right operand to be a class, not a ''{0}''"), //
-	EXCEPTION_DURING_METHOD_INVOCATION(Kind.ERROR, 1029, "A problem occurred when trying to execute method ''{0}'' on object of type ''{1}'': ''{2}''"), //
-	OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES(Kind.ERROR, 1030, "The operator ''{0}'' is not supported between objects of type ''{1}'' and ''{2}''"), //
-	PROBLEM_LOCATING_METHOD(Kind.ERROR, 1031, "Problem locating method {0} cannot on type {1}"),
-	SETVALUE_NOT_SUPPORTED(	Kind.ERROR, 1032, "setValue(ExpressionState, Object) not supported for ''{0}''"), //
-	MULTIPLE_POSSIBLE_METHODS(Kind.ERROR, 1033, "Method call of ''{0}'' is ambiguous, supported type conversions allow multiple variants to match"), //
-	EXCEPTION_DURING_PROPERTY_WRITE(Kind.ERROR, 1034, "A problem occurred whilst attempting to set the property ''{0}'': {1}"), //
-	NOT_AN_INTEGER(Kind.ERROR, 1035, "The value ''{0}'' cannot be parsed as an int"), //
-	NOT_A_LONG(Kind.ERROR, 1036, "The value ''{0}'' cannot be parsed as a long"), //
-	INVALID_FIRST_OPERAND_FOR_MATCHES_OPERATOR(Kind.ERROR, 1037, "First operand to matches operator must be a string.  ''{0}'' is not"), //
-	INVALID_SECOND_OPERAND_FOR_MATCHES_OPERATOR(Kind.ERROR, 1038, "Second operand to matches operator must be a string. ''{0}'' is not"), //
-	FUNCTION_MUST_BE_STATIC(Kind.ERROR, 1039, "Only static methods can be called via function references. The method ''{0}'' referred to by name ''{1}'' is not static."),//
-	NOT_A_REAL(Kind.ERROR, 1040, "The value ''{0}'' cannot be parsed as a double"), //
+	NOT_COMPARABLE(Kind.ERROR, 1013, "Cannot compare instances of {0} and {1}"),
+	INCORRECT_NUMBER_OF_ARGUMENTS_TO_FUNCTION(Kind.ERROR, 1014, "Incorrect number of arguments for function, {0} supplied but function takes {1}"),
+	INVALID_TYPE_FOR_SELECTION(Kind.ERROR, 1015, "Cannot perform selection on input data of type ''{0}''"),
+	RESULT_OF_SELECTION_CRITERIA_IS_NOT_BOOLEAN(Kind.ERROR, 1016, "Result of selection criteria is not boolean"),
+	BETWEEN_RIGHT_OPERAND_MUST_BE_TWO_ELEMENT_LIST(Kind.ERROR, 1017, "Right operand for the 'between' operator has to be a two-element list"),
+	INVALID_PATTERN(Kind.ERROR, 1018, "Pattern is not valid ''{0}''"),
+	PROJECTION_NOT_SUPPORTED_ON_TYPE(Kind.ERROR, 1019, "Projection is not supported on the type ''{0}''"),
+	ARGLIST_SHOULD_NOT_BE_EVALUATED(Kind.ERROR, 1020, "The argument list of a lambda expression should never have getValue() called upon it"),
+	EXCEPTION_DURING_PROPERTY_READ(Kind.ERROR, 1021, "A problem occurred whilst attempting to access the property ''{0}'': ''{1}''"),
+	FUNCTION_REFERENCE_CANNOT_BE_INVOKED(Kind.ERROR, 1022, "The function ''{0}'' mapped to an object of type ''{1}'' which cannot be invoked"),
+	EXCEPTION_DURING_FUNCTION_CALL(Kind.ERROR, 1023, "A problem occurred whilst attempting to invoke the function ''{0}'': ''{1}''"),
+	ARRAY_INDEX_OUT_OF_BOUNDS(Kind.ERROR, 1024, "The array has ''{0}'' elements, index ''{1}'' is invalid"),
+	COLLECTION_INDEX_OUT_OF_BOUNDS(Kind.ERROR, 1025, "The collection has ''{0}'' elements, index ''{1}'' is invalid"),
+	STRING_INDEX_OUT_OF_BOUNDS(Kind.ERROR, 1026, "The string has ''{0}'' characters, index ''{1}'' is invalid"),
+	INDEXING_NOT_SUPPORTED_FOR_TYPE(Kind.ERROR, 1027, "Indexing into type ''{0}'' is not supported"),
+	INSTANCEOF_OPERATOR_NEEDS_CLASS_OPERAND(Kind.ERROR, 1028, "The operator 'instanceof' needs the right operand to be a class, not a ''{0}''"),
+	EXCEPTION_DURING_METHOD_INVOCATION(Kind.ERROR, 1029, "A problem occurred when trying to execute method ''{0}'' on object of type ''{1}'': ''{2}''"),
+	OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES(Kind.ERROR, 1030, "The operator ''{0}'' is not supported between objects of type ''{1}'' and ''{2}''"),
+	PROBLEM_LOCATING_METHOD(Kind.ERROR, 1031, "Problem locating method {0} on type {1}"),
+	SETVALUE_NOT_SUPPORTED(	Kind.ERROR, 1032, "setValue(ExpressionState, Object) not supported for ''{0}''"),
+	MULTIPLE_POSSIBLE_METHODS(Kind.ERROR, 1033, "Method call of ''{0}'' is ambiguous, supported type conversions allow multiple variants to match"),
+	EXCEPTION_DURING_PROPERTY_WRITE(Kind.ERROR, 1034, "A problem occurred whilst attempting to set the property ''{0}'': {1}"),
+	NOT_AN_INTEGER(Kind.ERROR, 1035, "The value ''{0}'' cannot be parsed as an int"),
+	NOT_A_LONG(Kind.ERROR, 1036, "The value ''{0}'' cannot be parsed as a long"),
+	INVALID_FIRST_OPERAND_FOR_MATCHES_OPERATOR(Kind.ERROR, 1037, "First operand to matches operator must be a string. ''{0}'' is not"),
+	INVALID_SECOND_OPERAND_FOR_MATCHES_OPERATOR(Kind.ERROR, 1038, "Second operand to matches operator must be a string. ''{0}'' is not"),
+	FUNCTION_MUST_BE_STATIC(Kind.ERROR, 1039, "Only static methods can be called via function references. The method ''{0}'' referred to by name ''{1}'' is not static."),
+	NOT_A_REAL(Kind.ERROR, 1040, "The value ''{0}'' cannot be parsed as a double"),
 	MORE_INPUT(Kind.ERROR,1041, "After parsing a valid expression, there is still more data in the expression: ''{0}''"),
 	RIGHT_OPERAND_PROBLEM(Kind.ERROR,1042, "Problem parsing right operand"),
-	NOT_EXPECTED_TOKEN(Kind.ERROR,1043,"Unexpected token.  Expected ''{0}'' but was ''{1}''"),
-	OOD(Kind.ERROR,1044,"Unexpectedly ran out of input"), //
-	NON_TERMINATING_DOUBLE_QUOTED_STRING(Kind.ERROR,1045,"Cannot find terminating \" for string"),//
-	NON_TERMINATING_QUOTED_STRING(Kind.ERROR,1046,"Cannot find terminating ' for string"), //
-	MISSING_LEADING_ZERO_FOR_NUMBER(Kind.ERROR,1047,"A real number must be prefixed by zero, it cannot start with just ''.''"), //
-	REAL_CANNOT_BE_LONG(Kind.ERROR,1048,"Real number cannot be suffixed with a long (L or l) suffix"),//
-	UNEXPECTED_DATA_AFTER_DOT(Kind.ERROR,1049,"Unexpected data after ''.'': ''{0}''"),//
-	MISSING_CONSTRUCTOR_ARGS(Kind.ERROR,1050,"The arguments '(...)' for the constructor call are missing"),//
-	RUN_OUT_OF_ARGUMENTS(Kind.ERROR,1051,"Unexpected ran out of arguments"),//
-	UNABLE_TO_GROW_COLLECTION(Kind.ERROR,1052,"Unable to grow collection"),//
-	UNABLE_TO_GROW_COLLECTION_UNKNOWN_ELEMENT_TYPE(Kind.ERROR,1053,"Unable to grow collection: unable to determine list element type"),//
-	UNABLE_TO_CREATE_LIST_FOR_INDEXING(Kind.ERROR,1054,"Unable to dynamically create a List to replace a null value"),//
-	UNABLE_TO_CREATE_MAP_FOR_INDEXING(Kind.ERROR,1055,"Unable to dynamically create a Map to replace a null value"),//
-	UNABLE_TO_DYNAMICALLY_CREATE_OBJECT(Kind.ERROR,1056,"Unable to dynamically create instance of ''{0}'' to replace a null value"),//
-	NO_BEAN_RESOLVER_REGISTERED(Kind.ERROR,1057,"No bean resolver registered in the context to resolve access to bean ''{0}''"),//
-	EXCEPTION_DURING_BEAN_RESOLUTION(Kind.ERROR, 1058, "A problem occurred when trying to resolve bean ''{0}'':''{1}''"), //
-	INVALID_BEAN_REFERENCE(Kind.ERROR,1059,"@ can only be followed by an identifier or a quoted name"),//
-	TYPE_NAME_EXPECTED_FOR_ARRAY_CONSTRUCTION(Kind.ERROR, 1060,
-			"Expected the type of the new array to be specified as a String but found ''{0}''"), //
-	INCORRECT_ELEMENT_TYPE_FOR_ARRAY(Kind.ERROR, 1061,
-			"The array of type ''{0}'' cannot have an element of type ''{1}'' inserted"), //
-	MULTIDIM_ARRAY_INITIALIZER_NOT_SUPPORTED(Kind.ERROR, 1062,
-			"Using an initializer to build a multi-dimensional array is not currently supported"), //
-	MISSING_ARRAY_DIMENSION(Kind.ERROR, 1063, "A required array dimension has not been specified"), //
-	INITIALIZER_LENGTH_INCORRECT(
-			Kind.ERROR, 1064, "array initializer size does not match array dimensions"), //
-	UNEXPECTED_ESCAPE_CHAR(Kind.ERROR,1065,"unexpected escape character."), //
-	OPERAND_NOT_INCREMENTABLE(Kind.ERROR,1066,"the expression component ''{0}'' does not support increment"), //
-	OPERAND_NOT_DECREMENTABLE(Kind.ERROR,1067,"the expression component ''{0}'' does not support decrement"), //
-	NOT_ASSIGNABLE(Kind.ERROR,1068,"the expression component ''{0}'' is not assignable"), //
+	NOT_EXPECTED_TOKEN(Kind.ERROR,1043,"Unexpected token. Expected ''{0}'' but was ''{1}''"),
+	OOD(Kind.ERROR,1044,"Unexpectedly ran out of input"),
+	NON_TERMINATING_DOUBLE_QUOTED_STRING(Kind.ERROR,1045,"Cannot find terminating \" for string"),
+	NON_TERMINATING_QUOTED_STRING(Kind.ERROR,1046,"Cannot find terminating ' for string"),
+	MISSING_LEADING_ZERO_FOR_NUMBER(Kind.ERROR,1047,"A real number must be prefixed by zero, it cannot start with just ''.''"),
+	REAL_CANNOT_BE_LONG(Kind.ERROR,1048,"Real number cannot be suffixed with a long (L or l) suffix"),
+	UNEXPECTED_DATA_AFTER_DOT(Kind.ERROR,1049,"Unexpected data after ''.'': ''{0}''"),
+	MISSING_CONSTRUCTOR_ARGS(Kind.ERROR,1050,"The arguments '(...)' for the constructor call are missing"),
+	RUN_OUT_OF_ARGUMENTS(Kind.ERROR,1051,"Unexpected ran out of arguments"),
+	UNABLE_TO_GROW_COLLECTION(Kind.ERROR,1052,"Unable to grow collection"),
+	UNABLE_TO_GROW_COLLECTION_UNKNOWN_ELEMENT_TYPE(Kind.ERROR,1053,"Unable to grow collection: unable to determine list element type"),
+	UNABLE_TO_CREATE_LIST_FOR_INDEXING(Kind.ERROR,1054,"Unable to dynamically create a List to replace a null value"),
+	UNABLE_TO_CREATE_MAP_FOR_INDEXING(Kind.ERROR,1055,"Unable to dynamically create a Map to replace a null value"),
+	UNABLE_TO_DYNAMICALLY_CREATE_OBJECT(Kind.ERROR,1056,"Unable to dynamically create instance of ''{0}'' to replace a null value"),
+	NO_BEAN_RESOLVER_REGISTERED(Kind.ERROR,1057,"No bean resolver registered in the context to resolve access to bean ''{0}''"),
+	EXCEPTION_DURING_BEAN_RESOLUTION(Kind.ERROR, 1058, "A problem occurred when trying to resolve bean ''{0}'':''{1}''"),
+	INVALID_BEAN_REFERENCE(Kind.ERROR,1059,"@ can only be followed by an identifier or a quoted name"),
+	TYPE_NAME_EXPECTED_FOR_ARRAY_CONSTRUCTION(Kind.ERROR, 1060, "Expected the type of the new array to be specified as a String but found ''{0}''"),
+	INCORRECT_ELEMENT_TYPE_FOR_ARRAY(Kind.ERROR, 1061, "The array of type ''{0}'' cannot have an element of type ''{1}'' inserted"),
+	MULTIDIM_ARRAY_INITIALIZER_NOT_SUPPORTED(Kind.ERROR, 1062, "Using an initializer to build a multi-dimensional array is not currently supported"),
+	MISSING_ARRAY_DIMENSION(Kind.ERROR, 1063, "A required array dimension has not been specified"),
+	INITIALIZER_LENGTH_INCORRECT(Kind.ERROR, 1064, "array initializer size does not match array dimensions"),
+	UNEXPECTED_ESCAPE_CHAR(Kind.ERROR,1065,"unexpected escape character."),
+	OPERAND_NOT_INCREMENTABLE(Kind.ERROR,1066,"the expression component ''{0}'' does not support increment"),
+	OPERAND_NOT_DECREMENTABLE(Kind.ERROR,1067,"the expression component ''{0}'' does not support decrement"),
+	NOT_ASSIGNABLE(Kind.ERROR,1068,"the expression component ''{0}'' is not assignable"),
 	MISSING_CHARACTER(Kind.ERROR,1069,"missing expected character ''{0}''"),
 	LEFT_OPERAND_PROBLEM(Kind.ERROR,1070, "Problem parsing left operand"),
 	MISSING_SELECTION_EXPRESSION(Kind.ERROR, 1071, "A required selection expression has not been specified");
 
-	private Kind kind;
-	private int code;
-	private String message;
+
+	private final Kind kind;
+
+	private final int code;
+
+	private final String message;
 
 
 	private SpelMessage(Kind kind, int code, String message) {
@@ -125,38 +126,35 @@ private SpelMessage(Kind kind, int code, String message) {
 
 
 	/**
-	 * Produce a complete message including the prefix, the position (if known) and with the inserts applied to the
-	 * message.
-	 *
-	 * @param pos the position, if less than zero it is ignored and not included in the message
+	 * Produce a complete message including the prefix, the position (if known)
+	 * and with the inserts applied to the message.
+	 * @param pos the position (ignored and not included in the message if less than 0)
 	 * @param inserts the inserts to put into the formatted message
 	 * @return a formatted message
 	 */
 	public String formatMessage(int pos, Object... inserts) {
 		StringBuilder formattedMessage = new StringBuilder();
-		formattedMessage.append("EL").append(code);
-		switch (kind) {
-//		case WARNING:
-//			formattedMessage.append("W");
-//			break;
-//		case INFO:
-//			formattedMessage.append("I");
-//			break;
-		case ERROR:
-			formattedMessage.append("E");
-			break;
+		formattedMessage.append("EL").append(this.code);
+		switch (this.kind) {
+			// case INFO:
+			// 	formattedMessage.append("I");
+			// 	break;
+			// case WARNING:
+			// 	formattedMessage.append("W");
+			// 	break;
+			case ERROR:
+				formattedMessage.append("E");
+				break;
 		}
 		formattedMessage.append(":");
 		if (pos != -1) {
 			formattedMessage.append("(pos ").append(pos).append("): ");
 		}
-		formattedMessage.append(MessageFormat.format(message, inserts));
+		formattedMessage.append(MessageFormat.format(this.message, inserts));
 		return formattedMessage.toString();
 	}
 
 
-	public static enum Kind {
-		INFO, WARNING, ERROR
-	}
+	public static enum Kind { INFO, WARNING, ERROR }
 
 }
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParserConfiguration.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParserConfiguration.java
index ccadb93061..8c26f883b2 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParserConfiguration.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParserConfiguration.java
@@ -49,8 +49,7 @@ public SpelParserConfiguration(boolean autoGrowNullReferences, boolean autoGrowC
 	 * @param autoGrowCollections if collections should automatically grow
 	 * @param maximumAutoGrowSize the maximum size that the collection can auto grow
 	 */
-	public SpelParserConfiguration(boolean autoGrowNullReferences,
-			boolean autoGrowCollections, int maximumAutoGrowSize) {
+	public SpelParserConfiguration(boolean autoGrowNullReferences, boolean autoGrowCollections, int maximumAutoGrowSize) {
 		this.autoGrowNullReferences = autoGrowNullReferences;
 		this.autoGrowCollections = autoGrowCollections;
 		this.maximumAutoGrowSize = maximumAutoGrowSize;
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
index 9c74b9c564..adcfe7fca8 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.springframework.core.convert.TypeDescriptor;
@@ -31,8 +32,11 @@
 import org.springframework.expression.spel.ExpressionState;
 import org.springframework.expression.spel.SpelEvaluationException;
 import org.springframework.expression.spel.SpelMessage;
+import org.springframework.expression.spel.support.ReflectiveMethodResolver;
 
 /**
+ * Expression language AST node that represents a method reference.
+ *
  * @author Andy Clement
  * @author Juergen Hoeller
  * @since 3.0
@@ -43,235 +47,255 @@ public class MethodReference extends SpelNodeImpl {
 
 	private final boolean nullSafe;
 
-	private volatile MethodExecutor cachedExecutor;
+	private volatile CachedMethodExecutor cachedExecutor;
 
 
 	public MethodReference(boolean nullSafe, String methodName, int pos, SpelNodeImpl... arguments) {
-		super(pos,arguments);
+		super(pos, arguments);
 		this.name = methodName;
 		this.nullSafe = nullSafe;
 	}
 
-	class MethodValueRef implements ValueRef {
 
-		private ExpressionState state;
-		private EvaluationContext evaluationContext;
-		private Object target;
-		private Object[] arguments;
+	public final String getName() {
+		return this.name;
+	}
 
-		MethodValueRef(ExpressionState state, EvaluationContext evaluationContext, Object object, Object[] arguments) {
-			this.state = state;
-			this.evaluationContext = evaluationContext;
-			this.target = object;
-			this.arguments = arguments;
+	@Override
+	protected ValueRef getValueRef(ExpressionState state) throws EvaluationException {
+		Object[] arguments = getArguments(state);
+		if (state.getActiveContextObject().getValue() == null) {
+			throwIfNotNullSafe(getArgumentTypes(arguments));
+			return ValueRef.NullValueRef.instance;
 		}
+		return new MethodValueRef(state, arguments);
+	}
 
-		public TypedValue getValue() {
-			MethodExecutor executorToUse = cachedExecutor;
-			if (executorToUse != null) {
-				try {
-					return executorToUse.execute(evaluationContext, target, arguments);
-				}
-				catch (AccessException ae) {
-					// Two reasons this can occur:
-					// 1. the method invoked actually threw a real exception
-					// 2. the method invoked was not passed the arguments it expected and has become 'stale'
+	@Override
+	public TypedValue getValueInternal(ExpressionState state) throws EvaluationException {
+		EvaluationContext evaluationContext = state.getEvaluationContext();
+		Object value = state.getActiveContextObject().getValue();
+		TypeDescriptor targetType = state.getActiveContextObject().getTypeDescriptor();
+		Object[] arguments = getArguments(state);
+		return getValueInternal(evaluationContext, value, targetType, arguments);
+	}
 
-					// In the first case we should not retry, in the second case we should see if there is a
-					// better suited method.
+	private TypedValue getValueInternal(EvaluationContext evaluationContext,
+			Object value, TypeDescriptor targetType, Object[] arguments) {
 
-					// To determine which situation it is, the AccessException will contain a cause.
-					// If the cause is an InvocationTargetException, a user exception was thrown inside the method.
-					// Otherwise the method could not be invoked.
-					throwSimpleExceptionIfPossible(state, ae);
+		List<TypeDescriptor> argumentTypes = getArgumentTypes(arguments);
+		if (value == null) {
+			throwIfNotNullSafe(argumentTypes);
+			return TypedValue.NULL;
+		}
 
-					// at this point we know it wasn't a user problem so worth a retry if a better candidate can be found
-					cachedExecutor = null;
-				}
+		MethodExecutor executorToUse = getCachedExecutor(evaluationContext, value, targetType, argumentTypes);
+		if (executorToUse != null) {
+			try {
+				return executorToUse.execute(evaluationContext, value, arguments);
 			}
+			catch (AccessException ae) {
+				// Two reasons this can occur:
+				// 1. the method invoked actually threw a real exception
+				// 2. the method invoked was not passed the arguments it expected and
+				//    has become 'stale'
 
-			// either there was no accessor or it no longer existed
-			executorToUse = findAccessorForMethod(name, getTypes(arguments), target, evaluationContext);
-			cachedExecutor = executorToUse;
-			try {
-				return executorToUse.execute(evaluationContext, target, arguments);
-			} catch (AccessException ae) {
-				// Same unwrapping exception handling as above in above catch block
-				throwSimpleExceptionIfPossible(state, ae);
-				throw new SpelEvaluationException( getStartPosition(), ae, SpelMessage.EXCEPTION_DURING_METHOD_INVOCATION,
-						name, state.getActiveContextObject().getValue().getClass().getName(), ae.getMessage());
+				// In the first case we should not retry, in the second case we should see
+				// if there is a better suited method.
+
+				// To determine the situation, the AccessException will contain a cause.
+				// If the cause is an InvocationTargetException, a user exception was
+				// thrown inside the method. Otherwise the method could not be invoked.
+				throwSimpleExceptionIfPossible(value, ae);
+
+				// At this point we know it wasn't a user problem so worth a retry if a
+				// better candidate can be found.
+				this.cachedExecutor = null;
 			}
 		}
 
-		public void setValue(Object newValue) {
-			throw new IllegalAccessError();
+		// either there was no accessor or it no longer existed
+		executorToUse = findAccessorForMethod(this.name, argumentTypes, value, evaluationContext);
+		this.cachedExecutor = new CachedMethodExecutor(
+				executorToUse, (value instanceof Class ? (Class<?>) value : null), targetType, argumentTypes);
+		try {
+			return executorToUse.execute(evaluationContext, value, arguments);
 		}
-
-		public boolean isWritable() {
-			return false;
+		catch (AccessException ex) {
+			// Same unwrapping exception handling as above in above catch block
+			throwSimpleExceptionIfPossible(value, ex);
+			throw new SpelEvaluationException(getStartPosition(), ex,
+					SpelMessage.EXCEPTION_DURING_METHOD_INVOCATION, this.name,
+					value.getClass().getName(), ex.getMessage());
 		}
-
 	}
 
-	@Override
-	protected ValueRef getValueRef(ExpressionState state) throws EvaluationException {
-		TypedValue currentContext = state.getActiveContextObject();
-		Object[] arguments = new Object[getChildCount()];
-		for (int i = 0; i < arguments.length; i++) {
-			// Make the root object the active context again for evaluating the parameter
-			// expressions
-			try {
-				state.pushActiveContextObject(state.getRootContextObject());
-				arguments[i] = children[i].getValueInternal(state).getValue();
-			}
-			finally {
-				state.popActiveContextObject();
-			}
-		}
-		if (currentContext.getValue() == null) {
-			if (nullSafe) {
-				return ValueRef.NullValueRef.instance;
-			}
-			else {
-				throw new SpelEvaluationException(getStartPosition(), SpelMessage.METHOD_CALL_ON_NULL_OBJECT_NOT_ALLOWED,
-						FormatHelper.formatMethodForMessage(name, getTypes(arguments)));
-			}
+	private void throwIfNotNullSafe(List<TypeDescriptor> argumentTypes) {
+		if (!this.nullSafe) {
+			throw new SpelEvaluationException(getStartPosition(),
+					SpelMessage.METHOD_CALL_ON_NULL_OBJECT_NOT_ALLOWED,
+					FormatHelper.formatMethodForMessage(this.name, argumentTypes));
 		}
-
-		return new MethodValueRef(state,state.getEvaluationContext(),state.getActiveContextObject().getValue(),arguments);
 	}
 
-	@Override
-	public TypedValue getValueInternal(ExpressionState state) throws EvaluationException {
-		TypedValue currentContext = state.getActiveContextObject();
+	private Object[] getArguments(ExpressionState state) {
 		Object[] arguments = new Object[getChildCount()];
 		for (int i = 0; i < arguments.length; i++) {
-			// Make the root object the active context again for evaluating the parameter
-			// expressions
+			// Make the root object the active context again for evaluating the parameter expressions
 			try {
 				state.pushActiveContextObject(state.getRootContextObject());
-				arguments[i] = children[i].getValueInternal(state).getValue();
+				arguments[i] = this.children[i].getValueInternal(state).getValue();
 			}
 			finally {
 				state.popActiveContextObject();
 			}
 		}
-		if (currentContext.getValue() == null) {
-			if (this.nullSafe) {
-				return TypedValue.NULL;
-			}
-			else {
-				throw new SpelEvaluationException(getStartPosition(), SpelMessage.METHOD_CALL_ON_NULL_OBJECT_NOT_ALLOWED,
-						FormatHelper.formatMethodForMessage(name, getTypes(arguments)));
-			}
+		return arguments;
+	}
+
+	private List<TypeDescriptor> getArgumentTypes(Object... arguments) {
+		List<TypeDescriptor> descriptors = new ArrayList<TypeDescriptor>(arguments.length);
+		for (Object argument : arguments) {
+			descriptors.add(TypeDescriptor.forObject(argument));
 		}
+		return Collections.unmodifiableList(descriptors);
+	}
 
-		MethodExecutor executorToUse = this.cachedExecutor;
-		if (executorToUse != null) {
-			try {
-				return executorToUse.execute(
-						state.getEvaluationContext(), state.getActiveContextObject().getValue(), arguments);
-			}
-			catch (AccessException ae) {
-				// Two reasons this can occur:
-				// 1. the method invoked actually threw a real exception
-				// 2. the method invoked was not passed the arguments it expected and has become 'stale'
+	private MethodExecutor getCachedExecutor(EvaluationContext evaluationContext, Object value,
+			TypeDescriptor target, List<TypeDescriptor> argumentTypes) {
+
+		List<MethodResolver> methodResolvers = evaluationContext.getMethodResolvers();
+		if (methodResolvers == null || methodResolvers.size() != 1 ||
+				!(methodResolvers.get(0) instanceof ReflectiveMethodResolver)) {
+			// Not a default ReflectiveMethodResolver - don't know whether caching is valid
+			return null;
+		}
 
-				// In the first case we should not retry, in the second case we should see if there is a
-				// better suited method.
+		CachedMethodExecutor executorToCheck = this.cachedExecutor;
+		if (executorToCheck != null && executorToCheck.isSuitable(value, target, argumentTypes)) {
+			return executorToCheck.get();
+		}
+		this.cachedExecutor = null;
+		return null;
+	}
 
-				// To determine which situation it is, the AccessException will contain a cause.
-				// If the cause is an InvocationTargetException, a user exception was thrown inside the method.
-				// Otherwise the method could not be invoked.
-				throwSimpleExceptionIfPossible(state, ae);
+	private MethodExecutor findAccessorForMethod(String name, List<TypeDescriptor> argumentTypes,
+			Object targetObject, EvaluationContext evaluationContext) throws SpelEvaluationException {
 
-				// at this point we know it wasn't a user problem so worth a retry if a better candidate can be found
-				this.cachedExecutor = null;
+		List<MethodResolver> methodResolvers = evaluationContext.getMethodResolvers();
+		if (methodResolvers != null) {
+			for (MethodResolver methodResolver : methodResolvers) {
+				try {
+					MethodExecutor methodExecutor = methodResolver.resolve(
+							evaluationContext, targetObject, name, argumentTypes);
+					if (methodExecutor != null) {
+						return methodExecutor;
+					}
+				}
+				catch (AccessException ex) {
+					throw new SpelEvaluationException(getStartPosition(), ex,
+							SpelMessage.PROBLEM_LOCATING_METHOD, name, targetObject.getClass());
+				}
 			}
 		}
 
-		// either there was no accessor or it no longer existed
-		executorToUse = findAccessorForMethod(this.name, getTypes(arguments), state);
-		this.cachedExecutor = executorToUse;
-		try {
-			return executorToUse.execute(
-					state.getEvaluationContext(), state.getActiveContextObject().getValue(), arguments);
-		} catch (AccessException ae) {
-			// Same unwrapping exception handling as above in above catch block
-			throwSimpleExceptionIfPossible(state, ae);
-			throw new SpelEvaluationException( getStartPosition(), ae, SpelMessage.EXCEPTION_DURING_METHOD_INVOCATION,
-					this.name, state.getActiveContextObject().getValue().getClass().getName(), ae.getMessage());
-		}
+		throw new SpelEvaluationException(getStartPosition(), SpelMessage.METHOD_NOT_FOUND,
+				FormatHelper.formatMethodForMessage(name, argumentTypes),
+				FormatHelper.formatClassNameForMessage(
+						targetObject instanceof Class ? ((Class<?>) targetObject) : targetObject.getClass()));
 	}
 
-
 	/**
-	 * Decode the AccessException, throwing a lightweight evaluation exception or, if the cause was a RuntimeException,
-	 * throw the RuntimeException directly.
+	 * Decode the AccessException, throwing a lightweight evaluation exception or, if the
+	 * cause was a RuntimeException, throw the RuntimeException directly.
 	 */
-	private void throwSimpleExceptionIfPossible(ExpressionState state, AccessException ae) {
+	private void throwSimpleExceptionIfPossible(Object value, AccessException ae) {
 		if (ae.getCause() instanceof InvocationTargetException) {
 			Throwable rootCause = ae.getCause().getCause();
 			if (rootCause instanceof RuntimeException) {
 				throw (RuntimeException) rootCause;
 			}
-			else {
-				throw new ExpressionInvocationTargetException(getStartPosition(),
-						"A problem occurred when trying to execute method '" + this.name +
-						"' on object of type '" + state.getActiveContextObject().getValue().getClass().getName() + "'",
-						rootCause);
-			}
+			throw new ExpressionInvocationTargetException(getStartPosition(),
+					"A problem occurred when trying to execute method '" + this.name +
+					"' on object of type [" + value.getClass().getName() + "]", rootCause);
 		}
 	}
 
-	private List<TypeDescriptor> getTypes(Object... arguments) {
-		List<TypeDescriptor> descriptors = new ArrayList<TypeDescriptor>(arguments.length);
-		for (Object argument : arguments) {
-			descriptors.add(TypeDescriptor.forObject(argument));
-		}
-		return descriptors;
-	}
-
 	@Override
 	public String toStringAST() {
 		StringBuilder sb = new StringBuilder();
-		sb.append(name).append("(");
+		sb.append(this.name).append("(");
 		for (int i = 0; i < getChildCount(); i++) {
-			if (i > 0)
+			if (i > 0) {
 				sb.append(",");
+			}
 			sb.append(getChild(i).toStringAST());
 		}
 		sb.append(")");
 		return sb.toString();
 	}
 
-	private MethodExecutor findAccessorForMethod(String name,
-			List<TypeDescriptor> argumentTypes, ExpressionState state)
-			throws SpelEvaluationException {
-		return findAccessorForMethod(name,argumentTypes,state.getActiveContextObject().getValue(),state.getEvaluationContext());
+
+	private class MethodValueRef implements ValueRef {
+
+		private final EvaluationContext evaluationContext;
+
+		private final Object value;
+
+		private final TypeDescriptor targetType;
+
+		private final Object[] arguments;
+
+		public MethodValueRef(ExpressionState state, Object[] arguments) {
+			this.evaluationContext = state.getEvaluationContext();
+			this.value = state.getActiveContextObject().getValue();
+			this.targetType = state.getActiveContextObject().getTypeDescriptor();
+			this.arguments = arguments;
+		}
+
+		@Override
+		public TypedValue getValue() {
+			return getValueInternal(this.evaluationContext, this.value, this.targetType, this.arguments);
+		}
+
+		@Override
+		public void setValue(Object newValue) {
+			throw new IllegalAccessError();
+		}
+
+		@Override
+		public boolean isWritable() {
+			return false;
+		}
 	}
 
-	private MethodExecutor findAccessorForMethod(String name,
-			List<TypeDescriptor> argumentTypes, Object contextObject, EvaluationContext eContext)
-			throws SpelEvaluationException {
 
-		List<MethodResolver> mResolvers = eContext.getMethodResolvers();
-		if (mResolvers != null) {
-			for (MethodResolver methodResolver : mResolvers) {
-				try {
-					MethodExecutor cEx = methodResolver.resolve(
-							eContext, contextObject, name, argumentTypes);
-					if (cEx != null) {
-						return cEx;
-					}
-				}
-				catch (AccessException ex) {
-					throw new SpelEvaluationException(getStartPosition(),ex, SpelMessage.PROBLEM_LOCATING_METHOD, name, contextObject.getClass());
-				}
-			}
+	private static class CachedMethodExecutor {
+
+		private final MethodExecutor methodExecutor;
+
+		private final Class<?> staticClass;
+
+		private final TypeDescriptor target;
+
+		private final List<TypeDescriptor> argumentTypes;
+
+		public CachedMethodExecutor(MethodExecutor methodExecutor, Class<?> staticClass,
+				TypeDescriptor target, List<TypeDescriptor> argumentTypes) {
+			this.methodExecutor = methodExecutor;
+			this.staticClass = staticClass;
+			this.target = target;
+			this.argumentTypes = argumentTypes;
+		}
+
+		public boolean isSuitable(Object value, TypeDescriptor target, List<TypeDescriptor> argumentTypes) {
+			return ((this.staticClass == null || this.staticClass.equals(value)) &&
+					this.target.equals(target) && this.argumentTypes.equals(argumentTypes));
+		}
+
+		public MethodExecutor get() {
+			return this.methodExecutor;
 		}
-		throw new SpelEvaluationException(getStartPosition(),SpelMessage.METHOD_NOT_FOUND, FormatHelper.formatMethodForMessage(name, argumentTypes),
-				FormatHelper.formatClassNameForMessage(contextObject instanceof Class ? ((Class<?>) contextObject) : contextObject.getClass()));
 	}
 
 }
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
index 99e79ff504..e110ae0094 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,47 +67,20 @@ public String getName() {
 	}
 
 
-	static class AccessorLValue implements ValueRef {
-		private PropertyOrFieldReference ref;
-		private TypedValue contextObject;
-		private EvaluationContext eContext;
-		private boolean isAutoGrowNullReferences;
-
-		public AccessorLValue(
-				PropertyOrFieldReference propertyOrFieldReference,
-				TypedValue activeContextObject,
-				EvaluationContext evaluationContext, boolean isAutoGrowNullReferences) {
-			this.ref = propertyOrFieldReference;
-			this.contextObject = activeContextObject;
-			this.eContext =evaluationContext;
-			this.isAutoGrowNullReferences = isAutoGrowNullReferences;
-		}
-
-		public TypedValue getValue() {
-			return ref.getValueInternal(contextObject,eContext,isAutoGrowNullReferences);
-		}
-
-		public void setValue(Object newValue) {
-			ref.writeProperty(contextObject,eContext, ref.name, newValue);
-		}
-
-		public boolean isWritable() {
-			return true;
-		}
-
-	}
-
 	@Override
 	public ValueRef getValueRef(ExpressionState state) throws EvaluationException {
-		return new AccessorLValue(this,state.getActiveContextObject(),state.getEvaluationContext(),state.getConfiguration().isAutoGrowNullReferences());
+		return new AccessorLValue(this, state.getActiveContextObject(), state.getEvaluationContext(),
+				state.getConfiguration().isAutoGrowNullReferences());
 	}
 
 	@Override
 	public TypedValue getValueInternal(ExpressionState state) throws EvaluationException {
-		return getValueInternal(state.getActiveContextObject(), state.getEvaluationContext(), state.getConfiguration().isAutoGrowNullReferences());
+		return getValueInternal(state.getActiveContextObject(), state.getEvaluationContext(),
+				state.getConfiguration().isAutoGrowNullReferences());
 	}
 
-	private TypedValue getValueInternal(TypedValue contextObject, EvaluationContext eContext, boolean isAutoGrowNullReferences) throws EvaluationException {
+	private TypedValue getValueInternal(TypedValue contextObject, EvaluationContext eContext,
+			boolean isAutoGrowNullReferences) throws EvaluationException {
 
 		TypedValue result = readProperty(contextObject, eContext, this.name);
 
@@ -115,50 +88,47 @@ private TypedValue getValueInternal(TypedValue contextObject, EvaluationContext
 		if (result.getValue() == null && isAutoGrowNullReferences &&
 				nextChildIs(Indexer.class, PropertyOrFieldReference.class)) {
 			TypeDescriptor resultDescriptor = result.getTypeDescriptor();
-			// Creating lists and maps
-			if ((resultDescriptor.getType().equals(List.class) || resultDescriptor.getType().equals(Map.class))) {
-				// Create a new collection or map ready for the indexer
-				if (resultDescriptor.getType().equals(List.class)) {
-					try {
-						if (isWritableProperty(this.name,contextObject,eContext)) {
-							List<?> newList = ArrayList.class.newInstance();
-							writeProperty(contextObject, eContext, this.name, newList);
-							result = readProperty(contextObject, eContext, this.name);
-						}
-					}
-					catch (InstantiationException ex) {
-						throw new SpelEvaluationException(getStartPosition(), ex,
-								SpelMessage.UNABLE_TO_CREATE_LIST_FOR_INDEXING);
-					}
-					catch (IllegalAccessException ex) {
-						throw new SpelEvaluationException(getStartPosition(), ex,
-								SpelMessage.UNABLE_TO_CREATE_LIST_FOR_INDEXING);
+			// Create a new collection or map ready for the indexer
+			if (List.class.equals(resultDescriptor.getType())) {
+				try {
+					if (isWritableProperty(this.name, contextObject, eContext)) {
+						List<?> newList = ArrayList.class.newInstance();
+						writeProperty(contextObject, eContext, this.name, newList);
+						result = readProperty(contextObject, eContext, this.name);
 					}
 				}
-				else {
-					try {
-						if (isWritableProperty(this.name,contextObject,eContext)) {
-							Map<?,?> newMap = HashMap.class.newInstance();
-							writeProperty(contextObject, eContext, name, newMap);
-							result = readProperty(contextObject, eContext, this.name);
-						}
-					}
-					catch (InstantiationException ex) {
-						throw new SpelEvaluationException(getStartPosition(), ex,
-								SpelMessage.UNABLE_TO_CREATE_MAP_FOR_INDEXING);
-					}
-					catch (IllegalAccessException ex) {
-						throw new SpelEvaluationException(getStartPosition(), ex,
-								SpelMessage.UNABLE_TO_CREATE_MAP_FOR_INDEXING);
+				catch (InstantiationException ex) {
+					throw new SpelEvaluationException(getStartPosition(), ex,
+							SpelMessage.UNABLE_TO_CREATE_LIST_FOR_INDEXING);
+				}
+				catch (IllegalAccessException ex) {
+					throw new SpelEvaluationException(getStartPosition(), ex,
+							SpelMessage.UNABLE_TO_CREATE_LIST_FOR_INDEXING);
+				}
+			}
+			else if (Map.class.equals(resultDescriptor.getType())) {
+				try {
+					if (isWritableProperty(this.name, contextObject, eContext)) {
+						Map<?,?> newMap = HashMap.class.newInstance();
+						writeProperty(contextObject, eContext, this.name, newMap);
+						result = readProperty(contextObject, eContext, this.name);
 					}
 				}
+				catch (InstantiationException ex) {
+					throw new SpelEvaluationException(getStartPosition(), ex,
+							SpelMessage.UNABLE_TO_CREATE_MAP_FOR_INDEXING);
+				}
+				catch (IllegalAccessException ex) {
+					throw new SpelEvaluationException(getStartPosition(), ex,
+							SpelMessage.UNABLE_TO_CREATE_MAP_FOR_INDEXING);
+				}
 			}
 			else {
 				// 'simple' object
 				try {
 					if (isWritableProperty(this.name,contextObject,eContext)) {
 						Object newObject  = result.getTypeDescriptor().getType().newInstance();
-						writeProperty(contextObject, eContext, name, newObject);
+						writeProperty(contextObject, eContext, this.name, newObject);
 						result = readProperty(contextObject, eContext, this.name);
 					}
 				}
@@ -192,14 +162,11 @@ public String toStringAST() {
 
 	/**
 	 * Attempt to read the named property from the current context object.
-	 * @param state the evaluation state
-	 * @param name the name of the property
 	 * @return the value of the property
 	 * @throws SpelEvaluationException if any problem accessing the property or it cannot be found
 	 */
 	private TypedValue readProperty(TypedValue contextObject, EvaluationContext eContext, String name) throws EvaluationException {
 		Object targetObject = contextObject.getValue();
-
 		if (targetObject == null && this.nullSafe) {
 			return TypedValue.NULL;
 		}
@@ -216,9 +183,7 @@ private TypedValue readProperty(TypedValue contextObject, EvaluationContext eCon
 			}
 		}
 
-		Class<?> contextObjectClass = getObjectClass(contextObject.getValue());
-		List<PropertyAccessor> accessorsToTry = getPropertyAccessorsToTry(contextObjectClass, eContext.getPropertyAccessors());
-
+		List<PropertyAccessor> accessorsToTry = getPropertyAccessorsToTry(contextObject.getValue(), eContext.getPropertyAccessors());
 		// Go through the accessors that may be able to resolve it. If they are a cacheable accessor then
 		// get the accessor and use it. If they are not cacheable but report they can read the property
 		// then ask them to read it
@@ -244,13 +209,12 @@ private TypedValue readProperty(TypedValue contextObject, EvaluationContext eCon
 		}
 		else {
 			throw new SpelEvaluationException(getStartPosition(), SpelMessage.PROPERTY_OR_FIELD_NOT_READABLE, name,
-					FormatHelper.formatClassNameForMessage(contextObjectClass));
+					FormatHelper.formatClassNameForMessage(getObjectClass(contextObject.getValue())));
 		}
 	}
 
 	private void writeProperty(TypedValue contextObject, EvaluationContext eContext, String name, Object newValue) throws SpelEvaluationException {
-
-		if (contextObject.getValue() == null && nullSafe) {
+		if (contextObject.getValue() == null && this.nullSafe) {
 			return;
 		}
 
@@ -267,9 +231,7 @@ private void writeProperty(TypedValue contextObject, EvaluationContext eContext,
 			}
 		}
 
-		Class<?> contextObjectClass = getObjectClass(contextObject.getValue());
-
-		List<PropertyAccessor> accessorsToTry = getPropertyAccessorsToTry(contextObjectClass, eContext.getPropertyAccessors());
+		List<PropertyAccessor> accessorsToTry = getPropertyAccessorsToTry(contextObject.getValue(), eContext.getPropertyAccessors());
 		if (accessorsToTry != null) {
 			try {
 				for (PropertyAccessor accessor : accessorsToTry) {
@@ -290,18 +252,16 @@ private void writeProperty(TypedValue contextObject, EvaluationContext eContext,
 		}
 		else {
 			throw new SpelEvaluationException(getStartPosition(), SpelMessage.PROPERTY_OR_FIELD_NOT_WRITABLE, name,
-					FormatHelper.formatClassNameForMessage(contextObjectClass));
+					FormatHelper.formatClassNameForMessage(getObjectClass(contextObject.getValue())));
 		}
 	}
 
 	public boolean isWritableProperty(String name, TypedValue contextObject, EvaluationContext eContext) throws SpelEvaluationException {
-		Object contextObjectValue = contextObject.getValue();
-		// TypeDescriptor td = state.getActiveContextObject().getTypeDescriptor();
-		List<PropertyAccessor> resolversToTry = getPropertyAccessorsToTry(getObjectClass(contextObjectValue), eContext.getPropertyAccessors());
-		if (resolversToTry != null) {
-			for (PropertyAccessor pfResolver : resolversToTry) {
+		List<PropertyAccessor> accessorsToTry = getPropertyAccessorsToTry(contextObject.getValue(), eContext.getPropertyAccessors());
+		if (accessorsToTry != null) {
+			for (PropertyAccessor accessor : accessorsToTry) {
 				try {
-					if (pfResolver.canWrite(eContext, contextObjectValue, name)) {
+					if (accessor.canWrite(eContext, contextObject.getValue(), name)) {
 						return true;
 					}
 				}
@@ -321,27 +281,28 @@ public boolean isWritableProperty(String name, TypedValue contextObject, Evaluat
 	 * the start of the list. In addition, there are specific resolvers that exactly name the class in question and
 	 * resolvers that name a specific class but it is a supertype of the class we have. These are put at the end of the
 	 * specific resolvers set and will be tried after exactly matching accessors but before generic accessors.
-	 * @param targetType the type upon which property access is being attempted
+	 * @param contextObject the object upon which property access is being attempted
 	 * @return a list of resolvers that should be tried in order to access the property
 	 */
-	private List<PropertyAccessor> getPropertyAccessorsToTry(Class<?> targetType, List<PropertyAccessor> propertyAccessors) {
+	private List<PropertyAccessor> getPropertyAccessorsToTry(Object contextObject, List<PropertyAccessor> propertyAccessors) {
+		Class<?> targetType = (contextObject != null ? contextObject.getClass() : null);
+
 		List<PropertyAccessor> specificAccessors = new ArrayList<PropertyAccessor>();
 		List<PropertyAccessor> generalAccessors = new ArrayList<PropertyAccessor>();
 		for (PropertyAccessor resolver : propertyAccessors) {
 			Class<?>[] targets = resolver.getSpecificTargetClasses();
-			if (targets == null) { // generic resolver that says it can be used for any type
+			if (targets == null) {
+				// generic resolver that says it can be used for any type
 				generalAccessors.add(resolver);
 			}
-			else {
-				if (targetType != null) {
-					for (Class<?> clazz : targets) {
-						if (clazz == targetType) {
-							specificAccessors.add( resolver);
-							break;
-						}
-						else if (clazz.isAssignableFrom(targetType)) {
-							generalAccessors.add(resolver);
-						}
+			else if (targetType != null) {
+				for (Class<?> clazz : targets) {
+					if (clazz == targetType) {
+						specificAccessors.add(resolver);
+						break;
+					}
+					else if (clazz.isAssignableFrom(targetType)) {
+						generalAccessors.add(resolver);
 					}
 				}
 			}
@@ -353,4 +314,39 @@ else if (clazz.isAssignableFrom(targetType)) {
 		return resolvers;
 	}
 
+
+	private static class AccessorLValue implements ValueRef {
+
+		private final PropertyOrFieldReference ref;
+
+		private final TypedValue contextObject;
+
+		private final EvaluationContext eContext;
+
+		private final boolean autoGrowNullReferences;
+
+		public AccessorLValue(PropertyOrFieldReference propertyOrFieldReference, TypedValue activeContextObject,
+				EvaluationContext evaluationContext, boolean autoGrowNullReferences) {
+			this.ref = propertyOrFieldReference;
+			this.contextObject = activeContextObject;
+			this.eContext = evaluationContext;
+			this.autoGrowNullReferences = autoGrowNullReferences;
+		}
+
+		@Override
+		public TypedValue getValue() {
+			return this.ref.getValueInternal(this.contextObject, this.eContext, this.autoGrowNullReferences);
+		}
+
+		@Override
+		public void setValue(Object newValue) {
+			this.ref.writeProperty(this.contextObject, this.eContext, this.ref.name, newValue);
+		}
+
+		@Override
+		public boolean isWritable() {
+			return true;
+		}
+	}
+
 }
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java
index 7915a3c015..df808b8e1d 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java
@@ -44,6 +44,7 @@ class InternalSpelExpressionParser extends TemplateAwareExpressionParser {
 
 	private static final Pattern VALID_QUALIFIED_ID_PATTERN = Pattern.compile("[\\p{L}\\p{N}_$]+");
 
+
 	// The expression being parsed
 	private String expressionString;
 
@@ -57,9 +58,9 @@ class InternalSpelExpressionParser extends TemplateAwareExpressionParser {
 	private int tokenStreamPointer;
 
 	// For rules that build nodes, they are stacked here for return
-	private Stack<SpelNodeImpl> constructedNodes = new Stack<SpelNodeImpl>();
+	private final Stack<SpelNodeImpl> constructedNodes = new Stack<SpelNodeImpl>();
 
-	private SpelParserConfiguration configuration;
+	private final SpelParserConfiguration configuration;
 
 
 	/**
@@ -77,16 +78,16 @@ protected SpelExpression doParseExpression(String expressionString, ParserContex
 			this.expressionString = expressionString;
 			Tokenizer tokenizer = new Tokenizer(expressionString);
 			tokenizer.process();
-			tokenStream = tokenizer.getTokens();
-			tokenStreamLength = tokenStream.size();
-			tokenStreamPointer = 0;
-			constructedNodes.clear();
+			this.tokenStream = tokenizer.getTokens();
+			this.tokenStreamLength = this.tokenStream.size();
+			this.tokenStreamPointer = 0;
+			this.constructedNodes.clear();
 			SpelNodeImpl ast = eatExpression();
 			if (moreTokens()) {
 				throw new SpelParseException(peekToken().startpos,SpelMessage.MORE_INPUT,toString(nextToken()));
 			}
-			Assert.isTrue(constructedNodes.isEmpty());
-			return new SpelExpression(expressionString, ast, configuration);
+			Assert.isTrue(this.constructedNodes.isEmpty());
+			return new SpelExpression(expressionString, ast, this.configuration);
 		}
 		catch (InternalParseException ipe) {
 			throw ipe.getCause();
@@ -110,7 +111,9 @@ private SpelNodeImpl eatExpression() {
 				nextToken();
 				SpelNodeImpl assignedValue = eatLogicalOrExpression();
 				return new Assign(toPos(t),expr,assignedValue);
-			} else if (t.kind==TokenKind.ELVIS) { // a?:b (a if it isn't null, otherwise b)
+			}
+
+			if (t.kind==TokenKind.ELVIS) { // a?:b (a if it isn't null, otherwise b)
 				if (expr==null) {
 					expr = new NullLiteral(toPos(t.startpos-1,t.endpos-2));
 				}
@@ -120,7 +123,9 @@ private SpelNodeImpl eatExpression() {
 					valueIfNull = new NullLiteral(toPos(t.startpos+1,t.endpos+1));
 				}
 				return new Elvis(toPos(t),expr,valueIfNull);
-			} else if (t.kind==TokenKind.QMARK) { // a?b:c
+			}
+
+			if (t.kind==TokenKind.QMARK) { // a?b:c
 				if (expr==null) {
 					expr = new NullLiteral(toPos(t.startpos-1,t.endpos-1));
 				}
@@ -167,31 +172,38 @@ private SpelNodeImpl eatRelationalExpression() {
 			SpelNodeImpl rhExpr = eatSumExpression();
 			checkOperands(t,expr,rhExpr);
 			TokenKind tk = relationalOperatorToken.kind;
+
 			if (relationalOperatorToken.isNumericRelationalOperator()) {
 				int pos = toPos(t);
-				if (tk==TokenKind.GT) {
-					return new OpGT(pos,expr,rhExpr);
-				} else if (tk==TokenKind.LT) {
-					return new OpLT(pos,expr,rhExpr);
-				} else if (tk==TokenKind.LE) {
-					return new OpLE(pos,expr,rhExpr);
-				} else if (tk==TokenKind.GE) {
-					return new OpGE(pos,expr,rhExpr);
-				} else if (tk == TokenKind.EQ) {
-					return new OpEQ(pos,expr,rhExpr);
-				} else {
-					Assert.isTrue(tk == TokenKind.NE);
-					return new OpNE(pos,expr,rhExpr);
+				if (tk == TokenKind.GT) {
+					return new OpGT(pos, expr, rhExpr);
 				}
+				if (tk == TokenKind.LT) {
+					return new OpLT(pos, expr, rhExpr);
+				}
+				if (tk == TokenKind.LE) {
+					return new OpLE(pos, expr, rhExpr);
+				}
+				if (tk == TokenKind.GE) {
+					return new OpGE(pos, expr, rhExpr);
+				}
+				if (tk == TokenKind.EQ) {
+					return new OpEQ(pos, expr, rhExpr);
+				}
+				Assert.isTrue(tk == TokenKind.NE);
+				return new OpNE(pos, expr, rhExpr);
+			}
+
+			if (tk == TokenKind.INSTANCEOF) {
+				return new OperatorInstanceof(toPos(t), expr, rhExpr);
 			}
-			if (tk==TokenKind.INSTANCEOF) {
-				return new OperatorInstanceof(toPos(t),expr,rhExpr);
-			} else if (tk==TokenKind.MATCHES) {
-				return new OperatorMatches(toPos(t),expr,rhExpr);
-			} else {
-				Assert.isTrue(tk==TokenKind.BETWEEN);
-				return new org.springframework.expression.spel.ast.OperatorBetween(toPos(t),expr,rhExpr);
+
+			if (tk == TokenKind.MATCHES) {
+				return new OperatorMatches(toPos(t), expr, rhExpr);
 			}
+
+			Assert.isTrue(tk == TokenKind.BETWEEN);
+			return new OperatorBetween(toPos(t), expr, rhExpr);
 		}
 		return expr;
 	}
@@ -199,14 +211,15 @@ private SpelNodeImpl eatRelationalExpression() {
 	//sumExpression: productExpression ( (PLUS^ | MINUS^) productExpression)*;
 	private SpelNodeImpl eatSumExpression() {
 		SpelNodeImpl expr = eatProductExpression();
-		while (peekToken(TokenKind.PLUS,TokenKind.MINUS,TokenKind.INC)) {
+		while (peekToken(TokenKind.PLUS, TokenKind.MINUS, TokenKind.INC)) {
 			Token t = nextToken();//consume PLUS or MINUS or INC
 			SpelNodeImpl rhExpr = eatProductExpression();
 			checkRightOperand(t,rhExpr);
-			if (t.kind==TokenKind.PLUS) {
-				expr = new OpPlus(toPos(t),expr,rhExpr);
-			} else if (t.kind==TokenKind.MINUS) {
-				expr = new OpMinus(toPos(t),expr,rhExpr);
+			if (t.kind == TokenKind.PLUS) {
+				expr = new OpPlus(toPos(t), expr, rhExpr);
+			}
+			else if (t.kind == TokenKind.MINUS) {
+				expr = new OpMinus(toPos(t), expr, rhExpr);
 			}
 		}
 		return expr;
@@ -215,17 +228,19 @@ private SpelNodeImpl eatSumExpression() {
 	// productExpression: powerExpr ((STAR^ | DIV^| MOD^) powerExpr)* ;
 	private SpelNodeImpl eatProductExpression() {
 		SpelNodeImpl expr = eatPowerIncDecExpression();
-		while (peekToken(TokenKind.STAR,TokenKind.DIV,TokenKind.MOD)) {
+		while (peekToken(TokenKind.STAR, TokenKind.DIV, TokenKind.MOD)) {
 			Token t = nextToken(); // consume STAR/DIV/MOD
 			SpelNodeImpl rhExpr = eatPowerIncDecExpression();
 			checkOperands(t,expr,rhExpr);
-			if (t.kind==TokenKind.STAR) {
-				expr = new OpMultiply(toPos(t),expr,rhExpr);
-			} else if (t.kind==TokenKind.DIV) {
-				expr = new OpDivide(toPos(t),expr,rhExpr);
-			} else {
-				Assert.isTrue(t.kind==TokenKind.MOD);
-				expr = new OpModulus(toPos(t),expr,rhExpr);
+			if (t.kind == TokenKind.STAR) {
+				expr = new OpMultiply(toPos(t), expr, rhExpr);
+			}
+			else if (t.kind == TokenKind.DIV) {
+				expr = new OpDivide(toPos(t), expr, rhExpr);
+			}
+			else {
+				Assert.isTrue(t.kind == TokenKind.MOD);
+				expr = new OpModulus(toPos(t), expr, rhExpr);
 			}
 		}
 		return expr;
@@ -239,41 +254,45 @@ private SpelNodeImpl eatPowerIncDecExpression() {
 			SpelNodeImpl rhExpr = eatUnaryExpression();
 			checkRightOperand(t,rhExpr);
 			return new OperatorPower(toPos(t),expr, rhExpr);
-		} else if (expr!=null && peekToken(TokenKind.INC,TokenKind.DEC)) {
+		}
+
+		if (expr!=null && peekToken(TokenKind.INC,TokenKind.DEC)) {
 			Token t = nextToken();//consume INC/DEC
 			if (t.getKind()==TokenKind.INC) {
 				return new OpInc(toPos(t),true,expr);
-			} else {
-				return new OpDec(toPos(t),true,expr);
 			}
+			return new OpDec(toPos(t),true,expr);
 		}
+
 		return expr;
 	}
 
 	// unaryExpression: (PLUS^ | MINUS^ | BANG^ | INC^ | DEC^) unaryExpression | primaryExpression ;
 	private SpelNodeImpl eatUnaryExpression() {
-		if (peekToken(TokenKind.PLUS,TokenKind.MINUS,TokenKind.NOT)) {
+		if (peekToken(TokenKind.PLUS, TokenKind.MINUS, TokenKind.NOT)) {
 			Token t = nextToken();
 			SpelNodeImpl expr = eatUnaryExpression();
-			if (t.kind==TokenKind.NOT) {
-				return new OperatorNot(toPos(t),expr);
-			} else if (t.kind==TokenKind.PLUS) {
-				return new OpPlus(toPos(t),expr);
-			} else {
-				Assert.isTrue(t.kind==TokenKind.MINUS);
-				return new OpMinus(toPos(t),expr);
-			}
-		} else if (peekToken(TokenKind.INC,TokenKind.DEC)) {
+			if (t.kind == TokenKind.NOT) {
+				return new OperatorNot(toPos(t), expr);
+			}
+
+			if (t.kind == TokenKind.PLUS) {
+				return new OpPlus(toPos(t), expr);
+			}
+			Assert.isTrue(t.kind == TokenKind.MINUS);
+			return new OpMinus(toPos(t), expr);
+
+		}
+		if (peekToken(TokenKind.INC, TokenKind.DEC)) {
 			Token t = nextToken();
 			SpelNodeImpl expr = eatUnaryExpression();
-			if (t.getKind()==TokenKind.INC) {
-				return new OpInc(toPos(t),false,expr);
-			} else {
-				return new OpDec(toPos(t),false,expr);
+			if (t.getKind() == TokenKind.INC) {
+				return new OpInc(toPos(t), false, expr);
 			}
-		} else {
-			return eatPrimaryExpression();
+			return new OpDec(toPos(t), false, expr);
 		}
+
+		return eatPrimaryExpression();
 	}
 
 	// primaryExpression : startNode (node)? -> ^(EXPRESSION startNode (node)?);
@@ -284,11 +303,12 @@ private SpelNodeImpl eatPrimaryExpression() {
 		while (maybeEatNode()) {
 			nodes.add(pop());
 		}
-		if (nodes.size()==1) {
+		if (nodes.size() == 1) {
 			return nodes.get(0);
-		} else {
-			return new CompoundExpression(toPos(start.getStartPosition(),nodes.get(nodes.size()-1).getEndPosition()),nodes.toArray(new SpelNodeImpl[nodes.size()]));
 		}
+		return new CompoundExpression(toPos(start.getStartPosition(),
+				nodes.get(nodes.size() - 1).getEndPosition()),
+				nodes.toArray(new SpelNodeImpl[nodes.size()]));
 	}
 
 	// node : ((DOT dottedNode) | (SAFE_NAVI dottedNode) | nonDottedNode)+;
@@ -296,12 +316,15 @@ private boolean maybeEatNode() {
 		SpelNodeImpl expr = null;
 		if (peekToken(TokenKind.DOT,TokenKind.SAFE_NAVI)) {
 			expr = eatDottedNode();
-		} else {
+		}
+		else {
 			expr = maybeEatNonDottedNode();
 		}
+
 		if (expr==null) {
 			return false;
-		} else {
+		}
+		else {
 			push(expr);
 			return true;
 		}
@@ -328,15 +351,19 @@ private SpelNodeImpl maybeEatNonDottedNode() {
 	//	;
 	private SpelNodeImpl eatDottedNode() {
 		Token t = nextToken();// it was a '.' or a '?.'
-		boolean nullSafeNavigation = t.kind==TokenKind.SAFE_NAVI;
-		if (maybeEatMethodOrProperty(nullSafeNavigation) || maybeEatFunctionOrVar() || maybeEatProjection(nullSafeNavigation) || maybeEatSelection(nullSafeNavigation)) {
+		boolean nullSafeNavigation = t.kind == TokenKind.SAFE_NAVI;
+		if (maybeEatMethodOrProperty(nullSafeNavigation) || maybeEatFunctionOrVar()
+				|| maybeEatProjection(nullSafeNavigation)
+				|| maybeEatSelection(nullSafeNavigation)) {
 			return pop();
 		}
-		if (peekToken()==null) {
+		if (peekToken() == null) {
 			// unexpectedly ran out of data
-			raiseInternalException(t.startpos,SpelMessage.OOD);
-		} else {
-			raiseInternalException(t.startpos,SpelMessage.UNEXPECTED_DATA_AFTER_DOT,toString(peekToken()));
+			raiseInternalException(t.startpos, SpelMessage.OOD);
+		}
+		else {
+			raiseInternalException(t.startpos, SpelMessage.UNEXPECTED_DATA_AFTER_DOT,
+					toString(peekToken()));
 		}
 		return null;
 	}
@@ -354,13 +381,15 @@ private boolean maybeEatFunctionOrVar() {
 		Token t = nextToken();
 		Token functionOrVariableName = eatToken(TokenKind.IDENTIFIER);
 		SpelNodeImpl[] args = maybeEatMethodArgs();
-		if (args==null) {
-			push(new VariableReference(functionOrVariableName.data,toPos(t.startpos,functionOrVariableName.endpos)));
-			return true;
-		} else {
-			push(new FunctionReference(functionOrVariableName.data,toPos(t.startpos,functionOrVariableName.endpos),args));
+		if (args == null) {
+			push(new VariableReference(functionOrVariableName.data, toPos(t.startpos,
+					functionOrVariableName.endpos)));
 			return true;
 		}
+
+		push(new FunctionReference(functionOrVariableName.data, toPos(t.startpos,
+				functionOrVariableName.endpos), args));
+		return true;
 	}
 
 	// methodArgs : LPAREN! (argument (COMMA! argument)* (COMMA!)?)? RPAREN!;
@@ -376,7 +405,7 @@ private SpelNodeImpl[] maybeEatMethodArgs() {
 
 	private void eatConstructorArgs(List<SpelNodeImpl> accumulatedArguments) {
 		if (!peekToken(TokenKind.LPAREN)) {
-			throw new InternalParseException(new SpelParseException(expressionString,positionOf(peekToken()),SpelMessage.MISSING_CONSTRUCTOR_ARGS));
+			throw new InternalParseException(new SpelParseException(this.expressionString,positionOf(peekToken()),SpelMessage.MISSING_CONSTRUCTOR_ARGS));
 		}
 		consumeArguments(accumulatedArguments);
 		eatToken(TokenKind.RPAREN);
@@ -391,27 +420,28 @@ private void consumeArguments(List<SpelNodeImpl> accumulatedArguments) {
 		do {
 			nextToken();// consume ( (first time through) or comma (subsequent times)
 			Token t = peekToken();
-			if (t==null) {
-				raiseInternalException(pos,SpelMessage.RUN_OUT_OF_ARGUMENTS);
+			if (t == null) {
+				raiseInternalException(pos, SpelMessage.RUN_OUT_OF_ARGUMENTS);
 			}
-			if (t.kind!=TokenKind.RPAREN) {
+			if (t.kind != TokenKind.RPAREN) {
 				accumulatedArguments.add(eatExpression());
 			}
 			next = peekToken();
-		} while (next!=null && next.kind==TokenKind.COMMA);
-		if (next==null) {
-			raiseInternalException(pos,SpelMessage.RUN_OUT_OF_ARGUMENTS);
+		}
+		while (next != null && next.kind == TokenKind.COMMA);
+
+		if (next == null) {
+			raiseInternalException(pos, SpelMessage.RUN_OUT_OF_ARGUMENTS);
 		}
 	}
 
 	private int positionOf(Token t) {
-		if (t==null) {
+		if (t == null) {
 			// if null assume the problem is because the right token was
 			// not found at the end of the expression
-			return expressionString.length();
-		} else {
-			return t.startpos;
+			return this.expressionString.length();
 		}
+		return t.startpos;
 	}
 
 	//startNode
@@ -428,17 +458,26 @@ private int positionOf(Token t) {
 	private SpelNodeImpl eatStartNode() {
 		if (maybeEatLiteral()) {
 			return pop();
-		} else if (maybeEatParenExpression()) {
+		}
+		else if (maybeEatParenExpression()) {
 			return pop();
-		} else if (maybeEatTypeReference() || maybeEatNullReference() || maybeEatConstructorReference() || maybeEatMethodOrProperty(false) || maybeEatFunctionOrVar()) {
+		}
+		else if (maybeEatTypeReference() || maybeEatNullReference()
+				|| maybeEatConstructorReference() || maybeEatMethodOrProperty(false)
+				|| maybeEatFunctionOrVar()) {
 			return pop();
-		} else if (maybeEatBeanReference()) {
+		}
+		else if (maybeEatBeanReference()) {
 			return pop();
-		} else if (maybeEatProjection(false) || maybeEatSelection(false) || maybeEatIndexer()) {
+		}
+		else if (maybeEatProjection(false) || maybeEatSelection(false)
+				|| maybeEatIndexer()) {
 			return pop();
-		} else if (maybeEatInlineList()) {
+		}
+		else if (maybeEatInlineList()) {
 			return pop();
-		} else {
+		}
+		else {
 			return null;
 		}
 	}
@@ -453,16 +492,19 @@ private boolean maybeEatBeanReference() {
 			if (peekToken(TokenKind.IDENTIFIER)) {
 				beanNameToken = eatToken(TokenKind.IDENTIFIER);
 				beanname = beanNameToken.data;
-			} else if (peekToken(TokenKind.LITERAL_STRING)) {
+			}
+			else if (peekToken(TokenKind.LITERAL_STRING)) {
 				beanNameToken = eatToken(TokenKind.LITERAL_STRING);
 				beanname = beanNameToken.stringValue();
 				beanname = beanname.substring(1, beanname.length() - 1);
-			} else {
-				raiseInternalException(beanRefToken.startpos,SpelMessage.INVALID_BEAN_REFERENCE);
+			}
+			else {
+				raiseInternalException(beanRefToken.startpos,
+						SpelMessage.INVALID_BEAN_REFERENCE);
 			}
 
 			BeanReference beanReference = new BeanReference(toPos(beanNameToken),beanname);
-			constructedNodes.push(beanReference);
+			this.constructedNodes.push(beanReference);
 			return true;
 		}
 		return false;
@@ -485,7 +527,7 @@ private boolean maybeEatTypeReference() {
 				dims++;
 			}
 			eatToken(TokenKind.RPAREN);
-			constructedNodes.push(new TypeReference(toPos(typeName),node,dims));
+			this.constructedNodes.push(new TypeReference(toPos(typeName),node,dims));
 			return true;
 		}
 		return false;
@@ -498,7 +540,7 @@ private boolean maybeEatNullReference() {
 				return false;
 			}
 			nextToken();
-			constructedNodes.push(new NullLiteral(toPos(nullToken)));
+			this.constructedNodes.push(new NullLiteral(toPos(nullToken)));
 			return true;
 		}
 		return false;
@@ -507,46 +549,49 @@ private boolean maybeEatNullReference() {
 	//projection: PROJECT^ expression RCURLY!;
 	private boolean maybeEatProjection(boolean nullSafeNavigation) {
 		Token t = peekToken();
-		if (!peekToken(TokenKind.PROJECT,true)) {
+		if (!peekToken(TokenKind.PROJECT, true)) {
 			return false;
 		}
 		SpelNodeImpl expr = eatExpression();
 		eatToken(TokenKind.RSQUARE);
-		constructedNodes.push(new Projection(nullSafeNavigation, toPos(t), expr));
+		this.constructedNodes.push(new Projection(nullSafeNavigation, toPos(t), expr));
 		return true;
 	}
 
 	// list = LCURLY (element (COMMA element)*) RCURLY
 	private boolean maybeEatInlineList() {
 		Token t = peekToken();
-		if (!peekToken(TokenKind.LCURLY,true)) {
+		if (!peekToken(TokenKind.LCURLY, true)) {
 			return false;
 		}
 		SpelNodeImpl expr = null;
 		Token closingCurly = peekToken();
-		if (peekToken(TokenKind.RCURLY,true)) {
+		if (peekToken(TokenKind.RCURLY, true)) {
 			// empty list '[]'
 			expr = new InlineList(toPos(t.startpos,closingCurly.endpos));
-		} else {
+		}
+		else {
 			List<SpelNodeImpl> listElements = new ArrayList<SpelNodeImpl>();
 			do {
 				listElements.add(eatExpression());
-			} while (peekToken(TokenKind.COMMA,true));
+			}
+			while (peekToken(TokenKind.COMMA,true));
+
 			closingCurly = eatToken(TokenKind.RCURLY);
 			expr = new InlineList(toPos(t.startpos,closingCurly.endpos),listElements.toArray(new SpelNodeImpl[listElements.size()]));
 		}
-		constructedNodes.push(expr);
+		this.constructedNodes.push(expr);
 		return true;
 	}
 
 	private boolean maybeEatIndexer() {
 		Token t = peekToken();
-		if (!peekToken(TokenKind.LSQUARE,true)) {
+		if (!peekToken(TokenKind.LSQUARE, true)) {
 			return false;
 		}
 		SpelNodeImpl expr = eatExpression();
 		eatToken(TokenKind.RSQUARE);
-		constructedNodes.push(new Indexer(toPos(t),expr));
+		this.constructedNodes.push(new Indexer(toPos(t),expr));
 		return true;
 	}
 
@@ -557,16 +602,18 @@ private boolean maybeEatSelection(boolean nullSafeNavigation) {
 		}
 		nextToken();
 		SpelNodeImpl expr = eatExpression();
-		if(expr == null) {
+		if (expr == null) {
 			raiseInternalException(toPos(t), SpelMessage.MISSING_SELECTION_EXPRESSION);
 		}
 		eatToken(TokenKind.RSQUARE);
-		if (t.kind==TokenKind.SELECT_FIRST) {
-			constructedNodes.push(new Selection(nullSafeNavigation,Selection.FIRST,toPos(t),expr));
-		} else if (t.kind==TokenKind.SELECT_LAST) {
-			constructedNodes.push(new Selection(nullSafeNavigation,Selection.LAST,toPos(t),expr));
-		} else {
-			constructedNodes.push(new Selection(nullSafeNavigation,Selection.ALL,toPos(t),expr));
+		if (t.kind == TokenKind.SELECT_FIRST) {
+			this.constructedNodes.push(new Selection(nullSafeNavigation, Selection.FIRST, toPos(t), expr));
+		}
+		else if (t.kind == TokenKind.SELECT_LAST) {
+			this.constructedNodes.push(new Selection(nullSafeNavigation, Selection.LAST, toPos(t), expr));
+		}
+		else {
+			this.constructedNodes.push(new Selection(nullSafeNavigation, Selection.ALL, toPos(t), expr));
 		}
 		return true;
 	}
@@ -580,14 +627,14 @@ private SpelNodeImpl eatPossiblyQualifiedId() {
 		Token node = peekToken();
 		while (isValidQualifiedId(node)) {
 			nextToken();
-			if(node.kind != TokenKind.DOT) {
+			if (node.kind != TokenKind.DOT) {
 				qualifiedIdPieces.add(new Identifier(node.stringValue(),toPos(node)));
 			}
 			node = peekToken();
 		}
-		if(qualifiedIdPieces.isEmpty()) {
-			if(node == null) {
-				raiseInternalException( expressionString.length(), SpelMessage.OOD);
+		if (qualifiedIdPieces.isEmpty()) {
+			if (node == null) {
+				raiseInternalException( this.expressionString.length(), SpelMessage.OOD);
 			}
 			raiseInternalException(node.startpos, SpelMessage.NOT_EXPECTED_TOKEN,
 					"qualified ID", node.getKind().toString().toLowerCase());
@@ -597,10 +644,10 @@ private SpelNodeImpl eatPossiblyQualifiedId() {
 	}
 
 	private boolean isValidQualifiedId(Token node) {
-		if(node == null || node.kind == TokenKind.LITERAL_STRING) {
+		if (node == null || node.kind == TokenKind.LITERAL_STRING) {
 			return false;
 		}
-		if(node.kind == TokenKind.DOT || node.kind == TokenKind.IDENTIFIER) {
+		if (node.kind == TokenKind.DOT || node.kind == TokenKind.IDENTIFIER) {
 			return true;
 		}
 		String value = node.stringValue();
@@ -617,19 +664,17 @@ private boolean maybeEatMethodOrProperty(boolean nullSafeNavigation) {
 				// property
 				push(new PropertyOrFieldReference(nullSafeNavigation, methodOrPropertyName.data,toPos(methodOrPropertyName)));
 				return true;
-			} else {
-				// methodreference
-				push(new MethodReference(nullSafeNavigation, methodOrPropertyName.data,toPos(methodOrPropertyName),args));
-				// TODO what is the end position for a method reference? the name or the last arg?
-				return true;
 			}
+			// methodreference
+			push(new MethodReference(nullSafeNavigation, methodOrPropertyName.data,toPos(methodOrPropertyName),args));
+			// TODO what is the end position for a method reference? the name or the last arg?
+			return true;
 		}
 		return false;
-
 	}
 
 	//constructor
-    //:	('new' qualifiedId LPAREN) => 'new' qualifiedId ctorArgs -> ^(CONSTRUCTOR qualifiedId ctorArgs)
+	//:	('new' qualifiedId LPAREN) => 'new' qualifiedId ctorArgs -> ^(CONSTRUCTOR qualifiedId ctorArgs)
 	private boolean maybeEatConstructorReference() {
 		if (peekIdentifierToken("new")) {
 			Token newToken = nextToken();
@@ -642,7 +687,8 @@ private boolean maybeEatConstructorReference() {
 				while (peekToken(TokenKind.LSQUARE,true)) {
 					if (!peekToken(TokenKind.RSQUARE)) {
 						dimensions.add(eatExpression());
-					} else {
+					}
+					else {
 						dimensions.add(null);
 					}
 					eatToken(TokenKind.RSQUARE);
@@ -652,11 +698,13 @@ private boolean maybeEatConstructorReference() {
 				}
 				push(new ConstructorReference(toPos(newToken), dimensions.toArray(new SpelNodeImpl[dimensions.size()]),
 						nodes.toArray(new SpelNodeImpl[nodes.size()])));
-			} else {
+			}
+			else {
 				// regular constructor invocation
 				eatConstructorArgs(nodes);
 				// TODO correct end position?
-				push(new ConstructorReference(toPos(newToken), nodes.toArray(new SpelNodeImpl[nodes.size()])));
+				push(new ConstructorReference(toPos(newToken),
+						nodes.toArray(new SpelNodeImpl[nodes.size()])));
 			}
 			return true;
 		}
@@ -664,11 +712,11 @@ private boolean maybeEatConstructorReference() {
 	}
 
 	private void push(SpelNodeImpl newNode) {
-		constructedNodes.push(newNode);
+		this.constructedNodes.push(newNode);
 	}
 
 	private SpelNodeImpl pop() {
-		return constructedNodes.pop();
+		return this.constructedNodes.pop();
 	}
 
 	//	literal
@@ -684,25 +732,34 @@ private boolean maybeEatLiteral() {
 		if (t==null) {
 			return false;
 		}
-		if (t.kind==TokenKind.LITERAL_INT) {
+		if (t.kind == TokenKind.LITERAL_INT) {
 			push(Literal.getIntLiteral(t.data, toPos(t), 10));
-		} else if (t.kind==TokenKind.LITERAL_LONG) {
+		}
+		else if (t.kind == TokenKind.LITERAL_LONG) {
 			push(Literal.getLongLiteral(t.data, toPos(t), 10));
-		} else if (t.kind==TokenKind.LITERAL_HEXINT) {
+		}
+		else if (t.kind == TokenKind.LITERAL_HEXINT) {
 			push(Literal.getIntLiteral(t.data, toPos(t), 16));
-		} else if (t.kind==TokenKind.LITERAL_HEXLONG) {
+		}
+		else if (t.kind == TokenKind.LITERAL_HEXLONG) {
 			push(Literal.getLongLiteral(t.data, toPos(t), 16));
-		} else if (t.kind==TokenKind.LITERAL_REAL) {
-			push(Literal.getRealLiteral(t.data, toPos(t),false));
-		} else if (t.kind==TokenKind.LITERAL_REAL_FLOAT) {
+		}
+		else if (t.kind == TokenKind.LITERAL_REAL) {
+			push(Literal.getRealLiteral(t.data, toPos(t), false));
+		}
+		else if (t.kind == TokenKind.LITERAL_REAL_FLOAT) {
 			push(Literal.getRealLiteral(t.data, toPos(t), true));
-		} else if (peekIdentifierToken("true")) {
-			push(new BooleanLiteral(t.data,toPos(t),true));
-		} else if (peekIdentifierToken("false")) {
-			push(new BooleanLiteral(t.data,toPos(t),false));
-		} else if (t.kind==TokenKind.LITERAL_STRING) {
-			push(new StringLiteral(t.data,toPos(t),t.data));
-		} else {
+		}
+		else if (peekIdentifierToken("true")) {
+			push(new BooleanLiteral(t.data, toPos(t), true));
+		}
+		else if (peekIdentifierToken("false")) {
+			push(new BooleanLiteral(t.data, toPos(t), false));
+		}
+		else if (t.kind == TokenKind.LITERAL_STRING) {
+			push(new StringLiteral(t.data, toPos(t), t.data));
+		}
+		else {
 			return false;
 		}
 		nextToken();
@@ -717,7 +774,8 @@ private boolean maybeEatParenExpression() {
 			eatToken(TokenKind.RPAREN);
 			push(expr);
 			return true;
-		} else {
+		}
+		else {
 			return false;
 		}
 	}
@@ -727,7 +785,7 @@ private boolean maybeEatParenExpression() {
 	// | GREATER_THAN_OR_EQUAL | INSTANCEOF | BETWEEN | MATCHES
 	private Token maybeEatRelationalOperator() {
 		Token t = peekToken();
-		if (t==null) {
+		if (t == null) {
 			return null;
 		}
 		if (t.isNumericRelationalOperator()) {
@@ -737,9 +795,11 @@ private Token maybeEatRelationalOperator() {
 			String idString = t.stringValue();
 			if (idString.equalsIgnoreCase("instanceof")) {
 				return t.asInstanceOfToken();
-			} else if (idString.equalsIgnoreCase("matches")) {
+			}
+			if (idString.equalsIgnoreCase("matches")) {
 				return t.asMatchesToken();
-			} else if (idString.equalsIgnoreCase("between")) {
+			}
+			if (idString.equalsIgnoreCase("between")) {
 				return t.asBetweenToken();
 			}
 		}
@@ -748,10 +808,10 @@ private Token maybeEatRelationalOperator() {
 
 	private Token eatToken(TokenKind expectedKind) {
 		Token t = nextToken();
-		if (t==null) {
-			raiseInternalException( expressionString.length(), SpelMessage.OOD);
+		if (t == null) {
+			raiseInternalException( this.expressionString.length(), SpelMessage.OOD);
 		}
-		if (t.kind!=expectedKind) {
+		if (t.kind != expectedKind) {
 			raiseInternalException(t.startpos,SpelMessage.NOT_EXPECTED_TOKEN, expectedKind.toString().toLowerCase(),t.getKind().toString().toLowerCase());
 		}
 		return t;
@@ -766,34 +826,38 @@ private boolean peekToken(TokenKind desiredTokenKind, boolean consumeIfMatched)
 			return false;
 		}
 		Token t = peekToken();
-		if (t.kind==desiredTokenKind) {
+		if (t.kind == desiredTokenKind) {
 			if (consumeIfMatched) {
-				tokenStreamPointer++;
+				this.tokenStreamPointer++;
 			}
 			return true;
-		} else {
-			if (desiredTokenKind == TokenKind.IDENTIFIER) {
-				// might be one of the textual forms of the operators (e.g. NE for != ) - in which case we can treat it as an identifier
-				// The list is represented here: Tokenizer.alternativeOperatorNames and those ones are in order in the TokenKind enum
-				if (t.kind.ordinal()>=TokenKind.DIV.ordinal() && t.kind.ordinal()<=TokenKind.NOT.ordinal() && t.data!=null) {
-					// if t.data were null, we'd know it wasn't the textual form, it was the symbol form
-					return true;
-				}
+		}
+
+		if (desiredTokenKind == TokenKind.IDENTIFIER) {
+			// might be one of the textual forms of the operators (e.g. NE for != ) - in which case we can treat it as an identifier
+			// The list is represented here: Tokenizer.alternativeOperatorNames and those ones are in order in the TokenKind enum
+			if (t.kind.ordinal() >= TokenKind.DIV.ordinal() && t.kind.ordinal() <= TokenKind.NOT.ordinal() && t.data != null) {
+				// if t.data were null, we'd know it wasn't the textual form, it was the symbol form
+				return true;
 			}
-			return false;
 		}
+		return false;
 	}
 
 	private boolean peekToken(TokenKind possible1,TokenKind possible2) {
-		if (!moreTokens()) return false;
+		if (!moreTokens()) {
+			return false;
+		}
 		Token t = peekToken();
-		return t.kind==possible1 || t.kind==possible2;
+		return (t.kind == possible1 || t.kind == possible2);
 	}
 
 	private boolean peekToken(TokenKind possible1,TokenKind possible2, TokenKind possible3) {
-		if (!moreTokens()) return false;
+		if (!moreTokens()) {
+			return false;
+		}
 		Token t = peekToken();
-		return t.kind==possible1 || t.kind==possible2 || t.kind==possible3;
+		return t.kind == possible1 || t.kind == possible2 || t.kind == possible3;
 	}
 
 	private boolean peekIdentifierToken(String identifierString) {
@@ -805,39 +869,42 @@ private boolean peekIdentifierToken(String identifierString) {
 	}
 
 	private boolean peekSelectToken() {
-		if (!moreTokens()) return false;
+		if (!moreTokens()) {
+			return false;
+		}
 		Token t = peekToken();
-		return t.kind==TokenKind.SELECT || t.kind==TokenKind.SELECT_FIRST || t.kind==TokenKind.SELECT_LAST;
+		return t.kind == TokenKind.SELECT || t.kind == TokenKind.SELECT_FIRST
+				|| t.kind == TokenKind.SELECT_LAST;
 	}
 
 	private boolean moreTokens() {
-		return tokenStreamPointer<tokenStream.size();
+		return this.tokenStreamPointer<this.tokenStream.size();
 	}
 
 	private Token nextToken() {
-		if (tokenStreamPointer>=tokenStreamLength) {
+		if (this.tokenStreamPointer >= this.tokenStreamLength) {
 			return null;
 		}
-		return tokenStream.get(tokenStreamPointer++);
+		return this.tokenStream.get(this.tokenStreamPointer++);
 	}
 
 	private Token peekToken() {
-		if (tokenStreamPointer>=tokenStreamLength) {
+		if (this.tokenStreamPointer >= this.tokenStreamLength) {
 			return null;
 		}
-		return tokenStream.get(tokenStreamPointer);
+		return this.tokenStream.get(this.tokenStreamPointer);
 	}
 
-	private void raiseInternalException(int pos, SpelMessage message,Object... inserts) {
-		throw new InternalParseException(new SpelParseException(expressionString,pos,message,inserts));
+	private void raiseInternalException(int pos, SpelMessage message, Object... inserts) {
+		throw new InternalParseException(new SpelParseException(this.expressionString,
+				pos, message, inserts));
 	}
 
 	public String toString(Token t) {
 		if (t.getKind().hasPayload()) {
 			return t.stringValue();
-		} else {
-			return t.kind.toString().toLowerCase();
 		}
+		return t.kind.toString().toLowerCase();
 	}
 
 	private void checkOperands(Token token, SpelNodeImpl left, SpelNodeImpl right) {
@@ -858,14 +925,14 @@ private void checkRightOperand(Token token, SpelNodeImpl operandExpression) {
 	}
 
 	/**
-	 * Compress the start and end of a token into a single int
+	 * Compress the start and end of a token into a single int.
 	 */
 	private int toPos(Token t) {
-		return (t.startpos<<16)+t.endpos;
+		return (t.startpos<<16) + t.endpos;
 	}
 
 	private int toPos(int start,int end) {
-		return (start<<16)+end;
+		return (start<<16) + end;
 	}
 
 }
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
index 2e6ff92d73..932af80e54 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,13 +42,14 @@
 public class ReflectionHelper {
 
 	/**
-	 * Compare argument arrays and return information about whether they match. A supplied type converter
-	 * and conversionAllowed flag allow for matches to take into account that a type may be transformed
-	 * into a different type by the converter.
-	 * @param expectedArgTypes the array of types the method/constructor is expecting
-	 * @param suppliedArgTypes the array of types that are being supplied at the point of invocation
+	 * Compare argument arrays and return information about whether they match.
+	 * A supplied type converter and conversionAllowed flag allow for matches to take
+	 * into account that a type may be transformed into a different type by the converter.
+	 * @param expectedArgTypes the types the method/constructor is expecting
+	 * @param suppliedArgTypes the types that are being supplied at the point of invocation
 	 * @param typeConverter a registered type converter
-	 * @return a MatchInfo object indicating what kind of match it was or null if it was not a match
+	 * @return a MatchInfo object indicating what kind of match it was,
+	 * or {@code null} if it was not a match
 	 */
 	static ArgumentsMatchInfo compareArguments(
 			List<TypeDescriptor> expectedArgTypes, List<TypeDescriptor> suppliedArgTypes, TypeConverter typeConverter) {
@@ -109,25 +110,25 @@ else if (typeConverter.canConvert(suppliedArg, expectedArg)) {
 	 */
 	public static int getTypeDifferenceWeight(List<TypeDescriptor> paramTypes, List<TypeDescriptor> argTypes) {
 		int result = 0;
-		for (int i = 0,max=paramTypes.size(); i < max; i++) {
-			TypeDescriptor argType = argTypes.get(i);
+		for (int i = 0; i < paramTypes.size(); i++) {
 			TypeDescriptor paramType = paramTypes.get(i);
+			TypeDescriptor argType = (i < argTypes.size() ? argTypes.get(i) : null);
 			if (argType == null) {
 				if (paramType.isPrimitive()) {
 					return Integer.MAX_VALUE;
 				}
 			}
-			if (!ClassUtils.isAssignable(paramType.getClass(), argType.getClass())) {
-				return Integer.MAX_VALUE;
-			}
-			if (argType != null) {
-				Class paramTypeClazz = paramType.getType();
+			else {
+				Class<?> paramTypeClazz = paramType.getType();
+				if (!ClassUtils.isAssignable(paramTypeClazz, argType.getType())) {
+					return Integer.MAX_VALUE;
+				}
 				if (paramTypeClazz.isPrimitive()) {
 					paramTypeClazz = Object.class;
 				}
-				Class superClass = argType.getClass().getSuperclass();
+				Class<?> superClass = argType.getType().getSuperclass();
 				while (superClass != null) {
-					if (paramType.equals(superClass)) {
+					if (paramTypeClazz.equals(superClass)) {
 						result = result + 2;
 						superClass = null;
 					}
@@ -148,13 +149,15 @@ else if (ClassUtils.isAssignable(paramTypeClazz, superClass)) {
 	}
 
 	/**
-	 * Compare argument arrays and return information about whether they match. A supplied type converter and
-	 * conversionAllowed flag allow for matches to take into account that a type may be transformed into a different
-	 * type by the converter. This variant of compareArguments also allows for a varargs match.
-	 * @param expectedArgTypes the array of types the method/constructor is expecting
-	 * @param suppliedArgTypes the array of types that are being supplied at the point of invocation
+	 * Compare argument arrays and return information about whether they match.
+	 * A supplied type converter and conversionAllowed flag allow for matches to
+	 * take into account that a type may be transformed into a different type by the
+	 * converter. This variant of compareArguments also allows for a varargs match.
+	 * @param expectedArgTypes the types the method/constructor is expecting
+	 * @param suppliedArgTypes the types that are being supplied at the point of invocation
 	 * @param typeConverter a registered type converter
-	 * @return a MatchInfo object indicating what kind of match it was or null if it was not a match
+	 * @return a MatchInfo object indicating what kind of match it was,
+	 * or {@code null} if it was not a match
 	 */
 	static ArgumentsMatchInfo compareArgumentsVarargs(
 			List<TypeDescriptor> expectedArgTypes, List<TypeDescriptor> suppliedArgTypes, TypeConverter typeConverter) {
@@ -199,6 +202,7 @@ else if (typeConverter.canConvert(suppliedArg, expectedArg)) {
 				}
 			}
 		}
+
 		// If already confirmed it cannot be a match, then return
 		if (match == null) {
 			return null;
@@ -211,25 +215,26 @@ else if (typeConverter.canConvert(suppliedArg, expectedArg)) {
 			// expected argument - that is a match, the caller has already built the array. Proceed with it.
 		}
 		else {
-			// Now... we have the final argument in the method we are checking as a match and we have 0 or more other
-			// arguments left to pass to it.
-			Class varargsParameterType = expectedArgTypes.get(expectedArgTypes.size() - 1).getElementTypeDescriptor().getType();
+			// Now... we have the final argument in the method we are checking as a match and we have 0
+			// or more other arguments left to pass to it.
+			Class<?> varargsParamType = expectedArgTypes.get(expectedArgTypes.size() - 1).getElementTypeDescriptor().getType();
 
-			// All remaining parameters must be of this type or convertable to this type
+			// All remaining parameters must be of this type or convertible to this type
 			for (int i = expectedArgTypes.size() - 1; i < suppliedArgTypes.size(); i++) {
 				TypeDescriptor suppliedArg = suppliedArgTypes.get(i);
 				if (suppliedArg == null) {
-					if (varargsParameterType.isPrimitive()) {
+					if (varargsParamType.isPrimitive()) {
 						match = null;
 					}
-				} else {
-					if (varargsParameterType != suppliedArg.getType()) {
-						if (ClassUtils.isAssignable(varargsParameterType, suppliedArg.getType())) {
+				}
+				else {
+					if (varargsParamType != suppliedArg.getType()) {
+						if (ClassUtils.isAssignable(varargsParamType, suppliedArg.getType())) {
 							if (match != ArgsMatchKind.REQUIRES_CONVERSION) {
 								match = ArgsMatchKind.CLOSE;
 							}
 						}
-						else if (typeConverter.canConvert(suppliedArg, TypeDescriptor.valueOf(varargsParameterType))) {
+						else if (typeConverter.canConvert(suppliedArg, TypeDescriptor.valueOf(varargsParamType))) {
 							if (argsRequiringConversion == null) {
 								argsRequiringConversion = new ArrayList<Integer>();
 							}
@@ -262,25 +267,29 @@ else if (typeConverter.canConvert(suppliedArg, TypeDescriptor.valueOf(varargsPar
 	}
 
 	/**
-	 * Takes an input set of argument values and, following the positions specified in the int array,
-	 * it converts them to the types specified as the required parameter types. The arguments are
-	 * converted 'in-place' in the input array.
+	 * Takes an input set of argument values and converts them to the types specified as the
+	 * required parameter types. The arguments are converted 'in-place' in the input array.
 	 * @param converter the type converter to use for attempting conversions
 	 * @param arguments the actual arguments that need conversion
 	 * @param methodOrCtor the target Method or Constructor
-	 * @param argumentsRequiringConversion details which of the input arguments for sure need conversion
+	 * @param argumentsRequiringConversion details which of the input arguments need conversion
 	 * @param varargsPosition the known position of the varargs argument, if any
+	 * ({@code null} if not varargs)
+	 * @return {@code true} if some kind of conversion occurred on an argument
 	 * @throws EvaluationException if a problem occurs during conversion
 	 */
 	static void convertArguments(TypeConverter converter, Object[] arguments, Object methodOrCtor,
 			int[] argumentsRequiringConversion, Integer varargsPosition) throws EvaluationException {
+
 		if (varargsPosition == null) {
 			for (int i = 0; i < arguments.length; i++) {
 				TypeDescriptor targetType = new TypeDescriptor(MethodParameter.forMethodOrConstructor(methodOrCtor, i));
 				Object argument = arguments[i];
 				arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType);
 			}
-		} else {
+		}
+		else {
+			// Convert everything up to the varargs position
 			for (int i = 0; i < varargsPosition; i++) {
 				TypeDescriptor targetType = new TypeDescriptor(MethodParameter.forMethodOrConstructor(methodOrCtor, i));
 				Object argument = arguments[i];
@@ -288,10 +297,13 @@ static void convertArguments(TypeConverter converter, Object[] arguments, Object
 			}
 			MethodParameter methodParam = MethodParameter.forMethodOrConstructor(methodOrCtor, varargsPosition);
 			if (varargsPosition == arguments.length - 1) {
+				// If the target is varargs and there is just one more argument then convert it here
 				TypeDescriptor targetType = new TypeDescriptor(methodParam);
 				Object argument = arguments[varargsPosition];
 				arguments[varargsPosition] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType);
-			} else {
+			}
+			else {
+				// Convert remaining arguments to the varargs element type
 				TypeDescriptor targetType = TypeDescriptor.nested(methodParam, 1);
 				for (int i = varargsPosition; i < arguments.length; i++) {
 					Object argument = arguments[i];
@@ -302,39 +314,44 @@ static void convertArguments(TypeConverter converter, Object[] arguments, Object
 	}
 
 	/**
-	 * Convert a supplied set of arguments into the requested types. If the parameterTypes are related to
-	 * a varargs method then the final entry in the parameterTypes array is going to be an array itself whose
-	 * component type should be used as the conversion target for extraneous arguments. (For example, if the
-	 * parameterTypes are {Integer, String[]} and the input arguments are {Integer, boolean, float} then both
-	 * the boolean and float must be converted to strings). This method does not repackage the arguments
-	 * into a form suitable for the varargs invocation
+	 * Convert a supplied set of arguments into the requested types.
+	 * If the parameterTypes are related to a varargs method, then the final entry
+	 * in the parameterTypes array is going to be an array itself whose component type
+	 * should be used as the conversion target for extraneous arguments. (For example,
+	 * if the parameterTypes are {@code {Integer, String[]}} and the input arguments
+	 * are {@code {Integer, boolean, float}} then both the boolean and float must be
+	 * converted to Strings). This method does not repackage the arguments into a
+	 * form suitable for the varargs invocation.
 	 * @param converter the converter to use for type conversions
 	 * @param arguments the arguments to convert to the requested parameter types
 	 * @param method the target Method
 	 * @throws SpelEvaluationException if there is a problem with conversion
 	 */
-	public static void convertAllArguments(TypeConverter converter, Object[] arguments, Method method) throws SpelEvaluationException {
+	public static void convertAllArguments(TypeConverter converter, Object[] arguments, Method method)
+			throws SpelEvaluationException {
+
 		Integer varargsPosition = null;
 		if (method.isVarArgs()) {
-			Class[] paramTypes = method.getParameterTypes();
+			Class<?>[] paramTypes = method.getParameterTypes();
 			varargsPosition = paramTypes.length - 1;
 		}
-		for (int argPosition = 0; argPosition < arguments.length; argPosition++) {
+		for (int argPos = 0; argPos < arguments.length; argPos++) {
 			TypeDescriptor targetType;
-			if (varargsPosition != null && argPosition >= varargsPosition) {
+			if (varargsPosition != null && argPos >= varargsPosition) {
 				MethodParameter methodParam = new MethodParameter(method, varargsPosition);
 				targetType = TypeDescriptor.nested(methodParam, 1);
 			}
 			else {
-				targetType = new TypeDescriptor(new MethodParameter(method, argPosition));
+				targetType = new TypeDescriptor(new MethodParameter(method, argPos));
 			}
 			try {
-				Object argument = arguments[argPosition];
+				Object argument = arguments[argPos];
 				if (argument != null && !targetType.getObjectType().isInstance(argument)) {
 					if (converter == null) {
-						throw new SpelEvaluationException(SpelMessage.TYPE_CONVERSION_ERROR, argument.getClass().getName(), targetType);
+						throw new SpelEvaluationException(
+								SpelMessage.TYPE_CONVERSION_ERROR, argument.getClass().getName(), targetType);
 					}
-					arguments[argPosition] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType);
+					arguments[argPos] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType);
 				}
 			}
 			catch (EvaluationException ex) {
@@ -343,122 +360,81 @@ public static void convertAllArguments(TypeConverter converter, Object[] argumen
 					throw (SpelEvaluationException)ex;
 				}
 				else {
-					throw new SpelEvaluationException(ex, SpelMessage.TYPE_CONVERSION_ERROR,arguments[argPosition].getClass().getName(), targetType);
+					throw new SpelEvaluationException(ex,
+							SpelMessage.TYPE_CONVERSION_ERROR,arguments[argPos].getClass().getName(), targetType);
 				}
 			}
 		}
 	}
 
 	/**
-	 * Package up the arguments so that they correctly match what is expected in parameterTypes. For example, if
-	 * parameterTypes is (int, String[]) because the second parameter was declared String... then if arguments is
-	 * [1,"a","b"] then it must be repackaged as [1,new String[]{"a","b"}] in order to match the expected
-	 * parameterTypes.
+	 * Package up the arguments so that they correctly match what is expected in parameterTypes.
+	 * For example, if parameterTypes is {@code (int, String[])} because the second parameter
+	 * was declared {@code String...}, then if arguments is {@code [1,"a","b"]} then it must be
+	 * repackaged as {@code [1,new String[]{"a","b"}]} in order to match the expected types.
 	 * @param requiredParameterTypes the types of the parameters for the invocation
 	 * @param args the arguments to be setup ready for the invocation
 	 * @return a repackaged array of arguments where any varargs setup has been done
 	 */
-	public static Object[] setupArgumentsForVarargsInvocation(Class[] requiredParameterTypes, Object... args) {
+	public static Object[] setupArgumentsForVarargsInvocation(Class<?>[] requiredParameterTypes, Object... args) {
 		// Check if array already built for final argument
 		int parameterCount = requiredParameterTypes.length;
 		int argumentCount = args.length;
 
-		// Check if repackaging is needed:
+		// Check if repackaging is needed...
 		if (parameterCount != args.length ||
 				requiredParameterTypes[parameterCount - 1] !=
-						(args[argumentCount - 1] == null ? null : args[argumentCount - 1].getClass())) {
-			int arraySize = 0; // zero size array if nothing to pass as the varargs parameter
+						(args[argumentCount - 1] != null ? args[argumentCount - 1].getClass() : null)) {
+
+			int arraySize = 0;  // zero size array if nothing to pass as the varargs parameter
 			if (argumentCount >= parameterCount) {
 				arraySize = argumentCount - (parameterCount - 1);
 			}
 
 			// Create an array for the varargs arguments
 			Object[] newArgs = new Object[parameterCount];
-			for (int i = 0; i < newArgs.length - 1; i++) {
-				newArgs[i] = args[i];
-			}
-			// Now sort out the final argument, which is the varargs one.  Before entering this
-			// method the arguments should have been converted to the box form of the required type.
-			Class<?> componentType = requiredParameterTypes[parameterCount-1].getComponentType();
-			if (componentType.isPrimitive()) {
-				if (componentType==Integer.TYPE) {
-					int[] repackagedArguments = (int[]) Array.newInstance(componentType, arraySize);
-					for (int i = 0; i < arraySize; i++) {
-						repackagedArguments[i] = ((Integer)args[parameterCount + i - 1]).intValue();
-					}
-					newArgs[newArgs.length - 1] = repackagedArguments;
-				} else if(componentType==Float.TYPE) {
-					float[] repackagedArguments = (float[]) Array.newInstance(componentType, arraySize);
-					for (int i = 0; i < arraySize; i++) {
-						repackagedArguments[i] = ((Float)args[parameterCount + i - 1]).floatValue();
-					}
-					newArgs[newArgs.length - 1] = repackagedArguments;
-				} else if(componentType==Double.TYPE) {
-					double[] repackagedArguments = (double[]) Array.newInstance(componentType, arraySize);
-					for (int i = 0; i < arraySize; i++) {
-						repackagedArguments[i] = ((Double)args[parameterCount + i - 1]).doubleValue();
-					}
-					newArgs[newArgs.length - 1] = repackagedArguments;
-				} else if(componentType==Short.TYPE) {
-					short[] repackagedArguments = (short[]) Array.newInstance(componentType, arraySize);
-					for (int i = 0; i < arraySize; i++) {
-						repackagedArguments[i] = ((Short)args[parameterCount + i - 1]).shortValue();
-					}
-					newArgs[newArgs.length - 1] = repackagedArguments;
-				} else if(componentType==Character.TYPE) {
-					char[] repackagedArguments = (char[]) Array.newInstance(componentType, arraySize);
-					for (int i = 0; i < arraySize; i++) {
-						repackagedArguments[i] = ((Character)args[parameterCount + i - 1]).charValue();
-					}
-					newArgs[newArgs.length - 1] = repackagedArguments;
-				} else if(componentType==Byte.TYPE) {
-					byte[] repackagedArguments = (byte[]) Array.newInstance(componentType, arraySize);
-					for (int i = 0; i < arraySize; i++) {
-						repackagedArguments[i] = ((Byte)args[parameterCount + i - 1]).byteValue();
-					}
-					newArgs[newArgs.length - 1] = repackagedArguments;
-				} else if(componentType==Boolean.TYPE) {
-					boolean[] repackagedArguments = (boolean[]) Array.newInstance(componentType, arraySize);
-					for (int i = 0; i < arraySize; i++) {
-						repackagedArguments[i] = ((Boolean)args[parameterCount + i - 1]).booleanValue();
-					}
-					newArgs[newArgs.length - 1] = repackagedArguments;
-				} else if(componentType==Long.TYPE) {
-					long[] repackagedArguments = (long[]) Array.newInstance(componentType, arraySize);
-					for (int i = 0; i < arraySize; i++) {
-						repackagedArguments[i] = ((Long)args[parameterCount + i - 1]).longValue();
-					}
-					newArgs[newArgs.length - 1] = repackagedArguments;
-				}
-			} else {
-			  Object[] repackagedArguments = (Object[]) Array.newInstance(componentType, arraySize);
-				// Copy all but the varargs arguments
-				for (int i = 0; i < arraySize; i++) {
-					repackagedArguments[i] = args[parameterCount + i - 1];
-				}
-				newArgs[newArgs.length - 1] = repackagedArguments;
+			System.arraycopy(args, 0, newArgs, 0, newArgs.length - 1);
+
+			// Now sort out the final argument, which is the varargs one. Before entering this method,
+			// the arguments should have been converted to the box form of the required type.
+			Class<?> componentType = requiredParameterTypes[parameterCount - 1].getComponentType();
+			Object repackagedArgs = Array.newInstance(componentType, arraySize);
+			for (int i = 0; i < arraySize; i++) {
+				Array.set(repackagedArgs, i, args[parameterCount - 1 + i]);
 			}
+			newArgs[newArgs.length - 1] = repackagedArgs;
 			return newArgs;
 		}
 		return args;
 	}
 
 
+	/**
+	 * @deprecated in its public form as of Spring 3.2.7, since there is no need to refer to this directly...
+	 * @see ReflectionHelper.ArgumentsMatchInfo#isExactMatch()
+	 * @see ReflectionHelper.ArgumentsMatchInfo#isCloseMatch()
+	 * @see ReflectionHelper.ArgumentsMatchInfo#isMatchRequiringConversion()
+	 */
+	@Deprecated
 	public static enum ArgsMatchKind {
-		// An exact match is where the parameter types exactly match what the method/constructor being invoked is expecting
+
+		/** An exact match is where the parameter types exactly match what the method/constructor is expecting */
 		EXACT,
-		// A close match is where the parameter types either exactly match or are assignment compatible with the method/constructor being invoked
+
+		/** A close match is where the parameter types either exactly match or are assignment-compatible */
 		CLOSE,
-		// A conversion match is where the type converter must be used to transform some of the parameter types
+
+		/** A conversion match is where the type converter must be used to transform some of the parameter types */
 		REQUIRES_CONVERSION
 	}
 
 
 	/**
-	 * An instance of ArgumentsMatchInfo describes what kind of match was achieved between two sets of arguments - the set that a
-	 * method/constructor is expecting and the set that are being supplied at the point of invocation. If the kind
-	 * indicates that conversion is required for some of the arguments then the arguments that require conversion are
-	 * listed in the argsRequiringConversion array.
+	 * An instance of ArgumentsMatchInfo describes what kind of match was achieved
+	 * between two sets of arguments - the set that a method/constructor is expecting
+	 * and the set that are being supplied at the point of invocation. If the kind
+	 * indicates that conversion is required for some of the arguments then the arguments
+	 * that require conversion are listed in the argsRequiringConversion array.
 	 */
 	public static class ArgumentsMatchInfo {
 
@@ -487,11 +463,12 @@ public boolean isMatchRequiringConversion() {
 			return (this.kind == ArgsMatchKind.REQUIRES_CONVERSION);
 		}
 
+		@Override
 		public String toString() {
 			StringBuilder sb = new StringBuilder();
-			sb.append("ArgumentMatch: ").append(this.kind);
+			sb.append("ArgumentsMatchInfo: ").append(this.kind);
 			if (this.argsRequiringConversion != null) {
-				sb.append("  (argsForConversion:");
+				sb.append(" (argsRequiringConversion:");
 				for (int i = 0; i < this.argsRequiringConversion.length;i++) {
 					if (i > 0) {
 						sb.append(",");
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java
index 4342941af8..8324e64fbf 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 import org.springframework.expression.TypeConverter;
 
 /**
- * A constructor resolver that uses reflection to locate the constructor that should be invoked
+ * A constructor resolver that uses reflection to locate the constructor that should be invoked.
  *
  * @author Andy Clement
  * @author Juergen Hoeller
@@ -55,28 +55,28 @@ public ConstructorExecutor resolve(EvaluationContext context, String typename, L
 		try {
 			TypeConverter typeConverter = context.getTypeConverter();
 			Class<?> type = context.getTypeLocator().findType(typename);
-			Constructor[] ctors = type.getConstructors();
+			Constructor<?>[] ctors = type.getConstructors();
 
-			Arrays.sort(ctors, new Comparator<Constructor>() {
-				public int compare(Constructor c1, Constructor c2) {
+			Arrays.sort(ctors, new Comparator<Constructor<?>>() {
+				public int compare(Constructor<?> c1, Constructor<?> c2) {
 					int c1pl = c1.getParameterTypes().length;
 					int c2pl = c2.getParameterTypes().length;
 					return (new Integer(c1pl)).compareTo(c2pl);
 				}
 			});
 
-			Constructor closeMatch = null;
+			Constructor<?> closeMatch = null;
 			int[] argsToConvert = null;
 			Constructor matchRequiringConversion = null;
 
-			for (Constructor ctor : ctors) {
-				Class[] paramTypes = ctor.getParameterTypes();
+			for (Constructor<?> ctor : ctors) {
+				Class<?>[] paramTypes = ctor.getParameterTypes();
 				List<TypeDescriptor> paramDescriptors = new ArrayList<TypeDescriptor>(paramTypes.length);
 				for (int i = 0; i < paramTypes.length; i++) {
 					paramDescriptors.add(new TypeDescriptor(new MethodParameter(ctor, i)));
 				}
 				ReflectionHelper.ArgumentsMatchInfo matchInfo = null;
-				if (ctor.isVarArgs() && argumentTypes.size() >= (paramTypes.length - 1)) {
+				if (ctor.isVarArgs() && argumentTypes.size() >= paramTypes.length - 1) {
 					// *sigh* complicated
 					// Basically.. we have to have all parameters match up until the varargs one, then the rest of what is
 					// being provided should be
@@ -90,18 +90,19 @@ else if (paramTypes.length == argumentTypes.size()) {
 					matchInfo = ReflectionHelper.compareArguments(paramDescriptors, argumentTypes, typeConverter);
 				}
 				if (matchInfo != null) {
-					if (matchInfo.kind == ReflectionHelper.ArgsMatchKind.EXACT) {
+					if (matchInfo.isExactMatch()) {
 						return new ReflectiveConstructorExecutor(ctor, null);
 					}
-					else if (matchInfo.kind == ReflectionHelper.ArgsMatchKind.CLOSE) {
+					else if (matchInfo.isCloseMatch()) {
 						closeMatch = ctor;
 					}
-					else if (matchInfo.kind == ReflectionHelper.ArgsMatchKind.REQUIRES_CONVERSION) {
+					else if (matchInfo.isMatchRequiringConversion()) {
 						argsToConvert = matchInfo.argsRequiringConversion;
 						matchRequiringConversion = ctor;
 					}
 				}
 			}
+
 			if (closeMatch != null) {
 				return new ReflectiveConstructorExecutor(closeMatch, null);
 			}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
index 12cd86d36b..21d9c40b02 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,13 @@
 package org.springframework.expression.spel.support;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -42,8 +43,8 @@
 import org.springframework.expression.spel.SpelMessage;
 
 /**
- * Reflection-based {@link MethodResolver} used by default in
- * {@link StandardEvaluationContext} unless explicit method resolvers have been specified.
+ * Reflection-based {@link MethodResolver} used by default in {@link StandardEvaluationContext}
+ * unless explicit method resolvers have been specified.
  *
  * @author Andy Clement
  * @author Juergen Hoeller
@@ -53,39 +54,52 @@
  */
 public class ReflectiveMethodResolver implements MethodResolver {
 
-	private static Method[] NO_METHODS = new Method[0];
-
-	private Map<Class<?>, MethodFilter> filters = null;
-
 	// Using distance will ensure a more accurate match is discovered,
 	// more closely following the Java rules.
-	private boolean useDistance = false;
+	private final boolean useDistance;
 
+	private Map<Class<?>, MethodFilter> filters;
 
-	public ReflectiveMethodResolver() {
 
+	public ReflectiveMethodResolver() {
+		this.useDistance = false;
 	}
 
 	/**
-	 * This constructors allows the ReflectiveMethodResolver to be configured such that it will
-	 * use a distance computation to check which is the better of two close matches (when there
-	 * are multiple matches).  Using the distance computation is intended to ensure matches
-	 * are more closely representative of what a Java compiler would do when taking into
-	 * account boxing/unboxing and whether the method candidates are declared to handle a
-	 * supertype of the type (of the argument) being passed in.
-	 * @param useDistance true if distance computation should be used when calculating matches
+	 * This constructor allows the ReflectiveMethodResolver to be configured such that it
+	 * will use a distance computation to check which is the better of two close matches
+	 * (when there are multiple matches). Using the distance computation is intended to
+	 * ensure matches are more closely representative of what a Java compiler would do
+	 * when taking into account boxing/unboxing and whether the method candidates are
+	 * declared to handle a supertype of the type (of the argument) being passed in.
+	 * @param useDistance {@code true} if distance computation should be used when
+	 * calculating matches; {@code false} otherwise
 	 */
 	public ReflectiveMethodResolver(boolean useDistance) {
 		this.useDistance = useDistance;
 	}
 
+
+	public void registerMethodFilter(Class<?> type, MethodFilter filter) {
+		if (this.filters == null) {
+			this.filters = new HashMap<Class<?>, MethodFilter>();
+		}
+		if (filter != null) {
+			this.filters.put(type, filter);
+		}
+		else {
+			this.filters.remove(type);
+		}
+	}
+
+
 	/**
 	 * Locate a method on a type. There are three kinds of match that might occur:
 	 * <ol>
-	 * <li>An exact match where the types of the arguments match the types of the constructor
-	 * <li>An in-exact match where the types we are looking for are subtypes of those defined on the constructor
-	 * <li>A match where we are able to convert the arguments into those expected by the constructor,
-	 * according to the registered type converter.
+	 * <li>an exact match where the types of the arguments match the types of the constructor
+	 * <li>an in-exact match where the types we are looking for are subtypes of those defined on the constructor
+	 * <li>a match where we are able to convert the arguments into those expected by the constructor,
+	 * according to the registered type converter
 	 * </ol>
 	 */
 	public MethodExecutor resolve(EvaluationContext context, Object targetObject, String name,
@@ -94,12 +108,13 @@ public MethodExecutor resolve(EvaluationContext context, Object targetObject, St
 		try {
 			TypeConverter typeConverter = context.getTypeConverter();
 			Class<?> type = (targetObject instanceof Class ? (Class<?>) targetObject : targetObject.getClass());
-			List<Method> methods = new ArrayList<Method>(Arrays.asList(getMethods(type, targetObject)));
+			List<Method> methods = new ArrayList<Method>(getMethods(type, targetObject));
 
 			// If a filter is registered for this type, call it
 			MethodFilter filter = (this.filters != null ? this.filters.get(type) : null);
 			if (filter != null) {
-				methods = filter.filter(methods);
+				List<Method> filtered = filter.filter(methods);
+				methods = (filtered instanceof ArrayList ? filtered : new ArrayList<Method>(filtered));
 			}
 
 			// Sort methods into a sensible order
@@ -108,7 +123,19 @@ public MethodExecutor resolve(EvaluationContext context, Object targetObject, St
 					public int compare(Method m1, Method m2) {
 						int m1pl = m1.getParameterTypes().length;
 						int m2pl = m2.getParameterTypes().length;
-						return (new Integer(m1pl)).compareTo(m2pl);
+						// varargs methods go last
+						if (m1pl == m2pl) {
+						    if (!m1.isVarArgs() && m2.isVarArgs()) {
+						    	return -1;
+						    }
+						    else if (m1.isVarArgs() && !m2.isVarArgs()) {
+						    	return 1;
+						    }
+						    else {
+						    	return 0;
+						    }
+						}
+						return (m1pl < m2pl ? -1 : (m1pl > m2pl ? 1 : 0));
 					}
 				});
 			}
@@ -119,7 +146,7 @@ public int compare(Method m1, Method m2) {
 			}
 
 			// Remove duplicate methods (possible due to resolved bridge methods)
-			methods = new ArrayList<Method>(new LinkedHashSet<Method>(methods));
+			Set<Method> methodsToIterate = new LinkedHashSet<Method>(methods);
 
 			Method closeMatch = null;
 			int closeMatchDistance = Integer.MAX_VALUE;
@@ -127,7 +154,7 @@ public int compare(Method m1, Method m2) {
 			Method matchRequiringConversion = null;
 			boolean multipleOptions = false;
 
-			for (Method method : methods) {
+			for (Method method : methodsToIterate) {
 				if (method.getName().equals(name)) {
 					Class<?>[] paramTypes = method.getParameterTypes();
 					List<TypeDescriptor> paramDescriptors = new ArrayList<TypeDescriptor>(paramTypes.length);
@@ -140,26 +167,30 @@ public int compare(Method m1, Method m2) {
 						matchInfo = ReflectionHelper.compareArgumentsVarargs(paramDescriptors, argumentTypes, typeConverter);
 					}
 					else if (paramTypes.length == argumentTypes.size()) {
-						// name and parameter number match, check the arguments
+						// Name and parameter number match, check the arguments
 						matchInfo = ReflectionHelper.compareArguments(paramDescriptors, argumentTypes, typeConverter);
 					}
 					if (matchInfo != null) {
-						if (matchInfo.kind == ReflectionHelper.ArgsMatchKind.EXACT) {
+						if (matchInfo.isExactMatch()) {
 							return new ReflectiveMethodExecutor(method, null);
 						}
-						else if (matchInfo.kind == ReflectionHelper.ArgsMatchKind.CLOSE) {
-							if (!useDistance) {
-								closeMatch = method;
-							} else {
+						else if (matchInfo.isCloseMatch()) {
+							if (this.useDistance) {
 								int matchDistance = ReflectionHelper.getTypeDifferenceWeight(paramDescriptors, argumentTypes);
-								if (matchDistance<closeMatchDistance) {
-									// this is a better match
+								if (closeMatch == null || matchDistance < closeMatchDistance) {
+									// This is a better match...
+									closeMatch = method;
 									closeMatchDistance = matchDistance;
+								}
+							}
+							else {
+								// Take this as a close match if there isn't one already
+								if (closeMatch == null) {
 									closeMatch = method;
 								}
 							}
 						}
-						else if (matchInfo.kind == ReflectionHelper.ArgsMatchKind.REQUIRES_CONVERSION) {
+						else if (matchInfo.isMatchRequiringConversion()) {
 							if (matchRequiringConversion != null) {
 								multipleOptions = true;
 							}
@@ -187,33 +218,30 @@ else if (matchRequiringConversion != null) {
 		}
 	}
 
-	public void registerMethodFilter(Class<?> type, MethodFilter filter) {
-		if (this.filters == null) {
-			this.filters = new HashMap<Class<?>, MethodFilter>();
-		}
-		if (filter == null) {
-			this.filters.remove(type);
+	private Collection<Method> getMethods(Class<?> type, Object targetObject) {
+		if (targetObject instanceof Class) {
+			Set<Method> result = new LinkedHashSet<Method>();
+			// Add these so that static methods are invocable on the type: e.g. Float.valueOf(..)
+			Method[] methods = getMethods(type);
+			for (Method method : methods) {
+				if (Modifier.isStatic(method.getModifiers())) {
+					result.add(method);
+				}
+			}
+			// Also expose methods from java.lang.Class itself
+			result.addAll(Arrays.asList(getMethods(Class.class)));
+			return result;
 		}
 		else {
-			this.filters.put(type,filter);
-		}
-	}
-
-	private Method[] getMethods(Class<?> type, Object targetObject) {
-		if(targetObject instanceof Class) {
-			Set<Method> methods = new HashSet<Method>();
-			methods.addAll(Arrays.asList(getMethods(type)));
-			methods.addAll(Arrays.asList(getMethods(targetObject.getClass())));
-			return methods.toArray(new Method[methods.size()]);
+			return Arrays.asList(getMethods(type));
 		}
-		return getMethods(type);
 	}
 
 	/**
 	 * Return the set of methods for this type. The default implementation returns the
-	 * result of Class#getMethods for the given {@code type}, but subclasses may override
-	 * in order to alter the results, e.g. specifying static methods declared elsewhere.
-	 *
+	 * result of {@link Class#getMethods()} for the given {@code type}, but subclasses
+	 * may override in order to alter the results, e.g. specifying static methods
+	 * declared elsewhere.
 	 * @param type the class for which to return the methods
 	 * @since 3.1.1
 	 */
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
index 6c5b249114..dee1993bf7 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,17 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.Property;
 import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.style.ToStringCreator;
 import org.springframework.expression.AccessException;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.EvaluationException;
@@ -38,9 +42,11 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Simple PropertyAccessor that uses reflection to access properties for reading and writing.
- * A property can be accessed if it is accessible as a field on the object or through a
- * getter (if being read) or a setter (if being written).
+ * Simple {@link PropertyAccessor} that uses reflection to access properties
+ * for reading and writing.
+ *
+ * <p>A property can be accessed through a public getter method (when being read)
+ * or a public setter method (when being written), and also as a public field.
  *
  * @author Andy Clement
  * @author Juergen Hoeller
@@ -49,6 +55,17 @@
  */
 public class ReflectivePropertyAccessor implements PropertyAccessor {
 
+	private static final Set<Class<?>> BOOLEAN_TYPES;
+	static {
+		Set<Class<?>> booleanTypes = new HashSet<Class<?>>();
+		booleanTypes.add(Boolean.class);
+		booleanTypes.add(Boolean.TYPE);
+		BOOLEAN_TYPES = Collections.unmodifiableSet(booleanTypes);
+	}
+
+	private static final Set<Class<?>> ANY_TYPES = Collections.emptySet();
+
+
 	private final Map<CacheKey, InvokerPair> readerCache = new ConcurrentHashMap<CacheKey, InvokerPair>(64);
 
 	private final Map<CacheKey, Member> writerCache = new ConcurrentHashMap<CacheKey, Member>(64);
@@ -57,7 +74,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
 
 
 	/**
-	 * @return null which means this is a general purpose accessor
+	 * Returns {@code null} which means this is a general purpose accessor.
 	 */
 	public Class<?>[] getSpecificTargetClasses() {
 		return null;
@@ -71,14 +88,14 @@ public boolean canRead(EvaluationContext context, Object target, String name) th
 		if (type.isArray() && name.equals("length")) {
 			return true;
 		}
-		CacheKey cacheKey = new CacheKey(type, name);
+		CacheKey cacheKey = new CacheKey(type, name, target instanceof Class);
 		if (this.readerCache.containsKey(cacheKey)) {
 			return true;
 		}
 		Method method = findGetterForProperty(name, type, target);
 		if (method != null) {
-			// Treat it like a property
-			// The readerCache will only contain gettable properties (let's not worry about setters for now)
+			// Treat it like a property...
+			// The readerCache will only contain gettable properties (let's not worry about setters for now).
 			Property property = new Property(type, method, null);
 			TypeDescriptor typeDescriptor = new TypeDescriptor(property);
 			this.readerCache.put(cacheKey, new InvokerPair(method, typeDescriptor));
@@ -110,7 +127,7 @@ public TypedValue read(EvaluationContext context, Object target, String name) th
 			return new TypedValue(Array.getLength(target));
 		}
 
-		CacheKey cacheKey = new CacheKey(type, name);
+		CacheKey cacheKey = new CacheKey(type, name, target instanceof Class);
 		InvokerPair invoker = this.readerCache.get(cacheKey);
 
 		if (invoker == null || invoker.member instanceof Method) {
@@ -119,8 +136,8 @@ public TypedValue read(EvaluationContext context, Object target, String name) th
 				method = findGetterForProperty(name, type, target);
 				if (method != null) {
 					// TODO remove the duplication here between canRead and read
-					// Treat it like a property
-					// The readerCache will only contain gettable properties (let's not worry about setters for now)
+					// Treat it like a property...
+					// The readerCache will only contain gettable properties (let's not worry about setters for now).
 					Property property = new Property(type, method, null);
 					TypeDescriptor typeDescriptor = new TypeDescriptor(property);
 					invoker = new InvokerPair(method, typeDescriptor);
@@ -168,7 +185,7 @@ public boolean canWrite(EvaluationContext context, Object target, String name) t
 			return false;
 		}
 		Class<?> type = (target instanceof Class ? (Class<?>) target : target.getClass());
-		CacheKey cacheKey = new CacheKey(type, name);
+		CacheKey cacheKey = new CacheKey(type, name, target instanceof Class);
 		if (this.writerCache.containsKey(cacheKey)) {
 			return true;
 		}
@@ -209,7 +226,7 @@ public void write(EvaluationContext context, Object target, String name, Object
 				throw new AccessException("Type conversion failure",evaluationException);
 			}
 		}
-		CacheKey cacheKey = new CacheKey(type, name);
+		CacheKey cacheKey = new CacheKey(type, name, target instanceof Class);
 		Member cachedMember = this.writerCache.get(cacheKey);
 
 		if (cachedMember == null || cachedMember instanceof Method) {
@@ -266,7 +283,7 @@ private TypeDescriptor getTypeDescriptor(EvaluationContext context, Object targe
 		if (type.isArray() && name.equals("length")) {
 			return TypeDescriptor.valueOf(Integer.TYPE);
 		}
-		CacheKey cacheKey = new CacheKey(type, name);
+		CacheKey cacheKey = new CacheKey(type, name, target instanceof Class);
 		TypeDescriptor typeDescriptor = this.typeDescriptorCache.get(cacheKey);
 		if (typeDescriptor == null) {
 			// attempt to populate the cache entry
@@ -313,42 +330,39 @@ private Field findField(String name, Class<?> clazz, Object target) {
 	 * Find a getter method for the specified property.
 	 */
 	protected Method findGetterForProperty(String propertyName, Class<?> clazz, boolean mustBeStatic) {
-		Method[] ms = getSortedClassMethods(clazz);
-		String propertyMethodSuffix = getPropertyMethodSuffix(propertyName);
-
-		// Try "get*" method...
-		String getterName = "get" + propertyMethodSuffix;
-		for (Method method : ms) {
-			if (method.getName().equals(getterName) && method.getParameterTypes().length == 0 &&
-					(!mustBeStatic || Modifier.isStatic(method.getModifiers()))) {
-				return method;
-			}
+		Method method = findMethodForProperty(getPropertyMethodSuffixes(propertyName),
+				 "get", clazz, mustBeStatic, 0, ANY_TYPES);
+		if (method == null) {
+			method = findMethodForProperty(getPropertyMethodSuffixes(propertyName),
+					 "is", clazz, mustBeStatic, 0, BOOLEAN_TYPES);
 		}
-		// Try "is*" method...
-		getterName = "is" + propertyMethodSuffix;
-		for (Method method : ms) {
-			if (method.getName().equals(getterName) && method.getParameterTypes().length == 0 &&
-					(boolean.class.equals(method.getReturnType()) || Boolean.class.equals(method.getReturnType())) &&
-					(!mustBeStatic || Modifier.isStatic(method.getModifiers()))) {
-				return method;
-			}
-		}
-		return null;
+		return method;
 	}
 
 	/**
 	 * Find a setter method for the specified property.
 	 */
 	protected Method findSetterForProperty(String propertyName, Class<?> clazz, boolean mustBeStatic) {
+		return findMethodForProperty(getPropertyMethodSuffixes(propertyName),
+				"set", clazz, mustBeStatic, 1, ANY_TYPES);
+	}
+
+	private Method findMethodForProperty(String[] methodSuffixes, String prefix, Class<?> clazz,
+			boolean mustBeStatic, int numberOfParams, Set<Class<?>> requiredReturnTypes) {
+
 		Method[] methods = getSortedClassMethods(clazz);
-		String setterName = "set" + getPropertyMethodSuffix(propertyName);
-		for (Method method : methods) {
-			if (method.getName().equals(setterName) && method.getParameterTypes().length == 1 &&
-					(!mustBeStatic || Modifier.isStatic(method.getModifiers()))) {
-				return method;
+		for (String methodSuffix : methodSuffixes) {
+			for (Method method : methods) {
+				if (method.getName().equals(prefix + methodSuffix)
+						&& method.getParameterTypes().length == numberOfParams
+						&& (!mustBeStatic || Modifier.isStatic(method.getModifiers()))
+						&& (requiredReturnTypes.isEmpty() || requiredReturnTypes.contains(method.getReturnType()))) {
+					return method;
+				}
 			}
 		}
 		return null;
+
 	}
 
 	/**
@@ -364,17 +378,33 @@ public int compare(Method o1, Method o2) {
 		return methods;
 	}
 
+	/**
+	 * Return the method suffixes for a given property name. The default implementation
+	 * uses JavaBean conventions with additional support for properties of the form 'xY'
+	 * where the method 'getXY()' is used in preference to the JavaBean convention of
+	 * 'getxY()'.
+	 */
+	protected String[] getPropertyMethodSuffixes(String propertyName) {
+		String suffix = getPropertyMethodSuffix(propertyName);
+		if (suffix.length() > 0 && Character.isUpperCase(suffix.charAt(0))) {
+			return new String[] { suffix };
+		}
+		return new String[] { suffix, StringUtils.capitalize(suffix) };
+	}
+
+	/**
+	 * Return the method suffix for a given property name. The default implementation
+	 * uses JavaBean conventions.
+	 */
 	protected String getPropertyMethodSuffix(String propertyName) {
 		if (propertyName.length() > 1 && Character.isUpperCase(propertyName.charAt(1))) {
 			return propertyName;
 		}
-		else {
-			return StringUtils.capitalize(propertyName);
-		}
+		return StringUtils.capitalize(propertyName);
 	}
 
 	/**
-	 * Find a field of a certain name on a specified class
+	 * Find a field of a certain name on a specified class.
 	 */
 	protected Field findField(String name, Class<?> clazz, boolean mustBeStatic) {
 		Field[] fields = clazz.getFields();
@@ -417,7 +447,7 @@ public PropertyAccessor createOptimalAccessor(EvaluationContext eContext, Object
 			return this;
 		}
 
-		CacheKey cacheKey = new CacheKey(type, name);
+		CacheKey cacheKey = new CacheKey(type, name, target instanceof Class);
 		InvokerPair invocationTarget = this.readerCache.get(cacheKey);
 
 		if (invocationTarget == null || invocationTarget.member instanceof Method) {
@@ -472,13 +502,16 @@ public InvokerPair(Member member, TypeDescriptor typeDescriptor) {
 
 	private static class CacheKey {
 
-		private final Class clazz;
+		private final Class<?> clazz;
 
 		private final String name;
 
-		public CacheKey(Class clazz, String name) {
+		private boolean targetIsClass;
+
+		public CacheKey(Class<?> clazz, String name, boolean targetIsClass) {
 			this.clazz = clazz;
 			this.name = name;
+			this.targetIsClass = targetIsClass;
 		}
 
 		@Override
@@ -490,13 +523,23 @@ public boolean equals(Object other) {
 				return false;
 			}
 			CacheKey otherKey = (CacheKey) other;
-			return (this.clazz.equals(otherKey.clazz) && this.name.equals(otherKey.name));
+			boolean rtn = true;
+			rtn &= this.clazz.equals(otherKey.clazz);
+			rtn &= this.name.equals(otherKey.name);
+			rtn &= this.targetIsClass == otherKey.targetIsClass;
+			return rtn;
 		}
 
 		@Override
 		public int hashCode() {
 			return this.clazz.hashCode() * 29 + this.name.hashCode();
 		}
+
+		@Override
+		public String toString() {
+			return new ToStringCreator(this).append("clazz", this.clazz).append("name",
+					this.name).append("targetIsClass", this.targetIsClass).toString();
+		}
 	}
 
 
@@ -531,7 +574,7 @@ private static class OptimalPropertyAccessor implements PropertyAccessor {
 			}
 		}
 
-		public Class[] getSpecificTargetClasses() {
+		public Class<?>[] getSpecificTargetClasses() {
 			throw new UnsupportedOperationException("Should not be called on an OptimalPropertyAccessor");
 		}
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
index c4a4425bed..b001130717 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -103,15 +103,14 @@ public boolean removeConstructorResolver(ConstructorResolver resolver) {
 		return this.constructorResolvers.remove(resolver);
 	}
 
-	public List<ConstructorResolver> getConstructorResolvers() {
-		ensureConstructorResolversInitialized();
-		return this.constructorResolvers;
-	}
-
 	public void setConstructorResolvers(List<ConstructorResolver> constructorResolvers) {
 		this.constructorResolvers = constructorResolvers;
 	}
 
+	public List<ConstructorResolver> getConstructorResolvers() {
+		ensureConstructorResolversInitialized();
+		return this.constructorResolvers;
+	}
 
 	public void addMethodResolver(MethodResolver resolver) {
 		ensureMethodResolversInitialized();
@@ -123,6 +122,10 @@ public boolean removeMethodResolver(MethodResolver methodResolver) {
 		return this.methodResolvers.remove(methodResolver);
 	}
 
+	public void setMethodResolvers(List<MethodResolver> methodResolvers) {
+		this.methodResolvers = methodResolvers;
+	}
+
 	public List<MethodResolver> getMethodResolvers() {
 		ensureMethodResolversInitialized();
 		return this.methodResolvers;
@@ -136,11 +139,6 @@ public BeanResolver getBeanResolver() {
 		return this.beanResolver;
 	}
 
-	public void setMethodResolvers(List<MethodResolver> methodResolvers) {
-		this.methodResolvers = methodResolvers;
-	}
-
-
 	public void addPropertyAccessor(PropertyAccessor accessor) {
 		ensurePropertyAccessorsInitialized();
 		this.propertyAccessors.add(this.propertyAccessors.size() - 1, accessor);
@@ -150,15 +148,14 @@ public boolean removePropertyAccessor(PropertyAccessor accessor) {
 		return this.propertyAccessors.remove(accessor);
 	}
 
-	public List<PropertyAccessor> getPropertyAccessors() {
-		ensurePropertyAccessorsInitialized();
-		return this.propertyAccessors;
-	}
-
 	public void setPropertyAccessors(List<PropertyAccessor> propertyAccessors) {
 		this.propertyAccessors = propertyAccessors;
 	}
 
+	public List<PropertyAccessor> getPropertyAccessors() {
+		ensurePropertyAccessorsInitialized();
+		return this.propertyAccessors;
+	}
 
 	public void setTypeLocator(TypeLocator typeLocator) {
 		Assert.notNull(typeLocator, "TypeLocator must not be null");
@@ -221,19 +218,18 @@ public Object lookupVariable(String name) {
 	/**
 	 * Register a {@code MethodFilter} which will be called during method resolution
 	 * for the specified type.
-	 *
 	 * <p>The {@code MethodFilter} may remove methods and/or sort the methods which
 	 * will then be used by SpEL as the candidates to look through for a match.
-	 *
 	 * @param type the type for which the filter should be called
 	 * @param filter a {@code MethodFilter}, or {@code null} to unregister a filter for the type
 	 * @throws IllegalStateException if the {@link ReflectiveMethodResolver} is not in use
 	 */
 	public void registerMethodFilter(Class<?> type, MethodFilter filter) throws IllegalStateException {
 		ensureMethodResolversInitialized();
-		if (reflectiveMethodResolver != null) {
-			reflectiveMethodResolver.registerMethodFilter(type, filter);
-		} else {
+		if (this.reflectiveMethodResolver != null) {
+			this.reflectiveMethodResolver.registerMethodFilter(type, filter);
+		}
+		else {
 			throw new IllegalStateException("Method filter cannot be set as the reflective method resolver is not in use");
 		}
 	}
@@ -261,7 +257,8 @@ private void ensureMethodResolversInitialized() {
 	private synchronized void initializeMethodResolvers() {
 		if (this.methodResolvers == null) {
 			List<MethodResolver> defaultResolvers = new ArrayList<MethodResolver>();
-			defaultResolvers.add(reflectiveMethodResolver = new ReflectiveMethodResolver());
+			this.reflectiveMethodResolver = new ReflectiveMethodResolver();
+			defaultResolvers.add(this.reflectiveMethodResolver);
 			this.methodResolvers = defaultResolvers;
 		}
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
index 18f29d148b..97528526d5 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,8 @@
 import org.springframework.expression.spel.SpelMessage;
 
 /**
- * A simple basic TypeComparator implementation. It supports comparison of numbers and types implementing Comparable.
+ * A simple basic {@link TypeComparator} implementation.
+ * It supports comparison of Numbers and types implementing Comparable.
  *
  * @author Andy Clement
  * @author Juergen Hoeller
@@ -29,35 +30,47 @@
  */
 public class StandardTypeComparator implements TypeComparator {
 
+	public boolean canCompare(Object left, Object right) {
+		if (left == null || right == null) {
+			return true;
+		}
+		if (left instanceof Number && right instanceof Number) {
+			return true;
+		}
+		if (left instanceof Comparable) {
+			return true;
+		}
+		return false;
+	}
+
 	@SuppressWarnings("unchecked")
 	public int compare(Object left, Object right) throws SpelEvaluationException {
 		// If one is null, check if the other is
 		if (left == null) {
-			return right == null ? 0 : -1;
-		} else if (right == null) {
-			return 1; // left cannot be null
+			return (right == null ? 0 : -1);
+		}
+		else if (right == null) {
+			return 1;  // left cannot be null at this point
 		}
 
 		// Basic number comparisons
 		if (left instanceof Number && right instanceof Number) {
 			Number leftNumber = (Number) left;
 			Number rightNumber = (Number) right;
+
 			if (leftNumber instanceof Double || rightNumber instanceof Double) {
-				double d1 = leftNumber.doubleValue();
-				double d2 = rightNumber.doubleValue();
-				return Double.compare(d1,d2);
-			} else if (leftNumber instanceof Float || rightNumber instanceof Float) {
-				float f1 = leftNumber.floatValue();
-				float f2 = rightNumber.floatValue();
-				return Float.compare(f1,f2);
-			} else if (leftNumber instanceof Long || rightNumber instanceof Long) {
-				Long l1 = leftNumber.longValue();
-				Long l2 = rightNumber.longValue();
-				return l1.compareTo(l2);
-			} else {
-				Integer i1 = leftNumber.intValue();
-				Integer i2 = rightNumber.intValue();
-				return i1.compareTo(i2);
+				return Double.compare(leftNumber.doubleValue(), rightNumber.doubleValue());
+			}
+			else if (leftNumber instanceof Float || rightNumber instanceof Float) {
+				return Float.compare(leftNumber.floatValue(), rightNumber.floatValue());
+			}
+			else if (leftNumber instanceof Long || rightNumber instanceof Long) {
+				// Don't call Long.compare here - only available on JDK 1.7+
+				return compare(leftNumber.longValue(), rightNumber.longValue());
+			}
+			else {
+				// Don't call Integer.compare here - only available on JDK 1.7+
+				return compare(leftNumber.intValue(), rightNumber.intValue());
 			}
 		}
 
@@ -65,24 +78,21 @@ public int compare(Object left, Object right) throws SpelEvaluationException {
 			if (left instanceof Comparable) {
 				return ((Comparable) left).compareTo(right);
 			}
-		} catch (ClassCastException cce) {
-			throw new SpelEvaluationException(cce, SpelMessage.NOT_COMPARABLE, left.getClass(), right.getClass());
+		}
+		catch (ClassCastException ex) {
+			throw new SpelEvaluationException(ex, SpelMessage.NOT_COMPARABLE, left.getClass(), right.getClass());
 		}
 
 		throw new SpelEvaluationException(SpelMessage.NOT_COMPARABLE, left.getClass(), right.getClass());
 	}
 
-	public boolean canCompare(Object left, Object right) {
-		if (left == null || right == null) {
-			return true;
-		}
-		if (left instanceof Number && right instanceof Number) {
-			return true;
-		}
-		if (left instanceof Comparable) {
-			return true;
-		}
-		return false;
+
+	private static int compare(int x, int y) {
+		return (x < y ? -1 : (x > y ? 1 : 0));
+	}
+
+	private static int compare(long x, long y) {
+		return (x < y ? -1 : (x > y ? 1 : 0));
 	}
 
 }
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
index 483dade31e..79bfe402eb 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import org.springframework.core.convert.ConversionException;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.ConverterNotFoundException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.expression.TypeConverter;
@@ -37,20 +36,25 @@
  */
 public class StandardTypeConverter implements TypeConverter {
 
-	private static ConversionService defaultConversionService;
+	private static volatile ConversionService defaultConversionService;
 
 	private final ConversionService conversionService;
 
 
+	/**
+	 * Create a StandardTypeConverter for the default ConversionService.
+	 */
 	public StandardTypeConverter() {
-		synchronized (this) {
-			if (defaultConversionService == null) {
-				defaultConversionService = new DefaultConversionService();
-			}
+		if (defaultConversionService == null) {
+			defaultConversionService = new DefaultConversionService();
 		}
 		this.conversionService = defaultConversionService;
 	}
 
+	/**
+	 * Create a StandardTypeConverter for the given ConversionService.
+	 * @param conversionService the ConversionService to delegate to
+	 */
 	public StandardTypeConverter(ConversionService conversionService) {
 		Assert.notNull(conversionService, "ConversionService must not be null");
 		this.conversionService = conversionService;
@@ -65,11 +69,9 @@ public Object convertValue(Object value, TypeDescriptor sourceType, TypeDescript
 		try {
 			return this.conversionService.convert(value, sourceType, targetType);
 		}
-		catch (ConverterNotFoundException cenfe) {
-			throw new SpelEvaluationException(cenfe, SpelMessage.TYPE_CONVERSION_ERROR, sourceType.toString(), targetType.toString());
-		}
-		catch (ConversionException ce) {
-			throw new SpelEvaluationException(ce, SpelMessage.TYPE_CONVERSION_ERROR, sourceType.toString(), targetType.toString());
+		catch (ConversionException ex) {
+			throw new SpelEvaluationException(
+					ex, SpelMessage.TYPE_CONVERSION_ERROR, sourceType.toString(), targetType.toString());
 		}
 	}
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java
index 2a210e3fda..34931cf045 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package org.springframework.expression.spel.support;
 
-import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
 import org.springframework.expression.EvaluationException;
@@ -27,8 +27,9 @@
 import org.springframework.util.ClassUtils;
 
 /**
- * A default implementation of a TypeLocator that uses the context classloader (or any classloader set upon it). It
- * supports 'well known' packages so if a type cannot be found it will try the registered imports to locate it.
+ * A simple implementation of {@link TypeLocator} that uses the context ClassLoader
+ * (or any ClassLoader set upon it). It supports 'well-known' packages: So if a
+ * type cannot be found, it will try the registered imports to locate it.
  *
  * @author Andy Clement
  * @author Juergen Hoeller
@@ -36,49 +37,30 @@
  */
 public class StandardTypeLocator implements TypeLocator {
 
-	private ClassLoader loader;
+	private final ClassLoader classLoader;
 
-	private final List<String> knownPackagePrefixes = new ArrayList<String>();
+	private final List<String> knownPackagePrefixes = new LinkedList<String>();
 
 
+	/**
+	 * Create a StandardTypeLocator for the default ClassLoader
+	 * (typically, the thread context ClassLoader).
+	 */
 	public StandardTypeLocator() {
 		this(ClassUtils.getDefaultClassLoader());
 	}
 
-	public StandardTypeLocator(ClassLoader loader) {
-		this.loader = loader;
-		// Similar to when writing Java, it only knows about java.lang by default
-		registerImport("java.lang");
-	}
-
-
 	/**
-	 * Find a (possibly unqualified) type reference - first using the typename as is, then trying any registered
-	 * prefixes if the typename cannot be found.
-	 * @param typename the type to locate
-	 * @return the class object for the type
-	 * @throws EvaluationException if the type cannot be found
+	 * Create a StandardTypeLocator for the given ClassLoader.
+	 * @param classLoader the ClassLoader to delegate to
 	 */
-	public Class<?> findType(String typename) throws EvaluationException {
-		String nameToLookup = typename;
-		try {
-			return this.loader.loadClass(nameToLookup);
-		}
-		catch (ClassNotFoundException ey) {
-			// try any registered prefixes before giving up
-		}
-		for (String prefix : this.knownPackagePrefixes) {
-			try {
-				nameToLookup = new StringBuilder().append(prefix).append(".").append(typename).toString();
-				return this.loader.loadClass(nameToLookup);
-			}
-			catch (ClassNotFoundException ex) {
-				// might be a different prefix
-			}
-		}
-		throw new SpelEvaluationException(SpelMessage.TYPE_NOT_FOUND, typename);
+	public StandardTypeLocator(ClassLoader classLoader) {
+		this.classLoader = classLoader;
+		// Similar to when writing regular Java code, it only knows about java.lang by default
+		registerImport("java.lang");
 	}
 
+
 	/**
 	 * Register a new import prefix that will be used when searching for unqualified types.
 	 * Expected format is something like "java.lang".
@@ -88,16 +70,48 @@ public void registerImport(String prefix) {
 		this.knownPackagePrefixes.add(prefix);
 	}
 
+	/**
+	 * Remove that specified prefix from this locator's list of imports.
+	 * @param prefix the prefix to remove
+	 */
+	public void removeImport(String prefix) {
+		this.knownPackagePrefixes.remove(prefix);
+	}
+
 	/**
 	 * Return a list of all the import prefixes registered with this StandardTypeLocator.
-	 * @return list of registered import prefixes
+	 * @return a list of registered import prefixes
 	 */
 	public List<String> getImportPrefixes() {
 		return Collections.unmodifiableList(this.knownPackagePrefixes);
 	}
 
-	public void removeImport(String prefix) {
-		this.knownPackagePrefixes.remove(prefix);
+
+	/**
+	 * Find a (possibly unqualified) type reference - first using the type name as-is,
+	 * then trying any registered prefixes if the type name cannot be found.
+	 * @param typeName the type to locate
+	 * @return the class object for the type
+	 * @throws EvaluationException if the type cannot be found
+	 */
+	public Class<?> findType(String typeName) throws EvaluationException {
+		String nameToLookup = typeName;
+		try {
+			return ClassUtils.forName(nameToLookup, this.classLoader);
+		}
+		catch (ClassNotFoundException ey) {
+			// try any registered prefixes before giving up
+		}
+		for (String prefix : this.knownPackagePrefixes) {
+			try {
+				nameToLookup = prefix + "." + typeName;
+				return ClassUtils.forName(nameToLookup, this.classLoader);
+			}
+			catch (ClassNotFoundException ex) {
+				// might be a different prefix
+			}
+		}
+		throw new SpelEvaluationException(SpelMessage.TYPE_NOT_FOUND, typeName);
 	}
 
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/CachedMethodExecutorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/CachedMethodExecutorTests.java
new file mode 100644
index 0000000000..bf15a7cce6
--- /dev/null
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/CachedMethodExecutorTests.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.expression.spel;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.ast.MethodReference;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+
+import static org.junit.Assert.*;
+
+/**
+ * Test for caching in {@link MethodReference} (SPR-10657).
+ *
+ * @author Oliver Becker
+ */
+public class CachedMethodExecutorTests {
+
+	private final ExpressionParser parser = new SpelExpressionParser();
+
+	private StandardEvaluationContext context;
+
+
+	@Before
+	public void setUp() throws Exception {
+		this.context = new StandardEvaluationContext(new RootObject());
+	}
+
+
+	@Test
+	public void testCachedExecutionForParameters() throws Exception {
+		Expression expression = this.parser.parseExpression("echo(#var)");
+		assertMethodExecution(expression, 42, "int: 42");
+		assertMethodExecution(expression, 42, "int: 42");
+		assertMethodExecution(expression, "Deep Thought", "String: Deep Thought");
+		assertMethodExecution(expression, 42, "int: 42");
+	}
+
+	@Test
+	public void testCachedExecutionForTarget() throws Exception {
+		Expression expression = this.parser.parseExpression("#var.echo(42)");
+		assertMethodExecution(expression, new RootObject(), "int: 42");
+		assertMethodExecution(expression, new RootObject(), "int: 42");
+		assertMethodExecution(expression, new BaseObject(), "String: 42");
+		assertMethodExecution(expression, new RootObject(), "int: 42");
+	}
+
+	private void assertMethodExecution(Expression expression, Object var, String expected) {
+		this.context.setVariable("var", var);
+		assertEquals(expected, expression.getValue(this.context));
+	}
+
+
+	public static class BaseObject {
+
+		public String echo(String value) {
+			return "String: " + value;
+		}
+	}
+
+
+	public static class RootObject extends BaseObject {
+
+		public String echo(int value) {
+			return "int: " + value;
+		}
+	}
+
+}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java
index 74d5aa8e12..5bb0076275 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.springframework.expression.spel;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 import java.util.Arrays;
 import java.util.List;
 
@@ -29,6 +26,8 @@
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 
+import static org.junit.Assert.*;
+
 /**
  * Common superclass for expression tests.
  *
@@ -36,187 +35,146 @@
  */
 public abstract class ExpressionTestCase {
 
-	private final static boolean DEBUG = false;
+	private static final boolean DEBUG = false;
+
+	protected static final boolean SHOULD_BE_WRITABLE = true;
+
+	protected static final boolean SHOULD_NOT_BE_WRITABLE = false;
 
-	protected final static boolean SHOULD_BE_WRITABLE = true;
-	protected final static boolean SHOULD_NOT_BE_WRITABLE = false;
 
 	protected final ExpressionParser parser = new SpelExpressionParser();
+
 	protected final StandardEvaluationContext eContext = TestScenarioCreator.getTestEvaluationContext();
 
+
 	/**
-	 * Evaluate an expression and check that the actual result matches the expectedValue and the class of the result
-	 * matches the expectedClassOfResult.
-	 * @param expression The expression to evaluate
+	 * Evaluate an expression and check that the actual result matches the
+	 * expectedValue and the class of the result matches the expectedClassOfResult.
+	 * @param expression the expression to evaluate
 	 * @param expectedValue the expected result for evaluating the expression
 	 * @param expectedResultType the expected class of the evaluation result
 	 */
 	public void evaluate(String expression, Object expectedValue, Class<?> expectedResultType) {
-		try {
-			Expression expr = parser.parseExpression(expression);
-			if (expr == null) {
-				fail("Parser returned null for expression");
-			}
-			if (DEBUG) {
-				SpelUtilities.printAbstractSyntaxTree(System.out, expr);
-			}
-			// Class<?> expressionType = expr.getValueType();
-			// assertEquals("Type of the expression is not as expected. Should be '"+expectedResultType+"' but is
-			// '"+expressionType+"'",
-			// expectedResultType,expressionType);
+		Expression expr = parser.parseExpression(expression);
+		if (expr == null) {
+			fail("Parser returned null for expression");
+		}
+		if (DEBUG) {
+			SpelUtilities.printAbstractSyntaxTree(System.out, expr);
+		}
 
-			Object value = expr.getValue(eContext);
+		Object value = expr.getValue(eContext);
 
-			// Check the return value
-			if (value == null) {
-				if (expectedValue == null) {
-					return; // no point doing other checks
-				}
-				assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue,
-						null);
+		// Check the return value
+		if (value == null) {
+			if (expectedValue == null) {
+				return;  // no point doing other checks
 			}
+			assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue, null);
+		}
 
-			Class<?> resultType = value.getClass();
-			assertEquals("Type of the actual result was not as expected.  Expected '" + expectedResultType
-					+ "' but result was of type '" + resultType + "'", expectedResultType, resultType);
-			// .equals/* isAssignableFrom */(resultType), truers);
-
-			// TODO isAssignableFrom would allow some room for compatibility
-			// in the above expression...
+		Class<?> resultType = value.getClass();
+		assertEquals("Type of the actual result was not as expected.  Expected '" + expectedResultType +
+				"' but result was of type '" + resultType + "'", expectedResultType, resultType);
 
-			if (expectedValue instanceof String) {
-				assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue,
-						ExpressionTestCase.stringValueOf(value));
-			} else {
-				assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
-			}
-		} catch (EvaluationException ee) {
-			ee.printStackTrace();
-			fail("Unexpected Exception: " + ee.getMessage());
-		} catch (ParseException pe) {
-			pe.printStackTrace();
-			fail("Unexpected Exception: " + pe.getMessage());
+		if (expectedValue instanceof String) {
+			assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue,
+					ExpressionTestCase.stringValueOf(value));
+		}
+		else {
+			assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
 		}
 	}
 
 	public void evaluateAndAskForReturnType(String expression, Object expectedValue, Class<?> expectedResultType) {
-		try {
-			Expression expr = parser.parseExpression(expression);
-			if (expr == null) {
-				fail("Parser returned null for expression");
-			}
-			if (DEBUG) {
-				SpelUtilities.printAbstractSyntaxTree(System.out, expr);
-			}
-			// Class<?> expressionType = expr.getValueType();
-			// assertEquals("Type of the expression is not as expected. Should be '"+expectedResultType+"' but is
-			// '"+expressionType+"'",
-			// expectedResultType,expressionType);
+		Expression expr = parser.parseExpression(expression);
+		if (expr == null) {
+			fail("Parser returned null for expression");
+		}
+		if (DEBUG) {
+			SpelUtilities.printAbstractSyntaxTree(System.out, expr);
+		}
 
-			Object value = expr.getValue(eContext, expectedResultType);
-			if (value == null) {
-				if (expectedValue == null)
-					return; // no point doing other checks
-				assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue,
-						null);
+		Object value = expr.getValue(eContext, expectedResultType);
+		if (value == null) {
+			if (expectedValue == null) {
+				return;  // no point doing other checks
 			}
-
-			Class<?> resultType = value.getClass();
-			assertEquals("Type of the actual result was not as expected.  Expected '" + expectedResultType
-					+ "' but result was of type '" + resultType + "'", expectedResultType, resultType);
-			// .equals/* isAssignableFrom */(resultType), truers);
-			assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
-			// isAssignableFrom would allow some room for compatibility
-			// in the above expression...
-		} catch (EvaluationException ee) {
-			SpelEvaluationException ex = (SpelEvaluationException) ee;
-			ex.printStackTrace();
-			fail("Unexpected EvaluationException: " + ex.getMessage());
-		} catch (ParseException pe) {
-			fail("Unexpected ParseException: " + pe.getMessage());
+			assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue, null);
 		}
+
+		Class<?> resultType = value.getClass();
+		assertEquals("Type of the actual result was not as expected.  Expected '" + expectedResultType +
+				"' but result was of type '" + resultType + "'", expectedResultType, resultType);
+		assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
 	}
 
 	/**
-	 * Evaluate an expression and check that the actual result matches the expectedValue and the class of the result
-	 * matches the expectedClassOfResult. This method can also check if the expression is writable (for example, it is a
-	 * variable or property reference).
-	 *
-	 * @param expression The expression to evaluate
+	 * Evaluate an expression and check that the actual result matches the
+	 * expectedValue and the class of the result matches the expectedClassOfResult.
+	 * This method can also check if the expression is writable (for example,
+	 * it is a variable or property reference).
+	 * @param expression the expression to evaluate
 	 * @param expectedValue the expected result for evaluating the expression
 	 * @param expectedClassOfResult the expected class of the evaluation result
 	 * @param shouldBeWritable should the parsed expression be writable?
 	 */
-	public void evaluate(String expression, Object expectedValue, Class<?> expectedClassOfResult,
-			boolean shouldBeWritable) {
-		try {
-			Expression e = parser.parseExpression(expression);
-			if (e == null) {
-				fail("Parser returned null for expression");
-			}
-			if (DEBUG) {
-				SpelUtilities.printAbstractSyntaxTree(System.out, e);
-			}
-			Object value = e.getValue(eContext);
-			if (value == null) {
-				if (expectedValue == null)
-					return; // no point doing other
-				// checks
-				assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue,
-						null);
-			}
-			Class<? extends Object> resultType = value.getClass();
-			if (expectedValue instanceof String) {
-				assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue,
-						ExpressionTestCase.stringValueOf(value));
-			} else {
-				assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
+	public void evaluate(String expression, Object expectedValue, Class<?> expectedClassOfResult, boolean shouldBeWritable) {
+		Expression expr = parser.parseExpression(expression);
+		if (expr == null) {
+			fail("Parser returned null for expression");
+		}
+		if (DEBUG) {
+			SpelUtilities.printAbstractSyntaxTree(System.out, expr);
+		}
+		Object value = expr.getValue(eContext);
+		if (value == null) {
+			if (expectedValue == null) {
+				return;  // no point doing other checks
 			}
-//			assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue,
-//					ExpressionTestCase.stringValueOf(value));
-			assertEquals("Type of the result was not as expected.  Expected '" + expectedClassOfResult
-					+ "' but result was of type '" + resultType + "'", expectedClassOfResult
-					.equals/* isAssignableFrom */(resultType), true);
-			// TODO isAssignableFrom would allow some room for compatibility
-			// in the above expression...
+			assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue, null);
+		}
+		Class<? extends Object> resultType = value.getClass();
+		if (expectedValue instanceof String) {
+			assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue,
+					ExpressionTestCase.stringValueOf(value));
+		}
+		else {
+			assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
+		}
+		assertEquals("Type of the result was not as expected.  Expected '" + expectedClassOfResult +
+				"' but result was of type '" + resultType + "'", expectedClassOfResult.equals(resultType), true);
 
-			boolean isWritable = e.isWritable(eContext);
-			if (isWritable != shouldBeWritable) {
-				if (shouldBeWritable)
-					fail("Expected the expression to be writable but it is not");
-				else
-					fail("Expected the expression to be readonly but it is not");
-			}
-		} catch (EvaluationException ee) {
-			ee.printStackTrace();
-			fail("Unexpected Exception: " + ee.getMessage());
-		} catch (ParseException pe) {
-			pe.printStackTrace();
-			fail("Unexpected Exception: " + pe.getMessage());
+		boolean isWritable = expr.isWritable(eContext);
+		if (isWritable != shouldBeWritable) {
+			if (shouldBeWritable)
+				fail("Expected the expression to be writable but it is not");
+			else
+				fail("Expected the expression to be readonly but it is not");
 		}
 	}
 
 	/**
-	 * Evaluate the specified expression and ensure the expected message comes out. The message may have inserts and
-	 * they will be checked if otherProperties is specified. The first entry in otherProperties should always be the
-	 * position.
-	 * @param expression The expression to evaluate
-	 * @param expectedMessage The expected message
-	 * @param otherProperties The expected inserts within the message
+	 * Evaluate the specified expression and ensure the expected message comes out.
+	 * The message may have inserts and they will be checked if otherProperties is specified.
+	 * The first entry in otherProperties should always be the position.
+	 * @param expression the expression to evaluate
+	 * @param expectedMessage the expected message
+	 * @param otherProperties the expected inserts within the message
 	 */
 	protected void evaluateAndCheckError(String expression, SpelMessage expectedMessage, Object... otherProperties) {
 		evaluateAndCheckError(expression, null, expectedMessage, otherProperties);
 	}
 
 	/**
-	 * Evaluate the specified expression and ensure the expected message comes out. The message may have inserts and
-	 * they will be checked if otherProperties is specified. The first entry in otherProperties should always be the
-	 * position.
-	 * @param expression The expression to evaluate
-	 * @param expectedReturnType Ask the expression return value to be of this type if possible (null indicates don't
-	 * ask for conversion)
-	 * @param expectedMessage The expected message
-	 * @param otherProperties The expected inserts within the message
+	 * Evaluate the specified expression and ensure the expected message comes out.
+	 * The message may have inserts and they will be checked if otherProperties is specified.
+	 * The first entry in otherProperties should always be the position.
+	 * @param expression the expression to evaluate
+	 * @param expectedReturnType ask the expression return value to be of this type if possible
+	 * ({@code null} indicates don't ask for conversion)
+	 * @param expectedMessage the expected message
+	 * @param otherProperties the expected inserts within the message
 	 */
 	protected void evaluateAndCheckError(String expression, Class<?> expectedReturnType, SpelMessage expectedMessage,
 			Object... otherProperties) {
@@ -226,18 +184,16 @@ protected void evaluateAndCheckError(String expression, Class<?> expectedReturnT
 				fail("Parser returned null for expression");
 			}
 			if (expectedReturnType != null) {
-				@SuppressWarnings("unused")
-				Object value = expr.getValue(eContext, expectedReturnType);
-			} else {
-				@SuppressWarnings("unused")
-				Object value = expr.getValue(eContext);
+				expr.getValue(eContext, expectedReturnType);
+			}
+			else {
+				expr.getValue(eContext);
 			}
 			fail("Should have failed with message " + expectedMessage);
-		} catch (EvaluationException ee) {
+		}
+		catch (EvaluationException ee) {
 			SpelEvaluationException ex = (SpelEvaluationException) ee;
 			if (ex.getMessageCode() != expectedMessage) {
-//				System.out.println(ex.getMessage());
-				ex.printStackTrace();
 				assertEquals("Failed to get expected message", expectedMessage, ex.getMessageCode());
 			}
 			if (otherProperties != null && otherProperties.length != 0) {
@@ -251,66 +207,49 @@ protected void evaluateAndCheckError(String expression, Class<?> expectedReturnT
 						inserts = new Object[0];
 					}
 					if (inserts.length < otherProperties.length - 1) {
-						ex.printStackTrace();
-						fail("Cannot check " + (otherProperties.length - 1)
-								+ " properties of the exception, it only has " + inserts.length + " inserts");
+						fail("Cannot check " + (otherProperties.length - 1) +
+								" properties of the exception, it only has " + inserts.length + " inserts");
 					}
 					for (int i = 1; i < otherProperties.length; i++) {
 						if (otherProperties[i] == null) {
 							if (inserts[i - 1] != null) {
-								ex.printStackTrace();
-								fail("Insert does not match, expected 'null' but insert value was '" + inserts[i - 1]
-										+ "'");
+								fail("Insert does not match, expected 'null' but insert value was '" +
+										inserts[i - 1] + "'");
 							}
-						} else if (inserts[i - 1] == null) {
+						}
+						else if (inserts[i - 1] == null) {
 							if (otherProperties[i] != null) {
-								ex.printStackTrace();
-								fail("Insert does not match, expected '" + otherProperties[i]
-										+ "' but insert value was 'null'");
+								fail("Insert does not match, expected '" + otherProperties[i] +
+										"' but insert value was 'null'");
 							}
-						} else if (!inserts[i - 1].equals(otherProperties[i])) {
-							ex.printStackTrace();
-							fail("Insert does not match, expected '" + otherProperties[i] + "' but insert value was '"
-									+ inserts[i - 1] + "'");
+						}
+						else if (!inserts[i - 1].equals(otherProperties[i])) {
+							fail("Insert does not match, expected '" + otherProperties[i] +
+									"' but insert value was '" + inserts[i - 1] + "'");
 						}
 					}
 				}
 			}
-		} catch (ParseException pe) {
-			pe.printStackTrace();
-			fail("Unexpected Exception: " + pe.getMessage());
 		}
 	}
 
 	/**
-	 * Parse the specified expression and ensure the expected message comes out. The message may have inserts and they
-	 * will be checked if otherProperties is specified. The first entry in otherProperties should always be the
-	 * position.
-	 * @param expression The expression to evaluate
-	 * @param expectedMessage The expected message
-	 * @param otherProperties The expected inserts within the message
+	 * Parse the specified expression and ensure the expected message comes out.
+	 * The message may have inserts and they will be checked if otherProperties is specified.
+	 * The first entry in otherProperties should always be the position.
+	 * @param expression the expression to evaluate
+	 * @param expectedMessage the expected message
+	 * @param otherProperties the expected inserts within the message
 	 */
 	protected void parseAndCheckError(String expression, SpelMessage expectedMessage, Object... otherProperties) {
 		try {
 			Expression expr = parser.parseExpression(expression);
 			SpelUtilities.printAbstractSyntaxTree(System.out, expr);
 			fail("Parsing should have failed!");
-		} catch (ParseException pe) {
-//			pe.printStackTrace();
-//			Throwable t = pe.getCause();
-//			if (t == null) {
-//				fail("ParseException caught with no defined cause");
-//			}
-//			if (!(t instanceof SpelEvaluationException)) {
-//				t.printStackTrace();
-//				fail("Cause of parse exception is not a SpelException");
-//			}
-//			SpelEvaluationException ex = (SpelEvaluationException) t;
-//			pe.printStackTrace();
+		}
+		catch (ParseException pe) {
 			SpelParseException ex = (SpelParseException)pe;
 			if (ex.getMessageCode() != expectedMessage) {
-//				System.out.println(ex.getMessage());
-				ex.printStackTrace();
 				assertEquals("Failed to get expected message", expectedMessage, ex.getMessageCode());
 			}
 			if (otherProperties != null && otherProperties.length != 0) {
@@ -324,15 +263,13 @@ protected void parseAndCheckError(String expression, SpelMessage expectedMessage
 						inserts = new Object[0];
 					}
 					if (inserts.length < otherProperties.length - 1) {
-						ex.printStackTrace();
-						fail("Cannot check " + (otherProperties.length - 1)
-								+ " properties of the exception, it only has " + inserts.length + " inserts");
+						fail("Cannot check " + (otherProperties.length - 1) +
+								" properties of the exception, it only has " + inserts.length + " inserts");
 					}
 					for (int i = 1; i < otherProperties.length; i++) {
 						if (!inserts[i - 1].equals(otherProperties[i])) {
-							ex.printStackTrace();
-							fail("Insert does not match, expected '" + otherProperties[i] + "' but insert value was '"
-									+ inserts[i - 1] + "'");
+							fail("Insert does not match, expected '" + otherProperties[i] +
+									"' but insert value was '" + inserts[i - 1] + "'");
 						}
 					}
 				}
@@ -340,12 +277,13 @@ protected void parseAndCheckError(String expression, SpelMessage expectedMessage
 		}
 	}
 
+
 	public static String stringValueOf(Object value) {
 		return stringValueOf(value, false);
 	}
+
 	/**
 	 * Produce a nice string representation of the input object.
-	 *
 	 * @param value object to be formatted
 	 * @return a nice string
 	 */
@@ -368,7 +306,8 @@ public static String stringValueOf(Object value, boolean isNested) {
 						sb.append(stringValueOf(l[j]));
 					}
 					sb.append("}");
-				} else if (primitiveType == Long.TYPE) {
+				}
+				else if (primitiveType == Long.TYPE) {
 					long[] l = (long[]) value;
 					sb.append("long[").append(l.length).append("]{");
 					for (int j = 0; j < l.length; j++) {
@@ -378,11 +317,13 @@ public static String stringValueOf(Object value, boolean isNested) {
 						sb.append(stringValueOf(l[j]));
 					}
 					sb.append("}");
-				} else {
-					throw new RuntimeException("Please implement support for type " + primitiveType.getName()
-							+ " in ExpressionTestCase.stringValueOf()");
 				}
-			} else if (value.getClass().getComponentType().isArray()) {
+				else {
+					throw new RuntimeException("Please implement support for type " + primitiveType.getName() +
+							" in ExpressionTestCase.stringValueOf()");
+				}
+			}
+			else if (value.getClass().getComponentType().isArray()) {
 				List<Object> l = Arrays.asList((Object[]) value);
 				if (!isNested) {
 					sb.append(value.getClass().getComponentType().getName());
@@ -397,7 +338,8 @@ public static String stringValueOf(Object value, boolean isNested) {
 					sb.append(stringValueOf(object, true));
 				}
 				sb.append("}");
-			} else {
+			}
+			else {
 				List<Object> l = Arrays.asList((Object[]) value);
 				if (!isNested) {
 					sb.append(value.getClass().getComponentType().getName());
@@ -414,7 +356,8 @@ public static String stringValueOf(Object value, boolean isNested) {
 				sb.append("}");
 			}
 			return sb.toString();
-		} else {
+		}
+		else {
 			return value.toString();
 		}
 	}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionWithConversionTests.java
similarity index 84%
rename from spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
rename to spring-expression/src/test/java/org/springframework/expression/spel/ExpressionWithConversionTests.java
index f7c8e4ac06..5b73e2ede7 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionWithConversionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,6 @@
 
 package org.springframework.expression.spel;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -27,6 +23,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
@@ -36,6 +33,8 @@
 import org.springframework.expression.TypeConverter;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 
+import static org.junit.Assert.*;
+
 /**
  * Expression evaluation where the TypeConverter plugged in is the
  * {@link org.springframework.core.convert.support.GenericConversionService}.
@@ -43,7 +42,7 @@
  * @author Andy Clement
  * @author Dave Syer
  */
-public class ExpressionTestsUsingCoreConversionService extends ExpressionTestCase {
+public class ExpressionWithConversionTests extends ExpressionTestCase {
 
 	private static List<String> listOfString = new ArrayList<String>();
 	private static TypeDescriptor typeDescriptorForListOfString = null;
@@ -61,8 +60,8 @@ public class ExpressionTestsUsingCoreConversionService extends ExpressionTestCas
 
 	@Before
 	public void setUp() throws Exception {
-		ExpressionTestsUsingCoreConversionService.typeDescriptorForListOfString = new TypeDescriptor(ExpressionTestsUsingCoreConversionService.class.getDeclaredField("listOfString"));
-		ExpressionTestsUsingCoreConversionService.typeDescriptorForListOfInteger = new TypeDescriptor(ExpressionTestsUsingCoreConversionService.class.getDeclaredField("listOfInteger"));
+		ExpressionWithConversionTests.typeDescriptorForListOfString = new TypeDescriptor(ExpressionWithConversionTests.class.getDeclaredField("listOfString"));
+		ExpressionWithConversionTests.typeDescriptorForListOfInteger = new TypeDescriptor(ExpressionWithConversionTests.class.getDeclaredField("listOfInteger"));
 	}
 
 
@@ -133,45 +132,37 @@ public int sum(Collection<Integer> numbers) {
 
 	}
 
-	public static class Foo {
-
-		private Collection<Foo> foos;
-
-		public final String value;
-
-		public Foo(String value) {
-			this.value = value;
-		}
-
-		public void setFoos(Collection<Foo> foos) {
-			this.foos = foos;
-		}
-
-		public Collection<Foo> getFoos() {
-			return this.foos;
-		}
-
-	}
-
 	@Test
 	public void testConvert() {
 		Foo root = new Foo("bar");
-		StandardEvaluationContext context = new StandardEvaluationContext(root);
-
 		Collection<String> foos = Collections.singletonList("baz");
 
-		// property access, works
+		StandardEvaluationContext context = new StandardEvaluationContext(root);
+
+		// property access
 		Expression expression = parser.parseExpression("foos");
 		expression.setValue(context, foos);
 		Foo baz = root.getFoos().iterator().next();
 		assertEquals("baz", baz.value);
 
-		// method call, fails (ClassCastException)
+		// method call
 		expression = parser.parseExpression("setFoos(#foos)");
 		context.setVariable("foos", foos);
 		expression.getValue(context);
 		baz = root.getFoos().iterator().next();
 		assertEquals("baz", baz.value);
+
+		// method call with result from method call
+		expression = parser.parseExpression("setFoos(getFoosAsStrings())");
+		expression.getValue(context);
+		baz = root.getFoos().iterator().next();
+		assertEquals("baz", baz.value);
+
+		// method call with result from method call
+		expression = parser.parseExpression("setFoos(getFoosAsObjects())");
+		expression.getValue(context);
+		baz = root.getFoos().iterator().next();
+		assertEquals("baz", baz.value);
 	}
 
 
@@ -193,4 +184,32 @@ public Object convertValue(Object value, TypeDescriptor sourceType, TypeDescript
 		}
 	}
 
+
+	public static class Foo {
+
+		public final String value;
+
+		private Collection<Foo> foos;
+
+		public Foo(String value) {
+			this.value = value;
+		}
+
+		public void setFoos(Collection<Foo> foos) {
+			this.foos = foos;
+		}
+
+		public Collection<Foo> getFoos() {
+			return this.foos;
+		}
+
+		public Collection<String> getFoosAsStrings() {
+			return Collections.singletonList("baz");
+		}
+
+		public Collection<?> getFoosAsObjects() {
+			return Collections.singletonList("baz");
+		}
+	}
+
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java
index 6118c82af9..e579ccd466 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,11 @@
 
 package org.springframework.expression.spel;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
+
 import org.springframework.expression.AccessException;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
@@ -32,6 +30,8 @@
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 
+import static org.junit.Assert.*;
+
 /**
  * Testing variations on map access.
  *
@@ -73,64 +73,70 @@ public void testVariableMapAccess() throws Exception {
 
 	@Test
 	public void testGetValue(){
-
-		Map props1= new HashMap<String,String>();
+		Map<String,String> props1 = new HashMap<String,String>();
 		props1.put("key1", "value1");
 		props1.put("key2", "value2");
 		props1.put("key3", "value3");
 
-
-		Object bean = new TestBean("name1",new TestBean("name2",null,"Description 2",15,props1),"description 1", 6,props1);
+		Object bean = new TestBean("name1", new TestBean("name2", null, "Description 2", 15, props1), "description 1", 6, props1);
 
 		ExpressionParser parser = new SpelExpressionParser();
-		Expression exp = parser.parseExpression("testBean.properties['key2']");
-		String key = (String) exp.getValue(bean);
-		assertNotNull(key);
+		Expression expr = parser.parseExpression("testBean.properties['key2']");
+		assertEquals("value2", expr.getValue(bean));
+	}
 
+	@Test
+	public void testGetValueFromRootMap() {
+		Map<String, String> map = new HashMap<String, String>();
+		map.put("key", "value");
+		EvaluationContext context = new StandardEvaluationContext(map);
+
+		ExpressionParser spelExpressionParser = new SpelExpressionParser();
+		Expression expr = spelExpressionParser.parseExpression("#root['key']");
+		assertEquals("value", expr.getValue(map));
 	}
 
-	public static class TestBean
-	{
+
+	public static class TestBean {
+
 		private String name;
 		private TestBean testBean;
 		private String description;
 		private Integer priority;
-		private Map properties;
-
+		private Map<String, String> properties;
 
-		public TestBean() {
-			super();
-		}
-
-		public TestBean(String name, TestBean testBean, String description,Integer priority,Map props) {
-			super();
+		public TestBean(String name, TestBean testBean, String description, Integer priority, Map<String, String> props) {
 			this.name = name;
 			this.testBean = testBean;
 			this.description = description;
-			this.priority=priority;
-			this.properties=props;
+			this.priority = priority;
+			this.properties = props;
 		}
 
 		public String getName() {
 			return name;
 		}
+
 		public void setName(String name) {
 			this.name = name;
 		}
+
 		public TestBean getTestBean() {
 			return testBean;
 		}
+
 		public void setTestBean(TestBean testBean) {
 			this.testBean = testBean;
 		}
+
 		public String getDescription() {
 			return description;
 		}
+
 		public void setDescription(String description) {
 			this.description = description;
 		}
 
-
 		public Integer getPriority() {
 			return priority;
 		}
@@ -168,16 +174,14 @@ public boolean canWrite(EvaluationContext context, Object target, String name) t
 
 		@Override
 		@SuppressWarnings("unchecked")
-		public void write(EvaluationContext context, Object target, String name, Object newValue)
-				throws AccessException {
+		public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException {
 			((Map) target).put(name, newValue);
 		}
 
 		@Override
 		public Class<?>[] getSpecificTargetClasses() {
-			return new Class[] { Map.class };
+			return new Class<?>[] {Map.class};
 		}
-
 	}
 
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
index 682dfe525e..86723e2a16 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.springframework.expression.spel;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -26,8 +23,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Assert;
 import org.junit.Test;
+
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.AccessException;
 import org.springframework.expression.BeanResolver;
@@ -42,6 +39,8 @@
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.expression.spel.testresources.PlaceOfBirth;
 
+import static org.junit.Assert.*;
+
 /**
  * Tests invocation of methods.
  *
@@ -55,17 +54,6 @@ public void testSimpleAccess01() {
 		evaluate("getPlaceOfBirth().getCity()", "SmilJan", String.class);
 	}
 
-	// public void testBuiltInProcessors() {
-	// evaluate("new int[]{1,2,3,4}.count()", 4, Integer.class);
-	// evaluate("new int[]{4,3,2,1}.sort()[3]", 4, Integer.class);
-	// evaluate("new int[]{4,3,2,1}.average()", 2, Integer.class);
-	// evaluate("new int[]{4,3,2,1}.max()", 4, Integer.class);
-	// evaluate("new int[]{4,3,2,1}.min()", 1, Integer.class);
-	// evaluate("new int[]{4,3,2,1,2,3}.distinct().count()", 4, Integer.class);
-	// evaluate("{1,2,3,null}.nonnull().count()", 3, Integer.class);
-	// evaluate("new int[]{4,3,2,1,2,3}.distinct().count()", 4, Integer.class);
-	// }
-
 	@Test
 	public void testStringClass() {
 		evaluate("new java.lang.String('hello').charAt(2)", 'l', Character.class);
@@ -108,59 +96,57 @@ public void testMethodThrowingException_SPR6760() {
 
 		// Normal exit
 		StandardEvaluationContext eContext = TestScenarioCreator.getTestEvaluationContext();
-		eContext.setVariable("bar",3);
+		eContext.setVariable("bar", 3);
 		Object o = expr.getValue(eContext);
-		Assert.assertEquals(o,3);
-		Assert.assertEquals(1,parser.parseExpression("counter").getValue(eContext));
+		assertEquals(o, 3);
+		assertEquals(1, parser.parseExpression("counter").getValue(eContext));
 
 		// Now the expression has cached that throwException(int) is the right thing to call
 		// Let's change 'bar' to be a PlaceOfBirth which indicates the cached reference is
 		// out of date.
-		eContext.setVariable("bar",new PlaceOfBirth("London"));
+		eContext.setVariable("bar", new PlaceOfBirth("London"));
 		o = expr.getValue(eContext);
-		Assert.assertEquals("London", o);
+		assertEquals("London", o);
 		// That confirms the logic to mark the cached reference stale and retry is working
 
-
-		// Now let's cause the method to exit via exception and ensure it doesn't cause
-		// a retry.
+		// Now let's cause the method to exit via exception and ensure it doesn't cause a retry.
 
 		// First, switch back to throwException(int)
-		eContext.setVariable("bar",3);
+		eContext.setVariable("bar", 3);
 		o = expr.getValue(eContext);
-		Assert.assertEquals(3, o);
-		Assert.assertEquals(2,parser.parseExpression("counter").getValue(eContext));
+		assertEquals(3, o);
+		assertEquals(2, parser.parseExpression("counter").getValue(eContext));
 
 
 		// Now cause it to throw an exception:
-		eContext.setVariable("bar",1);
+		eContext.setVariable("bar", 1);
 		try {
 			o = expr.getValue(eContext);
-			Assert.fail();
-		} catch (Exception e) {
-			if (e instanceof SpelEvaluationException) {
-				e.printStackTrace();
-				Assert.fail("Should not be a SpelEvaluationException");
+			fail();
+		}
+		catch (Exception ex) {
+			if (ex instanceof SpelEvaluationException) {
+				fail("Should not be a SpelEvaluationException: " + ex);
 			}
 			// normal
 		}
 		// If counter is 4 then the method got called twice!
-		Assert.assertEquals(3,parser.parseExpression("counter").getValue(eContext));
+		assertEquals(3, parser.parseExpression("counter").getValue(eContext));
 
-		eContext.setVariable("bar",4);
+		eContext.setVariable("bar", 4);
 		try {
 			o = expr.getValue(eContext);
-			Assert.fail();
-		} catch (Exception e) {
+			fail();
+		}
+		catch (Exception ex) {
 			// 4 means it will throw a checked exception - this will be wrapped
-			if (!(e instanceof ExpressionInvocationTargetException)) {
-				e.printStackTrace();
-				Assert.fail("Should have been wrapped");
+			if (!(ex instanceof ExpressionInvocationTargetException)) {
+				fail("Should have been wrapped: " + ex);
 			}
 			// normal
 		}
 		// If counter is 5 then the method got called twice!
-		Assert.assertEquals(4,parser.parseExpression("counter").getValue(eContext));
+		assertEquals(4, parser.parseExpression("counter").getValue(eContext));
 	}
 
 	/**
@@ -177,14 +163,14 @@ public void testMethodThrowingException_SPR6941() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expr = parser.parseExpression("throwException(#bar)");
 
-		eContext.setVariable("bar",2);
+		eContext.setVariable("bar", 2);
 		try {
 			expr.getValue(eContext);
-			Assert.fail();
-		} catch (Exception e) {
-			if (e instanceof SpelEvaluationException) {
-				e.printStackTrace();
-				Assert.fail("Should not be a SpelEvaluationException");
+			fail();
+		}
+		catch (Exception ex) {
+			if (ex instanceof SpelEvaluationException) {
+				fail("Should not be a SpelEvaluationException: " + ex);
 			}
 			// normal
 		}
@@ -201,16 +187,16 @@ public void testMethodThrowingException_SPR6941_2() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expr = parser.parseExpression("throwException(#bar)");
 
-		eContext.setVariable("bar",4);
+		eContext.setVariable("bar", 4);
 		try {
 			expr.getValue(eContext);
-			Assert.fail();
-		} catch (ExpressionInvocationTargetException e) {
-			Throwable t = e.getCause();
-			Assert.assertEquals("org.springframework.expression.spel.testresources.Inventor$TestException", t.getClass().getName());
-			return;
+			fail();
+		}
+		catch (ExpressionInvocationTargetException ex) {
+			Throwable cause = ex.getCause();
+			assertEquals("org.springframework.expression.spel.testresources.Inventor$TestException",
+					cause.getClass().getName());
 		}
-		Assert.fail("Should not be a SpelEvaluationException");
 	}
 
 	@Test
@@ -223,87 +209,34 @@ public void testMethodFiltering_SPR6764() {
 
 		// Filter will be called but not do anything, so first doit() will be invoked
 		SpelExpression expr = (SpelExpression) parser.parseExpression("doit(1)");
-		String result = expr.getValue(context,String.class);
-		Assert.assertEquals("1",result);
-		Assert.assertTrue(filter.filterCalled);
+		String result = expr.getValue(context, String.class);
+		assertEquals("1", result);
+		assertTrue(filter.filterCalled);
 
 		// Filter will now remove non @Anno annotated methods
 		filter.removeIfNotAnnotated = true;
 		filter.filterCalled = false;
 		expr = (SpelExpression) parser.parseExpression("doit(1)");
-		result = expr.getValue(context,String.class);
-		Assert.assertEquals("double 1.0",result);
-		Assert.assertTrue(filter.filterCalled);
+		result = expr.getValue(context, String.class);
+		assertEquals("double 1.0", result);
+		assertTrue(filter.filterCalled);
 
 		// check not called for other types
-		filter.filterCalled=false;
+		filter.filterCalled = false;
 		context.setRootObject(new String("abc"));
 		expr = (SpelExpression) parser.parseExpression("charAt(0)");
-		result = expr.getValue(context,String.class);
-		Assert.assertEquals("a",result);
-		Assert.assertFalse(filter.filterCalled);
+		result = expr.getValue(context, String.class);
+		assertEquals("a", result);
+		assertFalse(filter.filterCalled);
 
 		// check de-registration works
 		filter.filterCalled = false;
 		context.registerMethodFilter(TestObject.class,null);//clear filter
 		context.setRootObject(new TestObject());
 		expr = (SpelExpression) parser.parseExpression("doit(1)");
-		result = expr.getValue(context,String.class);
-		Assert.assertEquals("1",result);
-		Assert.assertFalse(filter.filterCalled);
-	}
-
-	// Simple filter
-	static class LocalFilter implements MethodFilter {
-
-		public boolean removeIfNotAnnotated = false;
-
-		public boolean filterCalled = false;
-
-		private boolean isAnnotated(Method m) {
-			Annotation[] annos = m.getAnnotations();
-			if (annos==null) {
-				return false;
-			}
-			for (Annotation anno: annos) {
-				String s = anno.annotationType().getName();
-				if (s.endsWith("Anno")) {
-					return true;
-				}
-			}
-			return false;
-		}
-
-		@Override
-		public List<Method> filter(List<Method> methods) {
-			filterCalled = true;
-			List<Method> forRemoval = new ArrayList<Method>();
-			for (Method m: methods) {
-				if (removeIfNotAnnotated && !isAnnotated(m)) {
-					forRemoval.add(m);
-				}
-			}
-			for (Method m: forRemoval) {
-				methods.remove(m);
-			}
-			return methods;
-		}
-
-	}
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@interface Anno {}
-
-	class TestObject {
-		public int doit(int i) {
-			return i;
-		}
-
-		@Anno
-		public String doit(double d) {
-			return "double "+d;
-		}
-
+		result = expr.getValue(context, String.class);
+		assertEquals("1", result);
+		assertFalse(filter.filterCalled);
 	}
 
 	@Test
@@ -312,33 +245,22 @@ public void testAddingMethodResolvers() {
 
 		// reflective method accessor is the only one by default
 		List<MethodResolver> methodResolvers = ctx.getMethodResolvers();
-		Assert.assertEquals(1,methodResolvers.size());
+		assertEquals(1, methodResolvers.size());
 
 		MethodResolver dummy = new DummyMethodResolver();
 		ctx.addMethodResolver(dummy);
-		Assert.assertEquals(2,ctx.getMethodResolvers().size());
+		assertEquals(2, ctx.getMethodResolvers().size());
 
 		List<MethodResolver> copy = new ArrayList<MethodResolver>();
 		copy.addAll(ctx.getMethodResolvers());
-		Assert.assertTrue(ctx.removeMethodResolver(dummy));
-		Assert.assertFalse(ctx.removeMethodResolver(dummy));
-		Assert.assertEquals(1,ctx.getMethodResolvers().size());
+		assertTrue(ctx.removeMethodResolver(dummy));
+		assertFalse(ctx.removeMethodResolver(dummy));
+		assertEquals(1, ctx.getMethodResolvers().size());
 
 		ctx.setMethodResolvers(copy);
-		Assert.assertEquals(2,ctx.getMethodResolvers().size());
-	}
-
-	static class DummyMethodResolver implements MethodResolver {
-
-		@Override
-		public MethodExecutor resolve(EvaluationContext context, Object targetObject, String name,
-				List<TypeDescriptor> argumentTypes) throws AccessException {
-			throw new UnsupportedOperationException("Auto-generated method stub");
-		}
-
+		assertEquals(2, ctx.getMethodResolvers().size());
 	}
 
-
 	@Test
 	public void testVarargsInvocation01() {
 		// Calling 'public int aVarargsMethod(String... strings)'
@@ -382,8 +304,7 @@ public void invokeMethodWithoutConversion() throws Exception {
 		StandardEvaluationContext context = new StandardEvaluationContext(bytes);
 		context.setBeanResolver(new BeanResolver() {
 			@Override
-			public Object resolve(EvaluationContext context, String beanName)
-					throws AccessException {
+			public Object resolve(EvaluationContext context, String beanName) throws AccessException {
 				if ("service".equals(beanName)) {
 					return service;
 				}
@@ -395,10 +316,78 @@ public Object resolve(EvaluationContext context, String beanName)
 		assertSame(bytes, outBytes);
 	}
 
+
+	// Simple filter
+	static class LocalFilter implements MethodFilter {
+
+		public boolean removeIfNotAnnotated = false;
+
+		public boolean filterCalled = false;
+
+		private boolean isAnnotated(Method method) {
+			Annotation[] anns = method.getAnnotations();
+			if (anns == null) {
+				return false;
+			}
+			for (Annotation ann : anns) {
+				String name = ann.annotationType().getName();
+				if (name.endsWith("Anno")) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		@Override
+		public List<Method> filter(List<Method> methods) {
+			filterCalled = true;
+			List<Method> forRemoval = new ArrayList<Method>();
+			for (Method method: methods) {
+				if (removeIfNotAnnotated && !isAnnotated(method)) {
+					forRemoval.add(method);
+				}
+			}
+			for (Method method: forRemoval) {
+				methods.remove(method);
+			}
+			return methods;
+		}
+	}
+
+
+	@Retention(RetentionPolicy.RUNTIME)
+	@interface Anno {
+	}
+
+
+	class TestObject {
+
+		public int doit(int i) {
+			return i;
+		}
+
+		@Anno
+		public String doit(double d) {
+			return "double "+d;
+		}
+	}
+
+
+	static class DummyMethodResolver implements MethodResolver {
+
+		@Override
+		public MethodExecutor resolve(EvaluationContext context, Object targetObject, String name,
+				List<TypeDescriptor> argumentTypes) throws AccessException {
+			throw new UnsupportedOperationException();
+		}
+	}
+
+
 	public static class BytesService {
 
 		public byte[] handleBytes(byte[] bytes) {
 			return bytes;
 		}
 	}
+
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
index e6e28eedd3..2ce8660a75 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,28 +16,27 @@
 
 package org.springframework.expression.spel;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
+import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+
+import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.AccessException;
 import org.springframework.expression.BeanResolver;
@@ -58,6 +57,9 @@
 import org.springframework.expression.spel.support.StandardTypeLocator;
 import org.springframework.expression.spel.testresources.le.div.mod.reserved.Reserver;
 
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Reproduction tests cornering various SpEL JIRA issues.
  *
@@ -65,139 +67,165 @@
  * @author Juergen Hoeller
  * @author Clark Duplichien
  * @author Phillip Webb
+ * @author Sam Brannen
  */
 public class SpelReproTests extends ExpressionTestCase {
 
 	@Rule
 	public ExpectedException thrown = ExpectedException.none();
 
+
 	@Test
-	public void testNPE_SPR5661() {
+	public void NPE_SPR5661() {
 		evaluate("joinThreeStrings('a',null,'c')", "anullc", String.class);
 	}
 
 	@Test
-	@Ignore
-	public void testSWF1086() {
-		evaluate("printDouble(T(java.math.BigDecimal).valueOf(14.35))", "anullc", String.class);
+	public void SWF1086() {
+		evaluate("printDouble(T(java.math.BigDecimal).valueOf(14.35))", "14.35", String.class);
 	}
 
 	@Test
-	public void testDoubleCoercion() {
+	public void doubleCoercion() {
 		evaluate("printDouble(14.35)", "14.35", String.class);
 	}
 
 	@Test
-	public void testDoubleArrayCoercion() {
+	public void doubleArrayCoercion() {
 		evaluate("printDoubles(getDoublesAsStringList())", "{14.35, 15.45}", String.class);
 	}
 
 	@Test
-	public void testSPR5899() throws Exception {
+	public void SPR5899() throws Exception {
 		StandardEvaluationContext eContext = new StandardEvaluationContext(new Spr5899Class());
 		Expression expr = new SpelExpressionParser().parseRaw("tryToInvokeWithNull(12)");
-		assertEquals(12,expr.getValue(eContext));
+		assertEquals(12, expr.getValue(eContext));
 		expr = new SpelExpressionParser().parseRaw("tryToInvokeWithNull(null)");
-		assertEquals(null,expr.getValue(eContext));
+		assertEquals(null, expr.getValue(eContext));
 		try {
 			expr = new SpelExpressionParser().parseRaw("tryToInvokeWithNull2(null)");
 			expr.getValue();
 			fail("Should have failed to find a method to which it could pass null");
-		} catch (EvaluationException see) {
+		}
+		catch (EvaluationException see) {
 			// success
 		}
 		eContext.setTypeLocator(new MyTypeLocator());
 
 		// varargs
 		expr = new SpelExpressionParser().parseRaw("tryToInvokeWithNull3(null,'a','b')");
-		assertEquals("ab",expr.getValue(eContext));
+		assertEquals("ab", expr.getValue(eContext));
 
 		// varargs 2 - null is packed into the varargs
 		expr = new SpelExpressionParser().parseRaw("tryToInvokeWithNull3(12,'a',null,'c')");
-		assertEquals("anullc",expr.getValue(eContext));
+		assertEquals("anullc", expr.getValue(eContext));
 
 		// check we can find the ctor ok
 		expr = new SpelExpressionParser().parseRaw("new Spr5899Class().toString()");
-		assertEquals("instance",expr.getValue(eContext));
+		assertEquals("instance", expr.getValue(eContext));
 
 		expr = new SpelExpressionParser().parseRaw("new Spr5899Class(null).toString()");
-		assertEquals("instance",expr.getValue(eContext));
+		assertEquals("instance", expr.getValue(eContext));
 
 		// ctor varargs
 		expr = new SpelExpressionParser().parseRaw("new Spr5899Class(null,'a','b').toString()");
-		assertEquals("instance",expr.getValue(eContext));
+		assertEquals("instance", expr.getValue(eContext));
 
 		// ctor varargs 2
 		expr = new SpelExpressionParser().parseRaw("new Spr5899Class(null,'a', null, 'b').toString()");
-		assertEquals("instance",expr.getValue(eContext));
+		assertEquals("instance", expr.getValue(eContext));
 	}
 
+
 	static class MyTypeLocator extends StandardTypeLocator {
 
 		@Override
-		public Class<?> findType(String typename) throws EvaluationException {
-			if (typename.equals("Spr5899Class")) {
+		public Class<?> findType(String typeName) throws EvaluationException {
+			if (typeName.equals("Spr5899Class")) {
 				return Spr5899Class.class;
 			}
-			if (typename.equals("Outer")) {
+			if (typeName.equals("Outer")) {
 				return Outer.class;
 			}
-			return super.findType(typename);
+			return super.findType(typeName);
 		}
 	}
 
+
 	static class Spr5899Class {
-		 public Spr5899Class() {}
-		 public Spr5899Class(Integer i) { }
-		 public Spr5899Class(Integer i, String... s) { }
-
-		 public Integer tryToInvokeWithNull(Integer value) { return value; }
-		 public Integer tryToInvokeWithNull2(int i) { return new Integer(i); }
-		 public String tryToInvokeWithNull3(Integer value,String... strings) {
-			 StringBuilder sb = new StringBuilder();
-			 for (int i=0;i<strings.length;i++) {
-				 if (strings[i]==null) {
-					 sb.append("null");
-				 } else {
-					 sb.append(strings[i]);
-				 }
-			 }
-			 return sb.toString();
-		 }
-
-		 public String toString() {
-			 return "instance";
-		 }
-	}
-
-	@Test
-	public void testSPR5905_InnerTypeReferences() throws Exception {
+
+		public Spr5899Class() {
+		}
+
+		public Spr5899Class(Integer i) {
+		}
+
+		public Spr5899Class(Integer i, String... s) {
+		}
+
+		public Integer tryToInvokeWithNull(Integer value) {
+			return value;
+		}
+
+		public Integer tryToInvokeWithNull2(int i) {
+			return new Integer(i);
+		}
+
+		public String tryToInvokeWithNull3(Integer value, String... strings) {
+			StringBuilder sb = new StringBuilder();
+			for (String string : strings) {
+				if (string == null) {
+					sb.append("null");
+				}
+				else {
+					sb.append(string);
+				}
+			}
+			return sb.toString();
+		}
+
+		@Override
+		public String toString() {
+			return "instance";
+		}
+	}
+
+
+	@Test
+	public void SPR5905_InnerTypeReferences() throws Exception {
 		StandardEvaluationContext eContext = new StandardEvaluationContext(new Spr5899Class());
 		Expression expr = new SpelExpressionParser().parseRaw("T(java.util.Map$Entry)");
-		assertEquals(Map.Entry.class,expr.getValue(eContext));
+		assertEquals(Map.Entry.class, expr.getValue(eContext));
 
 		expr = new SpelExpressionParser().parseRaw("T(org.springframework.expression.spel.SpelReproTests$Outer$Inner).run()");
-		assertEquals(12,expr.getValue(eContext));
+		assertEquals(12, expr.getValue(eContext));
 
 		expr = new SpelExpressionParser().parseRaw("new org.springframework.expression.spel.SpelReproTests$Outer$Inner().run2()");
-		assertEquals(13,expr.getValue(eContext));
+		assertEquals(13, expr.getValue(eContext));
 	}
 
+
 	static class Outer {
+
 		static class Inner {
-			public Inner() {}
+
+			public Inner() {
+			}
+
 			public static int run() {
 				return 12;
 			}
+
 			public int run2() {
 				return 13;
 			}
 		}
 	}
 
+
 	@Test
-	public void testSPR5804() throws Exception {
-		Map<String,String> m = new HashMap<String,String>();
+	public void SPR5804() throws Exception {
+		Map<String, String> m = new HashMap<String, String>();
 		m.put("foo", "bar");
 		StandardEvaluationContext eContext = new StandardEvaluationContext(m); // root is a map instance
 		eContext.addPropertyAccessor(new MapAccessor());
@@ -206,61 +234,71 @@ public void testSPR5804() throws Exception {
 	}
 
 	@Test
-	public void testSPR5847() throws Exception {
+	public void SPR5847() throws Exception {
 		StandardEvaluationContext eContext = new StandardEvaluationContext(new TestProperties());
 		String name = null;
 		Expression expr = null;
 
 		expr = new SpelExpressionParser().parseRaw("jdbcProperties['username']");
-		name = expr.getValue(eContext,String.class);
-		assertEquals("Dave",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("Dave", name);
 
 		expr = new SpelExpressionParser().parseRaw("jdbcProperties[username]");
-		name = expr.getValue(eContext,String.class);
-		assertEquals("Dave",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("Dave", name);
 
 		// MapAccessor required for this to work
 		expr = new SpelExpressionParser().parseRaw("jdbcProperties.username");
 		eContext.addPropertyAccessor(new MapAccessor());
-		name = expr.getValue(eContext,String.class);
-		assertEquals("Dave",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("Dave", name);
 
 		// --- dotted property names
 
-		// lookup foo on the root, then bar on that, then use that as the key into jdbcProperties
+		// lookup foo on the root, then bar on that, then use that as the key into
+		// jdbcProperties
 		expr = new SpelExpressionParser().parseRaw("jdbcProperties[foo.bar]");
 		eContext.addPropertyAccessor(new MapAccessor());
-		name = expr.getValue(eContext,String.class);
-		assertEquals("Dave2",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("Dave2", name);
 
 		// key is foo.bar
 		expr = new SpelExpressionParser().parseRaw("jdbcProperties['foo.bar']");
 		eContext.addPropertyAccessor(new MapAccessor());
-		name = expr.getValue(eContext,String.class);
-		assertEquals("Elephant",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("Elephant", name);
 	}
 
+
 	static class TestProperties {
+
 		public Properties jdbcProperties = new Properties();
 		public Properties foo = new Properties();
+
 		TestProperties() {
-			jdbcProperties.put("username","Dave");
-			jdbcProperties.put("alias","Dave2");
-			jdbcProperties.put("foo.bar","Elephant");
-			foo.put("bar","alias");
+			jdbcProperties.put("username", "Dave");
+			jdbcProperties.put("alias", "Dave2");
+			jdbcProperties.put("foo.bar", "Elephant");
+			foo.put("bar", "alias");
 		}
 	}
 
+
 	static class MapAccessor implements PropertyAccessor {
 
+		@Override
+		public Class<?>[] getSpecificTargetClasses() {
+			return new Class<?>[] {Map.class};
+		}
+
 		@Override
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
-			return (((Map<?,?>) target).containsKey(name));
+			return (((Map<?, ?>) target).containsKey(name));
 		}
 
 		@Override
 		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
-			return new TypedValue(((Map<?,?>) target).get(name));
+			return new TypedValue(((Map<?, ?>) target).get(name));
 		}
 
 		@Override
@@ -273,51 +311,46 @@ public boolean canWrite(EvaluationContext context, Object target, String name) t
 		public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException {
 			((Map<String, Object>) target).put(name, newValue);
 		}
-
-		@Override
-		public Class<?>[] getSpecificTargetClasses() {
-			return new Class[] {Map.class};
-		}
-
 	}
 
+
 	@Test
-	public void testNPE_SPR5673() throws Exception {
+	public void NPE_SPR5673() throws Exception {
 		ParserContext hashes = TemplateExpressionParsingTests.HASH_DELIMITED_PARSER_CONTEXT;
 		ParserContext dollars = TemplateExpressionParsingTests.DEFAULT_TEMPLATE_PARSER_CONTEXT;
 
-		checkTemplateParsing("abc${'def'} ghi","abcdef ghi");
-
-		checkTemplateParsingError("abc${ {}( 'abc'","Missing closing ')' for '(' at position 8");
-		checkTemplateParsingError("abc${ {}[ 'abc'","Missing closing ']' for '[' at position 8");
-		checkTemplateParsingError("abc${ {}{ 'abc'","Missing closing '}' for '{' at position 8");
-		checkTemplateParsingError("abc${ ( 'abc' }","Found closing '}' at position 14 but most recent opening is '(' at position 6");
-		checkTemplateParsingError("abc${ '... }","Found non terminating string literal starting at position 6");
-		checkTemplateParsingError("abc${ \"... }","Found non terminating string literal starting at position 6");
-		checkTemplateParsingError("abc${ ) }","Found closing ')' at position 6 without an opening '('");
-		checkTemplateParsingError("abc${ ] }","Found closing ']' at position 6 without an opening '['");
-		checkTemplateParsingError("abc${ } }","No expression defined within delimiter '${}' at character 3");
-		checkTemplateParsingError("abc$[ } ]",DOLLARSQUARE_TEMPLATE_PARSER_CONTEXT,"Found closing '}' at position 6 without an opening '{'");
-
-		checkTemplateParsing("abc ${\"def''g}hi\"} jkl","abc def'g}hi jkl");
-		checkTemplateParsing("abc ${'def''g}hi'} jkl","abc def'g}hi jkl");
-		checkTemplateParsing("}","}");
-		checkTemplateParsing("${'hello'} world","hello world");
-		checkTemplateParsing("Hello ${'}'}]","Hello }]");
-		checkTemplateParsing("Hello ${'}'}","Hello }");
-		checkTemplateParsingError("Hello ${ ( ","No ending suffix '}' for expression starting at character 6: ${ ( ");
-		checkTemplateParsingError("Hello ${ ( }","Found closing '}' at position 11 but most recent opening is '(' at position 9");
-		checkTemplateParsing("#{'Unable to render embedded object: File ({#this == 2}'}", hashes,"Unable to render embedded object: File ({#this == 2}");
-		checkTemplateParsing("This is the last odd number in the list: ${listOfNumbersUpToTen.$[#this%2==1]}",dollars,"This is the last odd number in the list: 9");
-		checkTemplateParsing("Hello ${'here is a curly bracket }'}",dollars,"Hello here is a curly bracket }");
-		checkTemplateParsing("He${'${'}llo ${'here is a curly bracket }'}}",dollars,"He${llo here is a curly bracket }}");
-		checkTemplateParsing("Hello ${'()()()}{}{}{][]{}{][}[][][}{()()'} World",dollars,"Hello ()()()}{}{}{][]{}{][}[][][}{()() World");
-		checkTemplateParsing("Hello ${'inner literal that''s got {[(])]}an escaped quote in it'} World","Hello inner literal that's got {[(])]}an escaped quote in it World");
-		checkTemplateParsingError("Hello ${","No ending suffix '}' for expression starting at character 6: ${");
-	}
-
-	@Test
-	public void testAccessingNullPropertyViaReflection_SPR5663() throws AccessException {
+		checkTemplateParsing("abc${'def'} ghi", "abcdef ghi");
+
+		checkTemplateParsingError("abc${ {}( 'abc'", "Missing closing ')' for '(' at position 8");
+		checkTemplateParsingError("abc${ {}[ 'abc'", "Missing closing ']' for '[' at position 8");
+		checkTemplateParsingError("abc${ {}{ 'abc'", "Missing closing '}' for '{' at position 8");
+		checkTemplateParsingError("abc${ ( 'abc' }", "Found closing '}' at position 14 but most recent opening is '(' at position 6");
+		checkTemplateParsingError("abc${ '... }", "Found non terminating string literal starting at position 6");
+		checkTemplateParsingError("abc${ \"... }", "Found non terminating string literal starting at position 6");
+		checkTemplateParsingError("abc${ ) }", "Found closing ')' at position 6 without an opening '('");
+		checkTemplateParsingError("abc${ ] }", "Found closing ']' at position 6 without an opening '['");
+		checkTemplateParsingError("abc${ } }", "No expression defined within delimiter '${}' at character 3");
+		checkTemplateParsingError("abc$[ } ]", DOLLARSQUARE_TEMPLATE_PARSER_CONTEXT, "Found closing '}' at position 6 without an opening '{'");
+
+		checkTemplateParsing("abc ${\"def''g}hi\"} jkl", "abc def'g}hi jkl");
+		checkTemplateParsing("abc ${'def''g}hi'} jkl", "abc def'g}hi jkl");
+		checkTemplateParsing("}", "}");
+		checkTemplateParsing("${'hello'} world", "hello world");
+		checkTemplateParsing("Hello ${'}'}]", "Hello }]");
+		checkTemplateParsing("Hello ${'}'}", "Hello }");
+		checkTemplateParsingError("Hello ${ ( ", "No ending suffix '}' for expression starting at character 6: ${ ( ");
+		checkTemplateParsingError("Hello ${ ( }", "Found closing '}' at position 11 but most recent opening is '(' at position 9");
+		checkTemplateParsing("#{'Unable to render embedded object: File ({#this == 2}'}", hashes, "Unable to render embedded object: File ({#this == 2}");
+		checkTemplateParsing("This is the last odd number in the list: ${listOfNumbersUpToTen.$[#this%2==1]}", dollars, "This is the last odd number in the list: 9");
+		checkTemplateParsing("Hello ${'here is a curly bracket }'}", dollars, "Hello here is a curly bracket }");
+		checkTemplateParsing("He${'${'}llo ${'here is a curly bracket }'}}", dollars, "He${llo here is a curly bracket }}");
+		checkTemplateParsing("Hello ${'()()()}{}{}{][]{}{][}[][][}{()()'} World", dollars, "Hello ()()()}{}{}{][]{}{][}[][][}{()() World");
+		checkTemplateParsing("Hello ${'inner literal that''s got {[(])]}an escaped quote in it'} World", "Hello inner literal that's got {[(])]}an escaped quote in it World");
+		checkTemplateParsingError("Hello ${", "No ending suffix '}' for expression starting at character 6: ${");
+	}
+
+	@Test
+	public void accessingNullPropertyViaReflection_SPR5663() throws AccessException {
 		PropertyAccessor propertyAccessor = new ReflectivePropertyAccessor();
 		EvaluationContext context = TestScenarioCreator.getTestEvaluationContext();
 		assertFalse(propertyAccessor.canRead(context, null, "abc"));
@@ -325,129 +358,136 @@ public void testAccessingNullPropertyViaReflection_SPR5663() throws AccessExcept
 		try {
 			propertyAccessor.read(context, null, "abc");
 			fail("Should have failed with an AccessException");
-		} catch (AccessException ae) {
+		}
+		catch (AccessException ae) {
 			// success
 		}
 		try {
-			propertyAccessor.write(context, null, "abc","foo");
+			propertyAccessor.write(context, null, "abc", "foo");
 			fail("Should have failed with an AccessException");
-		} catch (AccessException ae) {
+		}
+		catch (AccessException ae) {
 			// success
 		}
 	}
 
-
 	@Test
-	public void testNestedProperties_SPR6923() {
+	public void nestedProperties_SPR6923() {
 		StandardEvaluationContext eContext = new StandardEvaluationContext(new Foo());
-		String name = null;
-		Expression expr = null;
-
-		expr = new SpelExpressionParser().parseRaw("resource.resource.server");
-		name = expr.getValue(eContext,String.class);
-		assertEquals("abc",name);
+		Expression expr = new SpelExpressionParser().parseRaw("resource.resource.server");
+		String name = expr.getValue(eContext, String.class);
+		assertEquals("abc", name);
 	}
 
+
 	static class Foo {
+
 		public ResourceSummary resource = new ResourceSummary();
 	}
 
+
 	static class ResourceSummary {
+
+		private final Resource resource;
+
 		ResourceSummary() {
 			this.resource = new Resource();
 		}
-		private final Resource resource;
+
 		public Resource getResource() {
 			return resource;
 		}
 	}
 
+
 	static class Resource {
+
 		public String getServer() {
 			return "abc";
 		}
 	}
 
+
 	/** Should be accessing Goo.getKey because 'bar' field evaluates to "key" */
 	@Test
-	public void testIndexingAsAPropertyAccess_SPR6968_1() {
+	public void indexingAsAPropertyAccess_SPR6968_1() {
 		StandardEvaluationContext eContext = new StandardEvaluationContext(new Goo());
 		String name = null;
 		Expression expr = null;
 		expr = new SpelExpressionParser().parseRaw("instance[bar]");
-		name = expr.getValue(eContext,String.class);
-		assertEquals("hello",name);
-		name = expr.getValue(eContext,String.class); // will be using the cached accessor this time
-		assertEquals("hello",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("hello", name);
+		name = expr.getValue(eContext, String.class); // will be using the cached accessor this time
+		assertEquals("hello", name);
 	}
 
 	/** Should be accessing Goo.getKey because 'bar' variable evaluates to "key" */
 	@Test
-	public void testIndexingAsAPropertyAccess_SPR6968_2() {
+	public void indexingAsAPropertyAccess_SPR6968_2() {
 		StandardEvaluationContext eContext = new StandardEvaluationContext(new Goo());
-		eContext.setVariable("bar","key");
+		eContext.setVariable("bar", "key");
 		String name = null;
 		Expression expr = null;
 		expr = new SpelExpressionParser().parseRaw("instance[#bar]");
-		name = expr.getValue(eContext,String.class);
-		assertEquals("hello",name);
-		name = expr.getValue(eContext,String.class); // will be using the cached accessor this time
-		assertEquals("hello",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("hello", name);
+		name = expr.getValue(eContext, String.class); // will be using the cached accessor this time
+		assertEquals("hello", name);
 	}
 
 	/** $ related identifiers */
 	@Test
-	public void testDollarPrefixedIdentifier_SPR7100() {
+	public void dollarPrefixedIdentifier_SPR7100() {
 		Holder h = new Holder();
 		StandardEvaluationContext eContext = new StandardEvaluationContext(h);
 		eContext.addPropertyAccessor(new MapAccessor());
-		h.map.put("$foo","wibble");
-		h.map.put("foo$bar","wobble");
-		h.map.put("foobar$$","wabble");
-		h.map.put("$","wubble");
-		h.map.put("$$","webble");
-		h.map.put("$_$","tribble");
+		h.map.put("$foo", "wibble");
+		h.map.put("foo$bar", "wobble");
+		h.map.put("foobar$$", "wabble");
+		h.map.put("$", "wubble");
+		h.map.put("$$", "webble");
+		h.map.put("$_$", "tribble");
 		String name = null;
 		Expression expr = null;
 
 		expr = new SpelExpressionParser().parseRaw("map.$foo");
-		name = expr.getValue(eContext,String.class);
-		assertEquals("wibble",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("wibble", name);
 
 		expr = new SpelExpressionParser().parseRaw("map.foo$bar");
-		name = expr.getValue(eContext,String.class);
-		assertEquals("wobble",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("wobble", name);
 
 		expr = new SpelExpressionParser().parseRaw("map.foobar$$");
-		name = expr.getValue(eContext,String.class);
-		assertEquals("wabble",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("wabble", name);
 
 		expr = new SpelExpressionParser().parseRaw("map.$");
-		name = expr.getValue(eContext,String.class);
-		assertEquals("wubble",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("wubble", name);
 
 		expr = new SpelExpressionParser().parseRaw("map.$$");
-		name = expr.getValue(eContext,String.class);
-		assertEquals("webble",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("webble", name);
 
 		expr = new SpelExpressionParser().parseRaw("map.$_$");
-		name = expr.getValue(eContext,String.class);
-		assertEquals("tribble",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("tribble", name);
 	}
 
 	/** Should be accessing Goo.wibble field because 'bar' variable evaluates to "wibble" */
 	@Test
-	public void testIndexingAsAPropertyAccess_SPR6968_3() {
+	public void indexingAsAPropertyAccess_SPR6968_3() {
 		StandardEvaluationContext eContext = new StandardEvaluationContext(new Goo());
-		eContext.setVariable("bar","wibble");
+		eContext.setVariable("bar", "wibble");
 		String name = null;
 		Expression expr = null;
 		expr = new SpelExpressionParser().parseRaw("instance[#bar]");
 		// will access the field 'wibble' and not use a getter
-		name = expr.getValue(eContext,String.class);
-		assertEquals("wobble",name);
-		name = expr.getValue(eContext,String.class); // will be using the cached accessor this time
-		assertEquals("wobble",name);
+		name = expr.getValue(eContext, String.class);
+		assertEquals("wobble", name);
+		name = expr.getValue(eContext, String.class); // will be using the cached accessor this time
+		assertEquals("wobble", name);
 	}
 
 	/**
@@ -455,66 +495,71 @@ public void testIndexingAsAPropertyAccess_SPR6968_3() {
 	 * "wibble"
 	 */
 	@Test
-	public void testIndexingAsAPropertyAccess_SPR6968_4() {
+	public void indexingAsAPropertyAccess_SPR6968_4() {
 		Goo g = Goo.instance;
 		StandardEvaluationContext eContext = new StandardEvaluationContext(g);
-		eContext.setVariable("bar","wibble");
+		eContext.setVariable("bar", "wibble");
 		Expression expr = null;
 		expr = new SpelExpressionParser().parseRaw("instance[#bar]='world'");
 		// will access the field 'wibble' and not use a getter
-		expr.getValue(eContext,String.class);
-		assertEquals("world",g.wibble);
-		expr.getValue(eContext,String.class); // will be using the cached accessor this time
-		assertEquals("world",g.wibble);
+		expr.getValue(eContext, String.class);
+		assertEquals("world", g.wibble);
+		expr.getValue(eContext, String.class); // will be using the cached accessor this time
+		assertEquals("world", g.wibble);
 	}
 
 	/** Should be accessing Goo.setKey field because 'bar' variable evaluates to "key" */
 	@Test
-	public void testIndexingAsAPropertyAccess_SPR6968_5() {
+	public void indexingAsAPropertyAccess_SPR6968_5() {
 		Goo g = Goo.instance;
 		StandardEvaluationContext eContext = new StandardEvaluationContext(g);
 		Expression expr = null;
 		expr = new SpelExpressionParser().parseRaw("instance[bar]='world'");
-		expr.getValue(eContext,String.class);
-		assertEquals("world",g.value);
-		expr.getValue(eContext,String.class); // will be using the cached accessor this time
-		assertEquals("world",g.value);
+		expr.getValue(eContext, String.class);
+		assertEquals("world", g.value);
+		expr.getValue(eContext, String.class); // will be using the cached accessor this time
+		assertEquals("world", g.value);
 	}
 
 	@Test
-	public void testDollars() {
+	public void dollars() {
 		StandardEvaluationContext eContext = new StandardEvaluationContext(new XX());
 		Expression expr = null;
 		expr = new SpelExpressionParser().parseRaw("m['$foo']");
-		eContext.setVariable("file_name","$foo");
-		assertEquals("wibble",expr.getValue(eContext,String.class));
+		eContext.setVariable("file_name", "$foo");
+		assertEquals("wibble", expr.getValue(eContext, String.class));
 	}
 
 	@Test
-	public void testDollars2() {
+	public void dollars2() {
 		StandardEvaluationContext eContext = new StandardEvaluationContext(new XX());
 		Expression expr = null;
 		expr = new SpelExpressionParser().parseRaw("m[$foo]");
-		eContext.setVariable("file_name","$foo");
-		assertEquals("wibble",expr.getValue(eContext,String.class));
+		eContext.setVariable("file_name", "$foo");
+		assertEquals("wibble", expr.getValue(eContext, String.class));
 	}
 
+
 	static class XX {
-		public Map<String,String> m;
 
-		public String floo ="bar";
+		public Map<String, String> m;
+
+		public String floo = "bar";
 
 		public XX() {
-			 m = new HashMap<String,String>();
-			m.put("$foo","wibble");
-			m.put("bar","siddle");
+			m = new HashMap<String, String>();
+			m.put("$foo", "wibble");
+			m.put("bar", "siddle");
 		}
 	}
 
+
 	static class Goo {
 
 		public static Goo instance = new Goo();
+
 		public String bar = "key";
+
 		public String value = null;
 
 		public String wibble = "wobble";
@@ -526,43 +571,46 @@ public String getKey() {
 		public void setKey(String s) {
 			value = s;
 		}
-
 	}
 
+
 	static class Holder {
 
-		public Map<String,String> map = new HashMap<String,String>();
+		public Map<String, String> map = new HashMap<String, String>();
 	}
 
+
 	// ---
 
 	private void checkTemplateParsing(String expression, String expectedValue) throws Exception {
-		checkTemplateParsing(expression,TemplateExpressionParsingTests.DEFAULT_TEMPLATE_PARSER_CONTEXT, expectedValue);
+		checkTemplateParsing(expression, TemplateExpressionParsingTests.DEFAULT_TEMPLATE_PARSER_CONTEXT, expectedValue);
 	}
 
 	private void checkTemplateParsing(String expression, ParserContext context, String expectedValue) throws Exception {
 		SpelExpressionParser parser = new SpelExpressionParser();
-		Expression expr = parser.parseExpression(expression,context);
-		assertEquals(expectedValue,expr.getValue(TestScenarioCreator.getTestEvaluationContext()));
+		Expression expr = parser.parseExpression(expression, context);
+		assertEquals(expectedValue, expr.getValue(TestScenarioCreator.getTestEvaluationContext()));
 	}
 
-	private void checkTemplateParsingError(String expression,String expectedMessage) throws Exception {
-		checkTemplateParsingError(expression, TemplateExpressionParsingTests.DEFAULT_TEMPLATE_PARSER_CONTEXT,expectedMessage);
+	private void checkTemplateParsingError(String expression, String expectedMessage) throws Exception {
+		checkTemplateParsingError(expression, TemplateExpressionParsingTests.DEFAULT_TEMPLATE_PARSER_CONTEXT, expectedMessage);
 	}
 
-	private void checkTemplateParsingError(String expression,ParserContext context, String expectedMessage) throws Exception {
+	private void checkTemplateParsingError(String expression, ParserContext context, String expectedMessage) throws Exception {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		try {
-			parser.parseExpression(expression,context);
-			fail("Should have failed");
-		} catch (Exception e) {
-			if (!e.getMessage().equals(expectedMessage)) {
-				e.printStackTrace();
+			parser.parseExpression(expression, context);
+			fail("Should have failed with message: " + expectedMessage);
+		}
+		catch (Exception ex) {
+			if (!ex.getMessage().equals(expectedMessage)) {
+				ex.printStackTrace();
 			}
-			assertEquals(expectedMessage,e.getMessage());
+			assertEquals(expectedMessage, ex.getMessage());
 		}
 	}
 
+
 	private static final ParserContext DOLLARSQUARE_TEMPLATE_PARSER_CONTEXT = new ParserContext() {
 		@Override
 		public String getExpressionPrefix() {
@@ -578,13 +626,17 @@ public boolean isTemplate() {
 		}
 	};
 
+
 	static class Foo2 {
-		public void execute(String str){
+
+		public void execute(String str) {
 			System.out.println("Value: " + str);
 		}
 	}
 
-	static class Message{
+
+	static class Message {
+
 		private String payload;
 
 		public String getPayload() {
@@ -596,6 +648,7 @@ public void setPayload(String payload) {
 		}
 	}
 
+
 	// bean resolver tests
 
 	@Test
@@ -606,60 +659,68 @@ public void beanResolution() {
 		// no resolver registered == exception
 		try {
 			expr = new SpelExpressionParser().parseRaw("@foo");
-			assertEquals("custard",expr.getValue(eContext,String.class));
-		} catch (SpelEvaluationException see) {
-			assertEquals(SpelMessage.NO_BEAN_RESOLVER_REGISTERED,see.getMessageCode());
-			assertEquals("foo",see.getInserts()[0]);
+			assertEquals("custard", expr.getValue(eContext, String.class));
+		}
+		catch (SpelEvaluationException see) {
+			assertEquals(SpelMessage.NO_BEAN_RESOLVER_REGISTERED, see.getMessageCode());
+			assertEquals("foo", see.getInserts()[0]);
 		}
 
 		eContext.setBeanResolver(new MyBeanResolver());
 
 		// bean exists
 		expr = new SpelExpressionParser().parseRaw("@foo");
-		assertEquals("custard",expr.getValue(eContext,String.class));
+		assertEquals("custard", expr.getValue(eContext, String.class));
 
 		// bean does not exist
 		expr = new SpelExpressionParser().parseRaw("@bar");
-		assertEquals(null,expr.getValue(eContext,String.class));
+		assertEquals(null, expr.getValue(eContext, String.class));
 
 		// bean name will cause AccessException
 		expr = new SpelExpressionParser().parseRaw("@goo");
 		try {
-			assertEquals(null,expr.getValue(eContext,String.class));
-		} catch (SpelEvaluationException see) {
-			assertEquals(SpelMessage.EXCEPTION_DURING_BEAN_RESOLUTION,see.getMessageCode());
-			assertEquals("goo",see.getInserts()[0]);
+			assertEquals(null, expr.getValue(eContext, String.class));
+		}
+		catch (SpelEvaluationException see) {
+			assertEquals(SpelMessage.EXCEPTION_DURING_BEAN_RESOLUTION, see.getMessageCode());
+			assertEquals("goo", see.getInserts()[0]);
 			assertTrue(see.getCause() instanceof AccessException);
-			assertTrue(((AccessException)see.getCause()).getMessage().startsWith("DONT"));
+			assertTrue(see.getCause().getMessage().startsWith("DONT"));
 		}
 
 		// bean exists
 		expr = new SpelExpressionParser().parseRaw("@'foo.bar'");
-		assertEquals("trouble",expr.getValue(eContext,String.class));
+		assertEquals("trouble", expr.getValue(eContext, String.class));
 
 		// bean exists
 		try {
 			expr = new SpelExpressionParser().parseRaw("@378");
-			assertEquals("trouble",expr.getValue(eContext,String.class));
-		} catch (SpelParseException spe) {
-			assertEquals(SpelMessage.INVALID_BEAN_REFERENCE,spe.getMessageCode());
+			assertEquals("trouble", expr.getValue(eContext, String.class));
+		}
+		catch (SpelParseException spe) {
+			assertEquals(SpelMessage.INVALID_BEAN_REFERENCE, spe.getMessageCode());
 		}
 	}
 
+
 	static class MyBeanResolver implements BeanResolver {
+
 		@Override
-		public Object resolve(EvaluationContext context, String beanname) throws AccessException {
-			if (beanname.equals("foo")) {
+		public Object resolve(EvaluationContext context, String beanName) throws AccessException {
+			if (beanName.equals("foo")) {
 				return "custard";
-			} else if (beanname.equals("foo.bar")) {
+			}
+			else if (beanName.equals("foo.bar")) {
 				return "trouble";
-			} else if (beanname.equals("goo")) {
+			}
+			else if (beanName.equals("goo")) {
 				throw new AccessException("DONT ASK ME ABOUT GOO");
 			}
 			return null;
 		}
 	}
 
+
 	// end bean resolver tests
 
 	@Test
@@ -680,8 +741,9 @@ public void elvis_SPR7209_1() {
 			expr = new SpelExpressionParser().parseRaw("(?'abc':'default')");
 			expr.getValue(eContext);
 			fail();
-		} catch (SpelEvaluationException see ) {
-			assertEquals(SpelMessage.TYPE_CONVERSION_ERROR,see.getMessageCode());
+		}
+		catch (SpelEvaluationException see) {
+			assertEquals(SpelMessage.TYPE_CONVERSION_ERROR, see.getMessageCode());
 		}
 		expr = new SpelExpressionParser().parseRaw("(false?'abc':null)");
 		assertEquals(null, expr.getValue());
@@ -691,8 +753,9 @@ public void elvis_SPR7209_1() {
 			expr = new SpelExpressionParser().parseRaw("(='default')");
 			expr.getValue(eContext);
 			fail();
-		} catch (SpelEvaluationException see ) {
-			assertEquals(SpelMessage.SETVALUE_NOT_SUPPORTED,see.getMessageCode());
+		}
+		catch (SpelEvaluationException see) {
+			assertEquals(SpelMessage.SETVALUE_NOT_SUPPORTED, see.getMessageCode());
 		}
 	}
 
@@ -709,10 +772,10 @@ public void elvis_SPR7209_2() {
 	}
 
 	@Test
-	public void testMapOfMap_SPR7244() throws Exception {
-		Map<String,Object> map = new LinkedHashMap<String,Object>();
+	public void mapOfMap_SPR7244() throws Exception {
+		Map<String, Object> map = new LinkedHashMap<String, Object>();
 		map.put("uri", "http:");
-		Map<String,String> nameMap = new LinkedHashMap<String,String>();
+		Map<String, String> nameMap = new LinkedHashMap<String, String>();
 		nameMap.put("givenName", "Arthur");
 		map.put("value", nameMap);
 
@@ -726,77 +789,84 @@ public void testMapOfMap_SPR7244() throws Exception {
 		String el2 = "#root['value']['givenName']";
 		exp = parser.parseExpression(el2);
 		evaluated = exp.getValue(ctx);
-		assertEquals("Arthur",evaluated);
+		assertEquals("Arthur", evaluated);
 	}
 
 	@Test
-	public void testProjectionTypeDescriptors_1() throws Exception {
+	public void projectionTypeDescriptors_1() throws Exception {
 		StandardEvaluationContext ctx = new StandardEvaluationContext(new C());
 		SpelExpressionParser parser = new SpelExpressionParser();
 		String el1 = "ls.![#this.equals('abc')]";
 		SpelExpression exp = parser.parseRaw(el1);
-		List<?> value = (List<?>)exp.getValue(ctx);
+		List<?> value = (List<?>) exp.getValue(ctx);
 		// value is list containing [true,false]
-		assertEquals(Boolean.class,value.get(0).getClass());
+		assertEquals(Boolean.class, value.get(0).getClass());
 		TypeDescriptor evaluated = exp.getValueTypeDescriptor(ctx);
 		assertEquals(null, evaluated.getElementTypeDescriptor());
 	}
 
 	@Test
-	public void testProjectionTypeDescriptors_2() throws Exception {
+	public void projectionTypeDescriptors_2() throws Exception {
 		StandardEvaluationContext ctx = new StandardEvaluationContext(new C());
 		SpelExpressionParser parser = new SpelExpressionParser();
 		String el1 = "as.![#this.equals('abc')]";
 		SpelExpression exp = parser.parseRaw(el1);
-		Object[] value = (Object[])exp.getValue(ctx);
+		Object[] value = (Object[]) exp.getValue(ctx);
 		// value is array containing [true,false]
-		assertEquals(Boolean.class,value[0].getClass());
+		assertEquals(Boolean.class, value[0].getClass());
 		TypeDescriptor evaluated = exp.getValueTypeDescriptor(ctx);
 		assertEquals(Boolean.class, evaluated.getElementTypeDescriptor().getType());
 	}
 
 	@Test
-	public void testProjectionTypeDescriptors_3() throws Exception {
+	public void projectionTypeDescriptors_3() throws Exception {
 		StandardEvaluationContext ctx = new StandardEvaluationContext(new C());
 		SpelExpressionParser parser = new SpelExpressionParser();
 		String el1 = "ms.![key.equals('abc')]";
 		SpelExpression exp = parser.parseRaw(el1);
-		List<?> value = (List<?>)exp.getValue(ctx);
+		List<?> value = (List<?>) exp.getValue(ctx);
 		// value is list containing [true,false]
-		assertEquals(Boolean.class,value.get(0).getClass());
+		assertEquals(Boolean.class, value.get(0).getClass());
 		TypeDescriptor evaluated = exp.getValueTypeDescriptor(ctx);
 		assertEquals(null, evaluated.getElementTypeDescriptor());
 	}
 
+
 	static class C {
+
 		public List<String> ls;
 		public String[] as;
-		public Map<String,String> ms;
+		public Map<String, String> ms;
+
 		C() {
 			ls = new ArrayList<String>();
 			ls.add("abc");
 			ls.add("def");
-			as = new String[]{"abc","def"};
-			ms = new HashMap<String,String>();
-			ms.put("abc","xyz");
-			ms.put("def","pqr");
+			as = new String[] { "abc", "def" };
+			ms = new HashMap<String, String>();
+			ms.put("abc", "xyz");
+			ms.put("def", "pqr");
 		}
 	}
 
+
 	static class D {
+
 		public String a;
 
 		private D(String s) {
-			a=s;
+			a = s;
 		}
 
+		@Override
 		public String toString() {
-			return "D("+a+")";
+			return "D(" + a + ")";
 		}
 	}
 
+
 	@Test
-	public void testGreaterThanWithNulls_SPR7840() throws Exception {
+	public void greaterThanWithNulls_SPR7840() throws Exception {
 		List<D> list = new ArrayList<D>();
 		list.add(new D("aaa"));
 		list.add(new D("bbb"));
@@ -811,18 +881,18 @@ public void testGreaterThanWithNulls_SPR7840() throws Exception {
 		String el1 = "#root.?[a < 'hhh']";
 		SpelExpression exp = parser.parseRaw(el1);
 		Object value = exp.getValue(ctx);
-		assertEquals("[D(aaa), D(bbb), D(null), D(ccc), D(null)]",value.toString());
+		assertEquals("[D(aaa), D(bbb), D(null), D(ccc), D(null)]", value.toString());
 
 		String el2 = "#root.?[a > 'hhh']";
 		SpelExpression exp2 = parser.parseRaw(el2);
 		Object value2 = exp2.getValue(ctx);
-		assertEquals("[D(zzz)]",value2.toString());
+		assertEquals("[D(zzz)]", value2.toString());
 
 		// trim out the nulls first
 		String el3 = "#root.?[a!=null].?[a < 'hhh']";
 		SpelExpression exp3 = parser.parseRaw(el3);
 		Object value3 = exp3.getValue(ctx);
-		assertEquals("[D(aaa), D(bbb), D(ccc)]",value3.toString());
+		assertEquals("[D(aaa), D(bbb), D(ccc)]", value3.toString());
 	}
 
 	/**
@@ -831,14 +901,13 @@ public void testGreaterThanWithNulls_SPR7840() throws Exception {
 	 * than a unboxing conversion.
 	 */
 	@Test
-	public void testConversionPriority_8224() throws Exception {
+	public void conversionPriority_8224() throws Exception {
 
 		@SuppressWarnings("unused")
 		class ConversionPriority1 {
 			public int getX(Number i) {
 				return 20;
 			}
-
 			public int getX(int i) {
 				return 10;
 			}
@@ -849,7 +918,6 @@ class ConversionPriority2 {
 			public int getX(int i) {
 				return 10;
 			}
-
 			public int getX(Number i) {
 				return 20;
 			}
@@ -887,135 +955,134 @@ public int getX(Number i) {
 	 * method accepting 'long' is ok.
 	 */
 	@Test
-	public void testWideningPrimitiveConversion_8224() throws Exception {
+	public void wideningPrimitiveConversion_8224() throws Exception {
 
 		class WideningPrimitiveConversion {
-
 			public int getX(long i) {
 				return 10;
 			}
 		}
 
 		final Integer INTEGER_VALUE = Integer.valueOf(7);
-
 		WideningPrimitiveConversion target = new WideningPrimitiveConversion();
-
 		EvaluationContext emptyEvalContext = new StandardEvaluationContext();
 
 		List<TypeDescriptor> args = new ArrayList<TypeDescriptor>();
 		args.add(TypeDescriptor.forObject(INTEGER_VALUE));
 
 		MethodExecutor me = new ReflectiveMethodResolver(true).resolve(emptyEvalContext, target, "getX", args);
-
 		final int actual = (Integer) me.execute(emptyEvalContext, target, INTEGER_VALUE).getValue();
 
 		final int compiler = target.getX(INTEGER_VALUE);
-
 		assertEquals(compiler, actual);
 	}
 
-
-
 	@Test
-	public void varargsAndPrimitives_SPR8174() throws Exception  {
+	public void varargsAndPrimitives_SPR8174() throws Exception {
 		EvaluationContext emptyEvalContext = new StandardEvaluationContext();
 		List<TypeDescriptor> args = new ArrayList<TypeDescriptor>();
 
 		args.add(TypeDescriptor.forObject(34L));
 		ReflectionUtil<Integer> ru = new ReflectionUtil<Integer>();
-		MethodExecutor me = new ReflectiveMethodResolver().resolve(emptyEvalContext,ru,"methodToCall",args);
+		MethodExecutor me = new ReflectiveMethodResolver().resolve(emptyEvalContext, ru, "methodToCall", args);
 
-		args.set(0,TypeDescriptor.forObject(23));
-		me = new ReflectiveMethodResolver().resolve(emptyEvalContext,ru,"foo",args);
+		args.set(0, TypeDescriptor.forObject(23));
+		me = new ReflectiveMethodResolver().resolve(emptyEvalContext, ru, "foo", args);
 		me.execute(emptyEvalContext, ru, 45);
 
-		args.set(0,TypeDescriptor.forObject(23f));
-		me = new ReflectiveMethodResolver().resolve(emptyEvalContext,ru,"foo",args);
+		args.set(0, TypeDescriptor.forObject(23f));
+		me = new ReflectiveMethodResolver().resolve(emptyEvalContext, ru, "foo", args);
 		me.execute(emptyEvalContext, ru, 45f);
 
-		args.set(0,TypeDescriptor.forObject(23d));
-		me = new ReflectiveMethodResolver().resolve(emptyEvalContext,ru,"foo",args);
+		args.set(0, TypeDescriptor.forObject(23d));
+		me = new ReflectiveMethodResolver().resolve(emptyEvalContext, ru, "foo", args);
 		me.execute(emptyEvalContext, ru, 23d);
 
-		args.set(0,TypeDescriptor.forObject((short)23));
-		me = new ReflectiveMethodResolver().resolve(emptyEvalContext,ru,"foo",args);
-		me.execute(emptyEvalContext, ru, (short)23);
+		args.set(0, TypeDescriptor.forObject((short) 23));
+		me = new ReflectiveMethodResolver().resolve(emptyEvalContext, ru, "foo", args);
+		me.execute(emptyEvalContext, ru, (short) 23);
 
-		args.set(0,TypeDescriptor.forObject(23L));
-		me = new ReflectiveMethodResolver().resolve(emptyEvalContext,ru,"foo",args);
+		args.set(0, TypeDescriptor.forObject(23L));
+		me = new ReflectiveMethodResolver().resolve(emptyEvalContext, ru, "foo", args);
 		me.execute(emptyEvalContext, ru, 23L);
 
-		args.set(0,TypeDescriptor.forObject((char)65));
-		me = new ReflectiveMethodResolver().resolve(emptyEvalContext,ru,"foo",args);
-		me.execute(emptyEvalContext, ru, (char)65);
+		args.set(0, TypeDescriptor.forObject((char) 65));
+		me = new ReflectiveMethodResolver().resolve(emptyEvalContext, ru, "foo", args);
+		me.execute(emptyEvalContext, ru, (char) 65);
 
-		args.set(0,TypeDescriptor.forObject((byte)23));
-		me = new ReflectiveMethodResolver().resolve(emptyEvalContext,ru,"foo",args);
-		me.execute(emptyEvalContext, ru, (byte)23);
+		args.set(0, TypeDescriptor.forObject((byte) 23));
+		me = new ReflectiveMethodResolver().resolve(emptyEvalContext, ru, "foo", args);
+		me.execute(emptyEvalContext, ru, (byte) 23);
 
-		args.set(0,TypeDescriptor.forObject(true));
-		me = new ReflectiveMethodResolver().resolve(emptyEvalContext,ru,"foo",args);
+		args.set(0, TypeDescriptor.forObject(true));
+		me = new ReflectiveMethodResolver().resolve(emptyEvalContext, ru, "foo", args);
 		me.execute(emptyEvalContext, ru, true);
 
 		// trickier:
-		args.set(0,TypeDescriptor.forObject(12));
+		args.set(0, TypeDescriptor.forObject(12));
 		args.add(TypeDescriptor.forObject(23f));
-		me = new ReflectiveMethodResolver().resolve(emptyEvalContext,ru,"bar",args);
-		me.execute(emptyEvalContext, ru, 12,23f);
-
+		me = new ReflectiveMethodResolver().resolve(emptyEvalContext, ru, "bar", args);
+		me.execute(emptyEvalContext, ru, 12, 23f);
 	}
 
 
-
 	public class ReflectionUtil<T extends Number> {
+
 		public Object methodToCall(T param) {
-			System.out.println(param+" "+param.getClass());
-				return "Object methodToCall(T param)";
+			System.out.println(param + " " + param.getClass());
+			return "Object methodToCall(T param)";
 		}
 
 		public void foo(int... array) {
-			if (array.length==0) {
+			if (array.length == 0) {
 				throw new RuntimeException();
 			}
 		}
-		public void foo(float...array) {
-			if (array.length==0) {
+
+		public void foo(float... array) {
+			if (array.length == 0) {
 				throw new RuntimeException();
 			}
 		}
-		public void foo(double...array) {
-			if (array.length==0) {
+
+		public void foo(double... array) {
+			if (array.length == 0) {
 				throw new RuntimeException();
 			}
 		}
-		public void foo(short...array) {
-			if (array.length==0) {
+
+		public void foo(short... array) {
+			if (array.length == 0) {
 				throw new RuntimeException();
 			}
 		}
-		public void foo(long...array) {
-			if (array.length==0) {
+
+		public void foo(long... array) {
+			if (array.length == 0) {
 				throw new RuntimeException();
 			}
 		}
-		public void foo(boolean...array) {
-			if (array.length==0) {
+
+		public void foo(boolean... array) {
+			if (array.length == 0) {
 				throw new RuntimeException();
 			}
 		}
-		public void foo(char...array) {
-			if (array.length==0) {
+
+		public void foo(char... array) {
+			if (array.length == 0) {
 				throw new RuntimeException();
 			}
 		}
-		public void foo(byte...array) {
-			if (array.length==0) {
+
+		public void foo(byte... array) {
+			if (array.length == 0) {
 				throw new RuntimeException();
 			}
 		}
 
 		public void bar(int... array) {
-			if (array.length==0) {
+			if (array.length == 0) {
 				throw new RuntimeException();
 			}
 		}
@@ -1023,7 +1090,7 @@ public void bar(int... array) {
 
 
 	@Test
-	public void testReservedWords_8228() throws Exception {
+	public void reservedWords_8228() throws Exception {
 		// "DIV","EQ","GE","GT","LE","LT","MOD","NE","NOT"
 		@SuppressWarnings("unused")
 		class Reserver {
@@ -1036,44 +1103,44 @@ public Reserver getReserver() {
 			public int DIV = 1;
 			public int div = 3;
 
-			public Map<String,String> m = new HashMap<String,String>();
+			public Map<String, String> m = new HashMap<String, String>();
 
 			Reserver() {
-				m.put("NE","xyz");
+				m.put("NE", "xyz");
 			}
 		}
+
 		StandardEvaluationContext ctx = new StandardEvaluationContext(new Reserver());
 		SpelExpressionParser parser = new SpelExpressionParser();
 		String ex = "getReserver().NE";
-		SpelExpression exp = null;
-		exp = parser.parseRaw(ex);
-		String value = (String)exp.getValue(ctx);
-		assertEquals("abc",value);
+		SpelExpression exp = parser.parseRaw(ex);
+		String value = (String) exp.getValue(ctx);
+		assertEquals("abc", value);
 
 		ex = "getReserver().ne";
 		exp = parser.parseRaw(ex);
-		value = (String)exp.getValue(ctx);
-		assertEquals("def",value);
+		value = (String) exp.getValue(ctx);
+		assertEquals("def", value);
 
 		ex = "getReserver().m[NE]";
 		exp = parser.parseRaw(ex);
-		value = (String)exp.getValue(ctx);
-		assertEquals("xyz",value);
+		value = (String) exp.getValue(ctx);
+		assertEquals("xyz", value);
 
 		ex = "getReserver().DIV";
 		exp = parser.parseRaw(ex);
-		assertEquals(1,exp.getValue(ctx));
+		assertEquals(1, exp.getValue(ctx));
 
 		ex = "getReserver().div";
 		exp = parser.parseRaw(ex);
-		assertEquals(3,exp.getValue(ctx));
+		assertEquals(3, exp.getValue(ctx));
 
 		exp = parser.parseRaw("NE");
-		assertEquals("abc",exp.getValue(ctx));
+		assertEquals("abc", exp.getValue(ctx));
 	}
 
 	@Test
-	public void testReservedWordProperties_9862() throws Exception {
+	public void reservedWordProperties_9862() throws Exception {
 		StandardEvaluationContext ctx = new StandardEvaluationContext();
 		SpelExpressionParser parser = new SpelExpressionParser();
 		SpelExpression expression = parser.parseRaw("T(org.springframework.expression.spel.testresources.le.div.mod.reserved.Reserver).CONST");
@@ -1088,68 +1155,70 @@ public void testReservedWordProperties_9862() throws Exception {
 	 * in evaluation of SPEL expressions for a given context.
 	 */
 	@Test
-	public void testPropertyAccessorOrder_8211() {
+	public void propertyAccessorOrder_8211() {
 		ExpressionParser expressionParser = new SpelExpressionParser();
-		StandardEvaluationContext evaluationContext =
-			new StandardEvaluationContext(new ContextObject());
+		StandardEvaluationContext evaluationContext = new StandardEvaluationContext(new ContextObject());
 
 		evaluationContext.addPropertyAccessor(new TestPropertyAccessor("firstContext"));
 		evaluationContext.addPropertyAccessor(new TestPropertyAccessor("secondContext"));
 		evaluationContext.addPropertyAccessor(new TestPropertyAccessor("thirdContext"));
 		evaluationContext.addPropertyAccessor(new TestPropertyAccessor("fourthContext"));
 
-		assertEquals("first",
-			expressionParser.parseExpression("shouldBeFirst").getValue(evaluationContext));
-		assertEquals("second",
-				expressionParser.parseExpression("shouldBeSecond").getValue(evaluationContext));
-		assertEquals("third",
-				expressionParser.parseExpression("shouldBeThird").getValue(evaluationContext));
-		assertEquals("fourth",
-				expressionParser.parseExpression("shouldBeFourth").getValue(evaluationContext));
+		assertEquals("first", expressionParser.parseExpression("shouldBeFirst").getValue(evaluationContext));
+		assertEquals("second", expressionParser.parseExpression("shouldBeSecond").getValue(evaluationContext));
+		assertEquals("third", expressionParser.parseExpression("shouldBeThird").getValue(evaluationContext));
+		assertEquals("fourth", expressionParser.parseExpression("shouldBeFourth").getValue(evaluationContext));
 	}
 
+
 	class TestPropertyAccessor implements PropertyAccessor {
+
 		private String mapName;
+
 		public TestPropertyAccessor(String mapName) {
 			this.mapName = mapName;
 		}
+
 		@SuppressWarnings("unchecked")
 		public Map<String, String> getMap(Object target) {
 			try {
 				Field f = target.getClass().getDeclaredField(mapName);
-				return (Map<String,String>) f.get(target);
-			} catch (Exception e) {
+				return (Map<String, String>) f.get(target);
+			}
+			catch (Exception ex) {
 			}
 			return null;
 		}
+
 		@Override
-		public boolean canRead(EvaluationContext context, Object target, String name)
-				throws AccessException {
+		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 			return getMap(target).containsKey(name);
 		}
+
 		@Override
-		public boolean canWrite(EvaluationContext context, Object target, String name)
-				throws AccessException {
+		public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 			return getMap(target).containsKey(name);
 		}
+
 		@Override
 		public Class<?>[] getSpecificTargetClasses() {
-			return new Class[]{ContextObject.class};
+			return new Class[] { ContextObject.class };
 		}
+
 		@Override
-		public TypedValue read(EvaluationContext context, Object target, String name)
-				throws AccessException {
+		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 			return new TypedValue(getMap(target).get(name));
 		}
+
 		@Override
-		public void write(EvaluationContext context, Object target, String name, Object newValue)
-			throws AccessException {
+		public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException {
 			getMap(target).put(name, (String) newValue);
 		}
-
 	}
 
+
 	class ContextObject {
+
 		public Map<String, String> firstContext = new HashMap<String, String>();
 		public Map<String, String> secondContext = new HashMap<String, String>();
 		public Map<String, String> thirdContext = new HashMap<String, String>();
@@ -1170,49 +1239,56 @@ public ContextObject() {
 
 			fourthContext.put("shouldBeFourth", "fourth");
 		}
-		public Map<String, String> getFirstContext() {return firstContext;}
-		public Map<String, String> getSecondContext() {return secondContext;}
-		public Map<String, String> getThirdContext() {return thirdContext;}
-		public Map<String, String> getFourthContext() {return fourthContext;}
+
+		public Map<String, String> getFirstContext() {
+			return firstContext;
+		}
+
+		public Map<String, String> getSecondContext() {
+			return secondContext;
+		}
+
+		public Map<String, String> getThirdContext() {
+			return thirdContext;
+		}
+
+		public Map<String, String> getFourthContext() {
+			return fourthContext;
+		}
 	}
 
+
 	/**
 	 * Test the ability to subclass the ReflectiveMethodResolver and change how it
 	 * determines the set of methods for a type.
 	 */
 	@Test
-	public void testCustomStaticFunctions_SPR9038() {
-		try {
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			List<MethodResolver> methodResolvers = new ArrayList<MethodResolver>();
-			methodResolvers.add(new ReflectiveMethodResolver() {
-				@Override
-				protected Method[] getMethods(Class<?> type) {
-					try {
-						return new Method[] {
-								Integer.class.getDeclaredMethod("parseInt", new Class[] {
-										String.class, Integer.TYPE }) };
-					} catch (NoSuchMethodException e1) {
-						return new Method[0];
-					}
+	public void customStaticFunctions_SPR9038() {
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		List<MethodResolver> methodResolvers = new ArrayList<MethodResolver>();
+		methodResolvers.add(new ReflectiveMethodResolver() {
+			@Override
+			protected Method[] getMethods(Class<?> type) {
+				try {
+					return new Method[] {
+							Integer.class.getDeclaredMethod("parseInt", new Class[] { String.class, Integer.TYPE }) };
 				}
-			});
+				catch (NoSuchMethodException ex) {
+					return new Method[0];
+				}
+			}
+		});
 
-			context.setMethodResolvers(methodResolvers);
-			org.springframework.expression.Expression expression =
-					parser.parseExpression("parseInt('-FF', 16)");
+		context.setMethodResolvers(methodResolvers);
+		Expression expression = parser.parseExpression("parseInt('-FF', 16)");
 
-			Integer result = expression.getValue(context, "", Integer.class);
-			assertEquals("Equal assertion failed: ", -255, result.intValue());
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Unexpected exception: "+e.toString());
-		}
+		Integer result = expression.getValue(context, "", Integer.class);
+		assertEquals(-255, result.intValue());
 	}
 
 	@Test
-	public void testArray() {
+	public void array() {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		Expression expression = null;
@@ -1229,7 +1305,7 @@ public void testArray() {
 		expression = parser.parseExpression("T(java.lang.String[][][])");
 		result = expression.getValue(context, "");
 		assertEquals("Equal assertion failed: ", "class [[[Ljava.lang.String;", result.toString());
-		assertEquals("T(java.lang.String[][][])",((SpelExpression)expression).toStringAST());
+		assertEquals("T(java.lang.String[][][])", ((SpelExpression) expression).toStringAST());
 
 		expression = parser.parseExpression("new int[0].class");
 		result = expression.getValue(context, "");
@@ -1237,27 +1313,24 @@ public void testArray() {
 
 		expression = parser.parseExpression("T(int[][])");
 		result = expression.getValue(context, "");
-		assertEquals("Equal assertion failed: ", "class [[I", result.toString());
+		assertEquals("class [[I", result.toString());
 	}
 
 	@Test
-	public void SPR_9486_floatFunctionResolverTest() {
-		try {
-			Number expectedResult = Math.abs(-10.2f);
-			ExpressionParser parser = new SpelExpressionParser();
-			SPR_9486_FunctionsClass testObject = new SPR_9486_FunctionsClass();
+	public void SPR9486_floatFunctionResolver() throws Exception {
+		Number expectedResult = Math.abs(-10.2f);
+		ExpressionParser parser = new SpelExpressionParser();
+		SPR9486_FunctionsClass testObject = new SPR9486_FunctionsClass();
 
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("abs(-10.2f)");
-			Number result = expression.getValue(context, testObject, Number.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatFunctionResolverTest Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatFunctionResolverTest");
-		}
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("abs(-10.2f)");
+		Number result = expression.getValue(context, testObject, Number.class);
+		assertEquals(expectedResult, result);
 	}
 
-	class SPR_9486_FunctionsClass {
+
+	class SPR9486_FunctionsClass {
+
 		public int abs(int value) {
 			return Math.abs(value);
 		}
@@ -1267,418 +1340,287 @@ public float abs(float value) {
 		}
 	}
 
+
 	@Test
-	public void SPR_9486_addFloatWithDoubleTest() {
-		try {
-			Number expectedNumber = 10.21f + 10.2;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.21f + 10.2");
-			Number result = expression.getValue(context, null, Number.class);
-			assertEquals("Equal assertion failed for SPR_9486_addFloatWithDoubleTest Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_addFloatWithDoubleTest");
-		}
+	public void SPR9486_addFloatWithDouble() {
+		Number expectedNumber = 10.21f + 10.2;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.21f + 10.2");
+		Number result = expression.getValue(context, null, Number.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_addFloatWithFloatTest() {
-		try {
-			Number expectedNumber = 10.21f + 10.2f;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.21f + 10.2f");
-			Number result = expression.getValue(context, null, Number.class);
-			assertEquals("Equal assertion failed for SPR_9486_addFloatWithFloatTest Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_addFloatWithFloatTest");
-		}
+	public void SPR9486_addFloatWithFloat() {
+		Number expectedNumber = 10.21f + 10.2f;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.21f + 10.2f");
+		Number result = expression.getValue(context, null, Number.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_subtractFloatWithDoubleTest() {
-		try {
-			Number expectedNumber = 10.21f - 10.2;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.21f - 10.2");
-			Number result = expression.getValue(context, null, Number.class);
-			assertEquals("Equal assertion failed for SPR_9486_subtractFloatWithDoubleTest Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_subtractFloatWithDoubleTest");
-		}
+	public void SPR9486_subtractFloatWithDouble() {
+		Number expectedNumber = 10.21f - 10.2;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.21f - 10.2");
+		Number result = expression.getValue(context, null, Number.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_subtractFloatWithFloatTest() {
-		try {
-			Number expectedNumber = 10.21f - 10.2f;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.21f - 10.2f");
-			Number result = expression.getValue(context, null, Number.class);
-			assertEquals("Equal assertion failed for SPR_9486_subtractFloatWithFloatTest Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_subtractFloatWithFloatTest");
-		}
+	public void SPR9486_subtractFloatWithFloat() {
+		Number expectedNumber = 10.21f - 10.2f;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.21f - 10.2f");
+		Number result = expression.getValue(context, null, Number.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_multiplyFloatWithDoubleTest() {
-		try {
-			Number expectedNumber = 10.21f * 10.2;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.21f * 10.2");
-			Number result = expression.getValue(context, null, Number.class);
-			assertEquals("Equal assertion failed for float multiplied by double Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_multiplyFloatWithDoubleTest");
-		}
+	public void SPR9486_multiplyFloatWithDouble() {
+		Number expectedNumber = 10.21f * 10.2;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.21f * 10.2");
+		Number result = expression.getValue(context, null, Number.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_multiplyFloatWithFloatTest() {
-		try {
-			Number expectedNumber = 10.21f * 10.2f;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.21f * 10.2f");
-			Number result = expression.getValue(context, null, Number.class);
-			assertEquals("Equal assertion failed for float multiply by another float Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_multiplyFloatWithFloatTest");
-		}
+	public void SPR9486_multiplyFloatWithFloat() {
+		Number expectedNumber = 10.21f * 10.2f;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.21f * 10.2f");
+		Number result = expression.getValue(context, null, Number.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_floatDivideByFloatTest() {
-		try {
-			Number expectedNumber = -10.21f/-10.2f;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("-10.21f / -10.2f");
-			Number result = expression.getValue(context, null, Number.class);
-			assertEquals("Equal assertion failed for float divide Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatDivideByFloatTest");
-		}
+	public void SPR9486_floatDivideByFloat() {
+		Number expectedNumber = -10.21f / -10.2f;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("-10.21f / -10.2f");
+		Number result = expression.getValue(context, null, Number.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_floatDivideByDoubleTest() {
-		try {
-			Number expectedNumber = -10.21f/-10.2;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("-10.21f / -10.2");
-			Number result = expression.getValue(context, null, Number.class);
-			assertEquals("Equal assertion failed for float divide Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatDivideByDoubleTest");
-		}
+	public void SPR9486_floatDivideByDouble() {
+		Number expectedNumber = -10.21f / -10.2;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("-10.21f / -10.2");
+		Number result = expression.getValue(context, null, Number.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_floatEqFloatUnaryMinusTest() {
-		try {
-			Boolean expectedResult =  -10.21f == -10.2f;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("-10.21f == -10.2f");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatEqFloatUnaryMinusTest Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatEqFloatUnaryMinusTest");
-		}
+	public void SPR9486_floatEqFloatUnaryMinus() {
+		Boolean expectedResult = -10.21f == -10.2f;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("-10.21f == -10.2f");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedResult, result);
 	}
 
 	@Test
-	public void SPR_9486_floatEqDoubleUnaryMinusTest() {
-		try {
-			Boolean expectedResult =  -10.21f == -10.2;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("-10.21f == -10.2");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatEqDoubleUnaryMinusTest Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatEqDoubleUnaryMinusTest");
-		}
+	public void SPR9486_floatEqDoubleUnaryMinus() {
+		Boolean expectedResult = -10.21f == -10.2;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("-10.21f == -10.2");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedResult, result);
 	}
 
 	@Test
-	public void SPR_9486_floatEqFloatTest() {
-		try {
-			Boolean expectedResult =  10.215f == 10.2109f;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.215f == 10.2109f");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatEqFloatTest Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatEqFloatTest");
-		}
+	public void SPR9486_floatEqFloat() {
+		Boolean expectedResult = 10.215f == 10.2109f;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.215f == 10.2109f");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedResult, result);
 	}
 
 	@Test
-	public void SPR_9486_floatEqDoubleTest() {
-		try {
-			Boolean expectedResult =  10.215f == 10.2109;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.215f == 10.2109");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatEqDoubleTest() Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatEqDoubleTest()");
-		}
+	public void SPR9486_floatEqDouble() {
+		Boolean expectedResult = 10.215f == 10.2109;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.215f == 10.2109");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedResult, result);
 	}
 
 	@Test
-	public void SPR_9486_floatNotEqFloatTest() {
-		try {
-			Boolean expectedResult =  10.215f != 10.2109f;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.215f != 10.2109f");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatEqFloatTest Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatEqFloatTest");
-		}
+	public void SPR9486_floatNotEqFloat() {
+		Boolean expectedResult = 10.215f != 10.2109f;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.215f != 10.2109f");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedResult, result);
 	}
 
 	@Test
-	public void SPR_9486_floatNotEqDoubleTest() {
-		try {
-			Boolean expectedResult =  10.215f != 10.2109;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.215f != 10.2109");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatNotEqDoubleTest Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatNotEqDoubleTest");
-		}
+	public void SPR9486_floatNotEqDouble() {
+		Boolean expectedResult = 10.215f != 10.2109;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.215f != 10.2109");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedResult, result);
 	}
 
-
-
 	@Test
-	public void SPR_9486_floatLessThanFloatTest() {
-		try {
-			Boolean expectedNumber = -10.21f < -10.2f;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("-10.21f < -10.2f");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatLessThanFloatTest Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatLessThanFloatTest()");
-		}
+	public void SPR9486_floatLessThanFloat() {
+		Boolean expectedNumber = -10.21f < -10.2f;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("-10.21f < -10.2f");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_floatLessThanDoubleTest() {
-		try {
-			Boolean expectedNumber = -10.21f < -10.2;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("-10.21f < -10.2");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatLessThanDoubleTest Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatLessThanDoubleTest()");
-		}
+	public void SPR9486_floatLessThanDouble() {
+		Boolean expectedNumber = -10.21f < -10.2;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("-10.21f < -10.2");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_floatLessThanOrEqualFloatTest() {
-		try {
-			Boolean expectedNumber = -10.21f <= -10.22f;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("-10.21f <= -10.22f");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatLessThanOrEqualFloatTest Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatLessThanOrEqualFloatTest");
-		}
+	public void SPR9486_floatLessThanOrEqualFloat() {
+		Boolean expectedNumber = -10.21f <= -10.22f;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("-10.21f <= -10.22f");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_floatLessThanOrEqualDoubleTest() {
-		try {
-			Boolean expectedNumber = -10.21f <= -10.2;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("-10.21f <= -10.2");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatLessThanOrEqualDoubleTest Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatLessThanOrEqualDoubleTest");
-		}
+	public void SPR9486_floatLessThanOrEqualDouble() {
+		Boolean expectedNumber = -10.21f <= -10.2;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("-10.21f <= -10.2");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_floatGreaterThanFloatTest() {
-		try {
-			Boolean expectedNumber = -10.21f > -10.2f;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("-10.21f > -10.2f");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatGreaterThanFloatTest Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatGreaterThanTest");
-		}
+	public void SPR9486_floatGreaterThanFloat() {
+		Boolean expectedNumber = -10.21f > -10.2f;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("-10.21f > -10.2f");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_floatGreaterThanDoubleTest() {
-		try {
-			Boolean expectedResult = -10.21f > -10.2;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("-10.21f > -10.2");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatGreaterThanDoubleTest Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatGreaterThanTest");
-		}
+	public void SPR9486_floatGreaterThanDouble() {
+		Boolean expectedResult = -10.21f > -10.2;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("-10.21f > -10.2");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedResult, result);
 	}
 
 	@Test
-	public void SPR_9486_floatGreaterThanOrEqualFloatTest() {
-		try {
-			Boolean expectedNumber = -10.21f >= -10.2f;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("-10.21f >= -10.2f");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatGreaterThanFloatTest Test: ", expectedNumber, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatGreaterThanTest");
-		}
+	public void SPR9486_floatGreaterThanOrEqualFloat() {
+		Boolean expectedNumber = -10.21f >= -10.2f;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("-10.21f >= -10.2f");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedNumber, result);
 	}
 
 	@Test
-	public void SPR_9486_floatGreaterThanEqualDoubleTest() {
-		try {
-			Boolean expectedResult = -10.21f >= -10.2;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("-10.21f >= -10.2");
-			Boolean result = expression.getValue(context, null, Boolean.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatGreaterThanDoubleTest Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatGreaterThanTest");
-		}
+	public void SPR9486_floatGreaterThanEqualDouble() {
+		Boolean expectedResult = -10.21f >= -10.2;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("-10.21f >= -10.2");
+		Boolean result = expression.getValue(context, null, Boolean.class);
+		assertEquals(expectedResult, result);
 	}
 
 	@Test
-	public void SPR_9486_floatModulusFloatTest() {
-		try {
-			Number expectedResult = 10.21f % 10.2f;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.21f % 10.2f");
-			Number result = expression.getValue(context, null, Number.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatModulusFloatTest Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatModulusFloatTest");
-		}
+	public void SPR9486_floatModulusFloat() {
+		Number expectedResult = 10.21f % 10.2f;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.21f % 10.2f");
+		Number result = expression.getValue(context, null, Number.class);
+		assertEquals(expectedResult, result);
 	}
 
 	@Test
-	public void SPR_9486_floatModulusDoubleTest() {
-		try {
-			Number expectedResult = 10.21f % 10.2;
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.21f % 10.2");
-			Number result = expression.getValue(context, null, Number.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatModulusDoubleTest Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatModulusDoubleTest");
-		}
+	public void SPR9486_floatModulusDouble() {
+		Number expectedResult = 10.21f % 10.2;
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.21f % 10.2");
+		Number result = expression.getValue(context, null, Number.class);
+		assertEquals(expectedResult, result);
 	}
 
 	@Test
-	public void SPR_9486_floatPowerFloatTest() {
-		try {
-			Number expectedResult = Math.pow(10.21f, -10.2f);
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.21f ^ -10.2f");
-			Number result = expression.getValue(context, null, Number.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatPowerFloatTest Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatPowerFloatTest");
-		}
+	public void SPR9486_floatPowerFloat() {
+		Number expectedResult = Math.pow(10.21f, -10.2f);
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.21f ^ -10.2f");
+		Number result = expression.getValue(context, null, Number.class);
+		assertEquals(expectedResult, result);
 	}
 
 	@Test
-	public void SPR_9486_floatPowerDoubleTest() {
-		try {
-			Number expectedResult = Math.pow(10.21f, 10.2);
-			ExpressionParser parser = new SpelExpressionParser();
-			StandardEvaluationContext context = new StandardEvaluationContext();
-			org.springframework.expression.Expression expression = parser.parseExpression("10.21f ^ 10.2");
-			Number result = expression.getValue(context, null, Number.class);
-			assertEquals("Equal assertion failed for SPR_9486_floatPowerDoubleTest Test: ", expectedResult, result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Test failed - SPR_9486_floatPowerDoubleTest");
-		}
+	public void SPR9486_floatPowerDouble() {
+		Number expectedResult = Math.pow(10.21f, 10.2);
+		ExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression expression = parser.parseExpression("10.21f ^ 10.2");
+		Number result = expression.getValue(context, null, Number.class);
+		assertEquals(expectedResult, result);
 	}
 
 	@Test
-	public void SPR_9994_bridgeMethodsTest() throws Exception {
+	public void SPR9994_bridgeMethods() throws Exception {
 		ReflectivePropertyAccessor accessor = new ReflectivePropertyAccessor();
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		Object target = new GenericImplementation();
-		TypedValue value = accessor.read(context, target , "property");
+		TypedValue value = accessor.read(context, target, "property");
 		assertEquals(Integer.class, value.getTypeDescriptor().getType());
 	}
 
 	@Test
-	public void SPR_10162_onlyBridgeMethodTest() throws Exception {
+	public void SPR10162_onlyBridgeMethod() throws Exception {
 		ReflectivePropertyAccessor accessor = new ReflectivePropertyAccessor();
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		Object target = new OnlyBridgeMethod();
-		TypedValue value = accessor.read(context, target , "property");
+		TypedValue value = accessor.read(context, target, "property");
 		assertEquals(Integer.class, value.getTypeDescriptor().getType());
 	}
 
 	@Test
-	public void SPR_10091_simpleTestValueType() {
+	public void SPR10091_simpleTestValueType() {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext evaluationContext = new StandardEvaluationContext(new BooleanHolder());
 		Class<?> valueType = parser.parseExpression("simpleProperty").getValueType(evaluationContext);
@@ -1686,7 +1628,7 @@ public void SPR_10091_simpleTestValueType() {
 	}
 
 	@Test
-	public void SPR_10091_simpleTestValue() {
+	public void SPR10091_simpleTestValue() {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext evaluationContext = new StandardEvaluationContext(new BooleanHolder());
 		Object value = parser.parseExpression("simpleProperty").getValue(evaluationContext);
@@ -1694,7 +1636,7 @@ public void SPR_10091_simpleTestValue() {
 	}
 
 	@Test
-	public void SPR_10091_primitiveTestValueType() {
+	public void SPR10091_primitiveTestValueType() {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext evaluationContext = new StandardEvaluationContext(new BooleanHolder());
 		Class<?> valueType = parser.parseExpression("primitiveProperty").getValueType(evaluationContext);
@@ -1702,7 +1644,7 @@ public void SPR_10091_primitiveTestValueType() {
 	}
 
 	@Test
-	public void SPR_10091_primitiveTestValue() {
+	public void SPR10091_primitiveTestValue() {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext evaluationContext = new StandardEvaluationContext(new BooleanHolder());
 		Object value = parser.parseExpression("primitiveProperty").getValue(evaluationContext);
@@ -1710,7 +1652,7 @@ public void SPR_10091_primitiveTestValue() {
 	}
 
 	@Test
-	public void SPR_10146_malformedExpressions() throws Exception {
+	public void SPR10146_malformedExpressions() throws Exception {
 		doTestSpr10146("/foo", "EL1070E:(pos 0): Problem parsing left operand");
 		doTestSpr10146("*foo", "EL1070E:(pos 0): Problem parsing left operand");
 		doTestSpr10146("%foo", "EL1070E:(pos 0): Problem parsing left operand");
@@ -1729,16 +1671,18 @@ private void doTestSpr10146(String expression, String expectedMessage) {
 	}
 
 	@Test
-	public void SPR_10125() throws Exception {
+	public void SPR10125() throws Exception {
 		StandardEvaluationContext context = new StandardEvaluationContext();
-		String fromInterface = parser.parseExpression("T("+StaticFinalImpl1.class.getName()+").VALUE").getValue(context, String.class);
+		String fromInterface = parser.parseExpression("T(" + StaticFinalImpl1.class.getName() + ").VALUE").getValue(
+				context, String.class);
 		assertThat(fromInterface, is("interfaceValue"));
-		String fromClass = parser.parseExpression("T("+StaticFinalImpl2.class.getName()+").VALUE").getValue(context, String.class);
+		String fromClass = parser.parseExpression("T(" + StaticFinalImpl2.class.getName() + ").VALUE").getValue(
+				context, String.class);
 		assertThat(fromClass, is("interfaceValue"));
 	}
 
 	@Test
-	public void SPR_10210() throws Exception {
+	public void SPR10210() throws Exception {
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		context.setVariable("bridgeExample", new org.springframework.expression.spel.spr10210.D());
 		Expression parseExpression = parser.parseExpression("#bridgeExample.bridgeMethod()");
@@ -1746,42 +1690,215 @@ public void SPR_10210() throws Exception {
 	}
 
 	@Test
-	public void SPR_10328() throws Exception {
+	public void SPR10328() throws Exception {
 		thrown.expect(SpelParseException.class);
 		thrown.expectMessage("EL1071E:(pos 2): A required selection expression has not been specified");
 		Expression exp = parser.parseExpression("$[]");
 		exp.getValue(Arrays.asList("foo", "bar", "baz"));
 	}
 
+	@Test
+	public void SPR10452() throws Exception {
+		SpelParserConfiguration configuration = new SpelParserConfiguration(false, false);
+		ExpressionParser parser = new SpelExpressionParser(configuration);
+
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression spel = parser.parseExpression("#enumType.values()");
+
+		context.setVariable("enumType", ABC.class);
+		Object result = spel.getValue(context);
+		assertNotNull(result);
+		assertTrue(result.getClass().isArray());
+		assertEquals(ABC.A, Array.get(result, 0));
+		assertEquals(ABC.B, Array.get(result, 1));
+		assertEquals(ABC.C, Array.get(result, 2));
+
+		context.setVariable("enumType", XYZ.class);
+		result = spel.getValue(context);
+		assertNotNull(result);
+		assertTrue(result.getClass().isArray());
+		assertEquals(XYZ.X, Array.get(result, 0));
+		assertEquals(XYZ.Y, Array.get(result, 1));
+		assertEquals(XYZ.Z, Array.get(result, 2));
+	}
+
+	@Test
+	public void SPR9495() throws Exception {
+		SpelParserConfiguration configuration = new SpelParserConfiguration(false, false);
+		ExpressionParser parser = new SpelExpressionParser(configuration);
+
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Expression spel = parser.parseExpression("#enumType.values()");
+
+		context.setVariable("enumType", ABC.class);
+		Object result = spel.getValue(context);
+		assertNotNull(result);
+		assertTrue(result.getClass().isArray());
+		assertEquals(ABC.A, Array.get(result, 0));
+		assertEquals(ABC.B, Array.get(result, 1));
+		assertEquals(ABC.C, Array.get(result, 2));
+
+		context.addMethodResolver(new MethodResolver() {
+			@Override
+			public MethodExecutor resolve(EvaluationContext context, Object targetObject, String name,
+					List<TypeDescriptor> argumentTypes) throws AccessException {
+				return new MethodExecutor() {
+					@Override
+					public TypedValue execute(EvaluationContext context, Object target, Object... arguments)
+							throws AccessException {
+						try {
+							Method method = XYZ.class.getMethod("values");
+							Object value = method.invoke(target, arguments);
+							return new TypedValue(value, new TypeDescriptor(new MethodParameter(method, -1)).narrow(value));
+						}
+						catch (Exception ex) {
+							throw new AccessException(ex.getMessage(), ex);
+						}
+					}
+				};
+			}
+		});
+		result = spel.getValue(context);
+		assertNotNull(result);
+		assertTrue(result.getClass().isArray());
+		assertEquals(XYZ.X, Array.get(result, 0));
+		assertEquals(XYZ.Y, Array.get(result, 1));
+		assertEquals(XYZ.Z, Array.get(result, 2));
+	}
+
+	@Test
+	public void SPR10486() throws Exception {
+		SpelExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Spr10486 rootObject = new Spr10486();
+		Expression classNameExpression = parser.parseExpression("class.name");
+		Expression nameExpression = parser.parseExpression("name");
+		assertThat(classNameExpression.getValue(context, rootObject), equalTo((Object) Spr10486.class.getName()));
+		assertThat(nameExpression.getValue(context, rootObject), equalTo((Object) "name"));
+	}
+
+	@Test
+	public void SPR11142() throws Exception {
+		SpelExpressionParser parser = new SpelExpressionParser();
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		Spr11142 rootObject = new Spr11142();
+		Expression expression = parser.parseExpression("something");
+		thrown.expect(SpelEvaluationException.class);
+		thrown.expectMessage("'something' cannot be found");
+		expression.getValue(context, rootObject);
+	}
+
+	@Test
+	public void SPR11348() {
+		Collection<String> coll = new LinkedHashSet<String>();
+		coll.add("one");
+		coll.add("two");
+		coll = Collections.unmodifiableCollection(coll);
+
+		SpelExpressionParser parser = new SpelExpressionParser();
+		Expression expr = parser.parseExpression("new java.util.ArrayList(#root)");
+		Object value = expr.getValue(coll);
+		assertTrue(value instanceof ArrayList);
+		@SuppressWarnings("rawtypes")
+		ArrayList list = (ArrayList) value;
+		assertEquals("one", list.get(0));
+		assertEquals("two", list.get(1));
+	}
+
+	@Test
+	public void SPR11445_simple() {
+		StandardEvaluationContext context = new StandardEvaluationContext(new Spr11445Class());
+		Expression expr = new SpelExpressionParser().parseRaw("echo(parameter())");
+		assertEquals(1, expr.getValue(context));
+	}
+
+	@Test
+	public void SPR11445_beanReference() {
+		StandardEvaluationContext context = new StandardEvaluationContext();
+		context.setBeanResolver(new Spr11445Class());
+		Expression expr = new SpelExpressionParser().parseRaw("@bean.echo(@bean.parameter())");
+		assertEquals(1, expr.getValue(context));
+	}
+
+	@Test
+	public void SPR11494() {
+		Expression exp = new SpelExpressionParser().parseExpression("T(java.util.Arrays).asList('a','b')");
+		List<String> list = (List<String>) exp.getValue();
+		assertThat(list.size(), is(2));
+	}
+
+	@Test
+	public void SPR11609() {
+		StandardEvaluationContext sec = new StandardEvaluationContext();
+		sec.addPropertyAccessor(new MapAccessor());
+		Expression exp = new SpelExpressionParser().parseExpression(
+				"T(org.springframework.expression.spel.SpelReproTests$MapWithConstant).X");
+		assertEquals(1, exp.getValue(sec));
+	}
+
+	@Test
+	public void SPR12502() {
+		SpelExpressionParser parser = new SpelExpressionParser();
+		Expression expression = parser.parseExpression("#root.getClass().getName()");
+		assertEquals(UnnamedUser.class.getName(), expression.getValue(new UnnamedUser()));
+		assertEquals(NamedUser.class.getName(), expression.getValue(new NamedUser()));
+	}
+
+	@Test
+	public void SPR12803() {
+		StandardEvaluationContext sec = new StandardEvaluationContext();
+		sec.setVariable("iterable", Collections.emptyList());
+		SpelExpressionParser parser = new SpelExpressionParser();
+		Expression expression = parser.parseExpression("T(org.springframework.expression.spel.SpelReproTests.GuavaLists).newArrayList(#iterable)");
+		assertTrue(expression.getValue(sec) instanceof ArrayList);
+	}
+
+	@Test
+	public void SPR13918() {
+		EvaluationContext context = new StandardEvaluationContext();
+		context.setVariable("encoding", "UTF-8");
+
+		Expression ex = parser.parseExpression("T(java.nio.charset.Charset).forName(#encoding)");
+		Object result = ex.getValue(context);
+		assertEquals(Charset.forName("UTF-8"), result);
+	}
+
+
+	private enum ABC { A, B, C }
+
+	private enum XYZ { X, Y, Z }
+
+
 	public static class BooleanHolder {
 
 		private Boolean simpleProperty = true;
 
 		private boolean primitiveProperty = true;
 
-		public Boolean isSimpleProperty() {
-			return simpleProperty;
-		}
-
 		public void setSimpleProperty(Boolean simpleProperty) {
 			this.simpleProperty = simpleProperty;
 		}
 
-		public boolean isPrimitiveProperty() {
-			return primitiveProperty;
+		public Boolean isSimpleProperty() {
+			return this.simpleProperty;
 		}
 
 		public void setPrimitiveProperty(boolean primitiveProperty) {
 			this.primitiveProperty = primitiveProperty;
 		}
+
+		public boolean isPrimitiveProperty() {
+			return this.primitiveProperty;
+		}
 	}
 
 
-	private static interface GenericInterface<T extends Number> {
+	private interface GenericInterface<T extends Number> {
 
 		public T getProperty();
 	}
 
+
 	private static class GenericImplementation implements GenericInterface<Integer> {
 
 		@Override
@@ -1790,6 +1907,7 @@ public Integer getProperty() {
 		}
 	}
 
+
 	static class PackagePrivateClassWithGetter {
 
 		public Integer getProperty() {
@@ -1797,21 +1915,118 @@ public Integer getProperty() {
 		}
 	}
 
-	public static class OnlyBridgeMethod extends PackagePrivateClassWithGetter {
 
+	public static class OnlyBridgeMethod extends PackagePrivateClassWithGetter {
 	}
 
-	public static interface StaticFinal {
-		public static final String VALUE = "interfaceValue";
+
+	public interface StaticFinal {
+
+		String VALUE = "interfaceValue";
 	}
 
+
 	public abstract static class AbstractStaticFinal implements StaticFinal {
 	}
 
+
 	public static class StaticFinalImpl1 extends AbstractStaticFinal implements StaticFinal {
 	}
 
+
 	public static class StaticFinalImpl2 extends AbstractStaticFinal {
 	}
 
+
+	public static class Spr10486 {
+
+		private String name = "name";
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+	}
+
+
+	static class Spr11142 {
+
+		public String isSomething() {
+			return "";
+		}
+	}
+
+
+	static class TestClass2 {  // SPR-9194
+
+		String string;
+
+		public TestClass2(String string) {
+			this.string = string;
+		}
+
+		public boolean equals(Object other) {
+			return (this == other || (other instanceof TestClass2 &&
+					this.string.equals(((TestClass2) other).string)));
+		}
+
+		@Override
+		public int hashCode() {
+			return this.string.hashCode();
+		}
+	}
+
+
+	static class Spr11445Class implements BeanResolver {
+
+		private final AtomicInteger counter = new AtomicInteger();
+
+		public int echo(int invocation) {
+			return invocation;
+		}
+
+		public int parameter() {
+			return this.counter.incrementAndGet();
+		}
+
+		@Override
+		public Object resolve(EvaluationContext context, String beanName) throws AccessException {
+			return (beanName.equals("bean") ? this : null);
+		}
+	}
+
+
+	@SuppressWarnings({"rawtypes", "serial"})
+	public static class MapWithConstant extends HashMap {
+
+		public static final int X = 1;
+	}
+
+
+	public static class UnnamedUser {
+	}
+
+
+	public static class NamedUser {
+
+		public String getName() {
+			return "foo";
+		}
+	}
+
+
+	public static class GuavaLists {
+
+		public static <T> List<T> newArrayList(Iterable<T> iterable) {
+			return new ArrayList<T>();
+		}
+
+		public static <T> List<T> newArrayList(Object... elements) {
+			throw new UnsupportedOperationException();
+		}
+	}
+
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java
index a5216e9ca0..cbaf99014c 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,8 @@
 
 package org.springframework.expression.spel;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import org.junit.Test;
+
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.EvaluationException;
 import org.springframework.expression.Expression;
@@ -32,6 +28,8 @@
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Andy Clement
  * @author Juergen Hoeller
@@ -68,8 +66,8 @@ public boolean isTemplate() {
 		}
 	};
 
-	@Test
 
+	@Test
 	public void testParsingSimpleTemplateExpression01() throws Exception {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expr = parser.parseExpression("hello ${'world'}", DEFAULT_TEMPLATE_PARSER_CONTEXT);
@@ -148,19 +146,22 @@ public void testCompositeStringExpression() throws Exception {
 		try {
 			ex.setValue(ctx, null);
 			fail();
-		} catch (EvaluationException ee) {
+		}
+		catch (EvaluationException ee) {
 			// success
 		}
 		try {
 			ex.setValue((Object)null, null);
 			fail();
-		} catch (EvaluationException ee) {
+		}
+		catch (EvaluationException ee) {
 			// success
 		}
 		try {
 			ex.setValue(ctx, null, null);
 			fail();
-		} catch (EvaluationException ee) {
+		}
+		catch (EvaluationException ee) {
 			// success
 		}
 	}
@@ -192,15 +193,17 @@ public void testNestedExpressions() throws Exception {
 		try {
 			ex = parser.parseExpression("hello ${listOfNumbersUpToTen.$[#this<5]} ${listOfNumbersUpToTen.$[#this>5] world",DEFAULT_TEMPLATE_PARSER_CONTEXT);
 			fail("Should have failed");
-		} catch (ParseException pe) {
-			assertEquals("No ending suffix '}' for expression starting at character 41: ${listOfNumbersUpToTen.$[#this>5] world",pe.getMessage());
+		}
+		catch (ParseException pe) {
+			assertEquals("No ending suffix '}' for expression starting at character 41: ${listOfNumbersUpToTen.$[#this>5] world", pe.getMessage());
 		}
 
 		try {
 			ex = parser.parseExpression("hello ${listOfNumbersUpToTen.$[#root.listOfNumbersUpToTen.$[#this%2==1==3]} world",DEFAULT_TEMPLATE_PARSER_CONTEXT);
 			fail("Should have failed");
-		} catch (ParseException pe) {
-			assertEquals("Found closing '}' at position 74 but most recent opening is '[' at position 30",pe.getMessage());
+		}
+		catch (ParseException pe) {
+			assertEquals("Found closing '}' at position 74 but most recent opening is '[' at position 30", pe.getMessage());
 		}
 	}
 
@@ -234,21 +237,24 @@ public void testErrorCases() throws Exception {
 		try {
 			parser.parseExpression("hello ${'world'", DEFAULT_TEMPLATE_PARSER_CONTEXT);
 			fail("Should have failed");
-		} catch (ParseException pe) {
-			assertEquals("No ending suffix '}' for expression starting at character 6: ${'world'",pe.getMessage());
+		}
+		catch (ParseException pe) {
+			assertEquals("No ending suffix '}' for expression starting at character 6: ${'world'", pe.getMessage());
 			assertEquals("hello ${'world'",pe.getExpressionString());
 		}
 		try {
 			parser.parseExpression("hello ${'wibble'${'world'}", DEFAULT_TEMPLATE_PARSER_CONTEXT);
 			fail("Should have failed");
-		} catch (ParseException pe) {
-			assertEquals("No ending suffix '}' for expression starting at character 6: ${'wibble'${'world'}",pe.getMessage());
+		}
+		catch (ParseException pe) {
+			assertEquals("No ending suffix '}' for expression starting at character 6: ${'wibble'${'world'}", pe.getMessage());
 		}
 		try {
 			parser.parseExpression("hello ${} world", DEFAULT_TEMPLATE_PARSER_CONTEXT);
 			fail("Should have failed");
-		} catch (ParseException pe) {
-			assertEquals("No expression defined within delimiter '${}' at character 6",pe.getMessage());
+		}
+		catch (ParseException pe) {
+			assertEquals("No expression defined within delimiter '${}' at character 6", pe.getMessage());
 		}
 	}
 
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java b/spring-expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java
index 05327188c0..caea1aa457 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/TestScenarioCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
 import org.springframework.expression.spel.testresources.Inventor;
 import org.springframework.expression.spel.testresources.PlaceOfBirth;
 
-///CLOVER:OFF
 /**
- * Builds an evaluation context for test expressions. Features of the test evaluation context are:
+ * Builds an evaluation context for test expressions.
+ * Features of the test evaluation context are:
  * <ul>
  * <li>The root context object is an Inventor instance {@link Inventor}
  * </ul>
@@ -45,21 +45,19 @@ public static StandardEvaluationContext getTestEvaluationContext() {
 	 */
 	private static void populateFunctions(StandardEvaluationContext testContext) {
 		try {
-			testContext.registerFunction("isEven", TestScenarioCreator.class.getDeclaredMethod("isEven",
-					new Class[] { Integer.TYPE }));
-			testContext.registerFunction("reverseInt", TestScenarioCreator.class.getDeclaredMethod("reverseInt",
-					new Class[] { Integer.TYPE, Integer.TYPE, Integer.TYPE }));
-			testContext.registerFunction("reverseString", TestScenarioCreator.class.getDeclaredMethod("reverseString",
-					new Class[] { String.class }));
-			testContext.registerFunction("varargsFunctionReverseStringsAndMerge", TestScenarioCreator.class
-					.getDeclaredMethod("varargsFunctionReverseStringsAndMerge", new Class[] { String[].class }));
-			testContext.registerFunction("varargsFunctionReverseStringsAndMerge2", TestScenarioCreator.class
-					.getDeclaredMethod("varargsFunctionReverseStringsAndMerge2", new Class[] { Integer.TYPE,
-							String[].class }));
-		} catch (SecurityException e) {
-			e.printStackTrace();
-		} catch (NoSuchMethodException e) {
-			e.printStackTrace();
+			testContext.registerFunction("isEven",
+					TestScenarioCreator.class.getDeclaredMethod("isEven", Integer.TYPE));
+			testContext.registerFunction("reverseInt",
+					TestScenarioCreator.class.getDeclaredMethod("reverseInt", Integer.TYPE, Integer.TYPE, Integer.TYPE));
+			testContext.registerFunction("reverseString",
+					TestScenarioCreator.class.getDeclaredMethod("reverseString", String.class));
+			testContext.registerFunction("varargsFunctionReverseStringsAndMerge",
+					TestScenarioCreator.class.getDeclaredMethod("varargsFunctionReverseStringsAndMerge", String[].class));
+			testContext.registerFunction("varargsFunctionReverseStringsAndMerge2",
+					TestScenarioCreator.class.getDeclaredMethod("varargsFunctionReverseStringsAndMerge2", Integer.TYPE, String[].class));
+		}
+		catch (Exception ex) {
+			throw new IllegalStateException(ex);
 		}
 	}
 
@@ -72,9 +70,8 @@ private static void populateVariables(StandardEvaluationContext testContext) {
 	}
 
 	/**
-	 * Create the root context object, an Inventor instance. Non-qualified property and method references will be
-	 * resolved against this context object.
-	 *
+	 * Create the root context object, an Inventor instance. Non-qualified property
+	 * and method references will be resolved against this context object.
 	 * @param testContext the evaluation context in which to set the root object
 	 */
 	private static void setupRootContextObject(StandardEvaluationContext testContext) {
@@ -88,12 +85,14 @@ private static void setupRootContextObject(StandardEvaluationContext testContext
 		testContext.setRootObject(tesla);
 	}
 
+
 	// These methods are registered in the test context and therefore accessible through function calls
 	// in test expressions
 
 	public static String isEven(int i) {
-		if ((i % 2) == 0)
+		if ((i % 2) == 0) {
 			return "y";
+		}
 		return "n";
 	}
 
@@ -129,4 +128,5 @@ public static String varargsFunctionReverseStringsAndMerge2(int j, String... str
 		}
 		return sb.toString();
 	}
+
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java
index c31a94a71b..68911b9bce 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java
@@ -335,6 +335,12 @@ public void testReflectivePropertyResolver() throws Exception {
 		assertEquals("id",rpr.read(ctx,t,"Id").getValue());
 		assertTrue(rpr.canRead(ctx,t,"Id"));
 
+		// repro SPR-10994
+		assertEquals("xyZ",rpr.read(ctx,t,"xyZ").getValue());
+		assertTrue(rpr.canRead(ctx,t,"xyZ"));
+		assertEquals("xY",rpr.read(ctx,t,"xY").getValue());
+		assertTrue(rpr.canRead(ctx,t,"xY"));
+
 		// SPR-10122, ReflectivePropertyAccessor JavaBean property names compliance tests - setters
 		rpr.write(ctx, t, "pEBS","Test String");
 		assertEquals("Test String",rpr.read(ctx,t,"pEBS").getValue());
@@ -429,6 +435,8 @@ static class Tester {
 		String id = "id";
 		String ID = "ID";
 		String pEBS = "pEBS";
+		String xY = "xY";
+		String xyZ = "xyZ";
 
 		public String getProperty() { return property; }
 		public void setProperty(String value) { property = value; }
@@ -445,6 +453,10 @@ static class Tester {
 
 		public String getID() { return ID; }
 
+		public String getXY() { return xY; }
+
+		public String getXyZ() { return xyZ; }
+
 		public String getpEBS() {
 			return pEBS;
 		}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java
index 87f63a3914..efc60ba973 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -30,8 +31,8 @@ public class Inventor {
 	private boolean accessedThroughGetSet;
 	public List<Integer> listOfInteger = new ArrayList<Integer>();
 	public List<Boolean> booleanList = new ArrayList<Boolean>();
-	public Map<String,Boolean> mapOfStringToBoolean = new HashMap<String,Boolean>();
-	public Map<Integer,String> mapOfNumbersUpToTen = new HashMap<Integer,String>();
+	public Map<String,Boolean> mapOfStringToBoolean = new LinkedHashMap<String,Boolean>();
+	public Map<Integer,String> mapOfNumbersUpToTen = new LinkedHashMap<Integer,String>();
 	public List<Integer> listOfNumbersUpToTen = new ArrayList<Integer>();
 	public List<Integer> listOneFive = new ArrayList<Integer>();
 	public String[] stringArrayOfThreeItems = new String[]{"1","2","3"};
diff --git a/spring-framework-bom/spring-framework-bom.txt b/spring-framework-bom/spring-framework-bom.txt
new file mode 100644
index 0000000000..9671db5d5f
--- /dev/null
+++ b/spring-framework-bom/spring-framework-bom.txt
@@ -0,0 +1,2 @@
+This meta-project is used to generate a bill-of-materials POM that contains the other
+projects in a dependencyManagement section.
diff --git a/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
index b97b4983e3..d510918dea 100644
--- a/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
+++ b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 import org.apache.catalina.loader.ResourceEntry;
 import org.apache.catalina.loader.WebappClassLoader;
+
 import org.springframework.instrument.classloading.WeavingTransformer;
 
 /**
@@ -31,8 +32,8 @@
  * <p>To be registered using a
  * {@code <a href="http://tomcat.apache.org/tomcat-5.5-doc/config/loader.html">Loader</a>} tag
  * in Tomcat's {@code <a href="http://tomcat.apache.org/tomcat-5.5-doc/config/context.html">Context</a>}
- * definition in the {@code server.xml} file, with the Spring-provided
- * "spring-tomcat-weaver.jar" file deployed into Tomcat's "server/lib" (for Tomcat 5.x) or "lib" (for Tomcat 6.x) directory.
+ * definition in the {@code server.xml} file, with the Spring-provided "spring-instrument-tomcat.jar"
+ * file deployed into Tomcat's "server/lib" (for Tomcat 5.x) or "lib" (for Tomcat 6.x) directory.
  * The required configuration tag looks as follows:
  *
  * <pre class="code">&lt;Loader loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader"/&gt;</pre>
@@ -58,6 +59,7 @@
 public class TomcatInstrumentableClassLoader extends WebappClassLoader {
 
 	private static final String CLASS_SUFFIX = ".class";
+
 	/** Use an internal WeavingTransformer */
 	private final WeavingTransformer weavingTransformer;
 
@@ -101,8 +103,7 @@ public void addTransformer(ClassFileTransformer transformer) {
 	 */
 	public ClassLoader getThrowawayClassLoader() {
 		WebappClassLoader tempLoader = new WebappClassLoader();
-		// Use reflection to copy all the fields since most of them are private
-		// on pre-5.5 Tomcat.
+		// Use reflection to copy all the fields since most of them are private on pre-5.5 Tomcat.
 		shallowCopyFieldState(this, tempLoader);
 		return tempLoader;
 	}
@@ -111,12 +112,9 @@ public ClassLoader getThrowawayClassLoader() {
 	@Override
 	protected ResourceEntry findResourceInternal(String name, String path) {
 		ResourceEntry entry = super.findResourceInternal(name, path);
-		// Postpone String parsing as much as possible (it is slow).
 		if (entry != null && entry.binaryContent != null && path.endsWith(CLASS_SUFFIX)) {
-			String className = (name.endsWith(CLASS_SUFFIX) ? name.substring(0, name.length() - CLASS_SUFFIX.length())
-					: name);
-			byte[] transformed = this.weavingTransformer.transformIfNecessary(className, entry.binaryContent);
-			entry.binaryContent = transformed;
+			String className = (name.endsWith(CLASS_SUFFIX) ? name.substring(0, name.length() - CLASS_SUFFIX.length()) : name);
+			entry.binaryContent = this.weavingTransformer.transformIfNecessary(className, entry.binaryContent);
 		}
 		return entry;
 	}
@@ -124,8 +122,7 @@ protected ResourceEntry findResourceInternal(String name, String path) {
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder(getClass().getName());
-		sb.append("\r\n");
-		sb.append(super.toString());
+		sb.append("\r\n").append(super.toString());
 		return sb.toString();
 	}
 
@@ -133,43 +130,23 @@ public String toString() {
 	// The code below is originally taken from ReflectionUtils and optimized for
 	// local usage. There is no dependency on ReflectionUtils to keep this class
 	// self-contained (since it gets deployed into Tomcat's server class loader).
-
-	/**
-	 * Given the source object and the destination, which must be the same class
-	 * or a subclass, copy all fields, including inherited fields. Designed to
-	 * work on objects with public no-arg constructors.
-	 * @throws IllegalArgumentException if arguments are incompatible or either
-	 * is {@code null}
-	 */
-	private static void shallowCopyFieldState(final Object src, final Object dest) throws IllegalArgumentException {
-		if (src == null) {
-			throw new IllegalArgumentException("Source for field copy cannot be null");
-		}
-		if (dest == null) {
-			throw new IllegalArgumentException("Destination for field copy cannot be null");
-		}
-		Class targetClass = findCommonAncestor(src.getClass(), dest.getClass());
-
+	private static void shallowCopyFieldState(final WebappClassLoader src, final WebappClassLoader dest) {
+		Class<?> targetClass = WebappClassLoader.class;
 		// Keep backing up the inheritance hierarchy.
 		do {
-			// Copy each field declared on this class unless it's static or
-			// file.
 			Field[] fields = targetClass.getDeclaredFields();
-			for (int i = 0; i < fields.length; i++) {
-				Field field = fields[i];
-				// Skip static and final fields (the old FieldFilter)
-				// do not copy resourceEntries - it's a cache that holds class entries.
+			for (Field field : fields) {
+				// Do not copy resourceEntries - it's a cache that holds class entries.
 				if (!(Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers()) ||
 						field.getName().equals("resourceEntries"))) {
 					try {
-						// copy the field (the old FieldCallback)
 						field.setAccessible(true);
 						Object srcValue = field.get(src);
 						field.set(dest, srcValue);
 					}
 					catch (IllegalAccessException ex) {
 						throw new IllegalStateException(
-								"Shouldn't be illegal to access field '" + fields[i].getName() + "': " + ex);
+								"Shouldn't be illegal to access field '" + field.getName() + "': " + ex);
 					}
 				}
 			}
@@ -178,23 +155,4 @@ private static void shallowCopyFieldState(final Object src, final Object dest) t
 		while (targetClass != null && targetClass != Object.class);
 	}
 
-	private static Class findCommonAncestor(Class one, Class two) throws IllegalArgumentException {
-		Class ancestor = one;
-		while (ancestor != Object.class || ancestor != null) {
-			if (ancestor.isAssignableFrom(two)) {
-				return ancestor;
-			}
-			ancestor = ancestor.getSuperclass();
-		}
-		// try the other class hierarchy
-		ancestor = two;
-		while (ancestor != Object.class || ancestor != null) {
-			if (ancestor.isAssignableFrom(one)) {
-				return ancestor;
-			}
-			ancestor = ancestor.getSuperclass();
-		}
-		return null;
-	}
-
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
index dde8067753..b88a22b1b5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,8 @@
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.jdbc.support.JdbcUtils;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link RowMapper} implementation that converts a row into a new instance
@@ -55,14 +57,14 @@
  * <p>To facilitate mapping between columns and fields that don't have matching names,
  * try using column aliases in the SQL statement like "select fname as first_name from customer".
  *
- * <p>For 'null' values read from the databasem, we will attempt to call the setter, but in the case of
+ * <p>For 'null' values read from the database, we will attempt to call the setter, but in the case of
  * Java primitives, this causes a TypeMismatchException. This class can be configured (using the
  * primitivesDefaultedForNullValue property) to trap this exception and use the primitives default value.
  * Be aware that if you use the values from the generated bean to update the database the primitive value
  * will have been set to the primitive's default value instead of null.
  *
  * <p>Please note that this class is designed to provide convenience rather than high performance.
- * For best performance consider using a custom RowMapper.
+ * For best performance, consider using a custom {@link RowMapper} implementation.
  *
  * @author Thomas Risberg
  * @author Juergen Hoeller
@@ -90,7 +92,7 @@ public class BeanPropertyRowMapper<T> implements RowMapper<T> {
 
 
 	/**
-	 * Create a new BeanPropertyRowMapper for bean-style configuration.
+	 * Create a new {@code BeanPropertyRowMapper} for bean-style configuration.
 	 * @see #setMappedClass
 	 * @see #setCheckFullyPopulated
 	 */
@@ -98,8 +100,8 @@ public BeanPropertyRowMapper() {
 	}
 
 	/**
-	 * Create a new BeanPropertyRowMapper, accepting unpopulated properties
-	 * in the target bean.
+	 * Create a new {@code BeanPropertyRowMapper}, accepting unpopulated
+	 * properties in the target bean.
 	 * <p>Consider using the {@link #newInstance} factory method instead,
 	 * which allows for specifying the mapped type once only.
 	 * @param mappedClass the class that each row should be mapped to
@@ -109,7 +111,7 @@ public BeanPropertyRowMapper(Class<T> mappedClass) {
 	}
 
 	/**
-	 * Create a new BeanPropertyRowMapper.
+	 * Create a new {@code BeanPropertyRowMapper}.
 	 * @param mappedClass the class that each row should be mapped to
 	 * @param checkFullyPopulated whether we're strictly validating that
 	 * all bean properties have been mapped from corresponding database fields
@@ -135,51 +137,6 @@ public void setMappedClass(Class<T> mappedClass) {
 		}
 	}
 
-	/**
-	 * Initialize the mapping metadata for the given class.
-	 * @param mappedClass the mapped class.
-	 */
-	protected void initialize(Class<T> mappedClass) {
-		this.mappedClass = mappedClass;
-		this.mappedFields = new HashMap<String, PropertyDescriptor>();
-		this.mappedProperties = new HashSet<String>();
-		PropertyDescriptor[] pds = BeanUtils.getPropertyDescriptors(mappedClass);
-		for (PropertyDescriptor pd : pds) {
-			if (pd.getWriteMethod() != null) {
-				this.mappedFields.put(pd.getName().toLowerCase(), pd);
-				String underscoredName = underscoreName(pd.getName());
-				if (!pd.getName().toLowerCase().equals(underscoredName)) {
-					this.mappedFields.put(underscoredName, pd);
-				}
-				this.mappedProperties.add(pd.getName());
-			}
-		}
-	}
-
-	/**
-	 * Convert a name in camelCase to an underscored name in lower case.
-	 * Any upper case letters are converted to lower case with a preceding underscore.
-	 * @param name the string containing original name
-	 * @return the converted name
-	 */
-	private String underscoreName(String name) {
-		StringBuilder result = new StringBuilder();
-		if (name != null && name.length() > 0) {
-			result.append(name.substring(0, 1).toLowerCase());
-			for (int i = 1; i < name.length(); i++) {
-				String s = name.substring(i, i + 1);
-				if (s.equals(s.toUpperCase())) {
-					result.append("_");
-					result.append(s.toLowerCase());
-				}
-				else {
-					result.append(s);
-				}
-			}
-		}
-		return result.toString();
-	}
-
 	/**
 	 * Get the class that we are mapping to.
 	 */
@@ -188,10 +145,9 @@ public final Class<T> getMappedClass() {
 	}
 
 	/**
-	 * Set whether we're strictly validating that all bean properties have been
-	 * mapped from corresponding database fields.
-	 * <p>Default is {@code false}, accepting unpopulated properties in the
-	 * target bean.
+	 * Set whether we're strictly validating that all bean properties have been mapped
+	 * from corresponding database fields.
+	 * <p>Default is {@code false}, accepting unpopulated properties in the target bean.
 	 */
 	public void setCheckFullyPopulated(boolean checkFullyPopulated) {
 		this.checkFullyPopulated = checkFullyPopulated;
@@ -219,7 +175,54 @@ public void setPrimitivesDefaultedForNullValue(boolean primitivesDefaultedForNul
 	 * from corresponding database fields.
 	 */
 	public boolean isPrimitivesDefaultedForNullValue() {
-		return primitivesDefaultedForNullValue;
+		return this.primitivesDefaultedForNullValue;
+	}
+
+
+	/**
+	 * Initialize the mapping metadata for the given class.
+	 * @param mappedClass the mapped class
+	 */
+	protected void initialize(Class<T> mappedClass) {
+		this.mappedClass = mappedClass;
+		this.mappedFields = new HashMap<String, PropertyDescriptor>();
+		this.mappedProperties = new HashSet<String>();
+		PropertyDescriptor[] pds = BeanUtils.getPropertyDescriptors(mappedClass);
+		for (PropertyDescriptor pd : pds) {
+			if (pd.getWriteMethod() != null) {
+				this.mappedFields.put(pd.getName().toLowerCase(), pd);
+				String underscoredName = underscoreName(pd.getName());
+				if (!pd.getName().toLowerCase().equals(underscoredName)) {
+					this.mappedFields.put(underscoredName, pd);
+				}
+				this.mappedProperties.add(pd.getName());
+			}
+		}
+	}
+
+	/**
+	 * Convert a name in camelCase to an underscored name in lower case.
+	 * Any upper case letters are converted to lower case with a preceding underscore.
+	 * @param name the original name
+	 * @return the converted name
+	 */
+	private String underscoreName(String name) {
+		if (!StringUtils.hasLength(name)) {
+			return "";
+		}
+		StringBuilder result = new StringBuilder();
+		result.append(name.substring(0, 1).toLowerCase());
+		for (int i = 1; i < name.length(); i++) {
+			String s = name.substring(i, i + 1);
+			String slc = s.toLowerCase();
+			if (!s.equals(slc)) {
+				result.append("_").append(slc);
+			}
+			else {
+				result.append(s);
+			}
+		}
+		return result.toString();
 	}
 
 
@@ -240,26 +243,30 @@ public T mapRow(ResultSet rs, int rowNumber) throws SQLException {
 
 		for (int index = 1; index <= columnCount; index++) {
 			String column = JdbcUtils.lookupColumnName(rsmd, index);
-			PropertyDescriptor pd = this.mappedFields.get(column.replaceAll(" ", "").toLowerCase());
+			String field = column.replaceAll(" ", "").toLowerCase();
+			PropertyDescriptor pd = this.mappedFields.get(field);
 			if (pd != null) {
 				try {
 					Object value = getColumnValue(rs, index, pd);
-					if (logger.isDebugEnabled() && rowNumber == 0) {
-						logger.debug("Mapping column '" + column + "' to property '" +
-								pd.getName() + "' of type " + pd.getPropertyType());
+					if (rowNumber == 0 && logger.isDebugEnabled()) {
+						logger.debug("Mapping column '" + column + "' to property '" + pd.getName() +
+								"' of type [" + ClassUtils.getQualifiedName(pd.getPropertyType()) + "]");
 					}
 					try {
 						bw.setPropertyValue(pd.getName(), value);
 					}
-					catch (TypeMismatchException e) {
-						if (value == null && primitivesDefaultedForNullValue) {
-							logger.debug("Intercepted TypeMismatchException for row " + rowNumber +
-									" and column '" + column + "' with value " + value +
-									" when setting property '" + pd.getName() + "' of type " + pd.getPropertyType() +
-									" on object: " + mappedObject);
+					catch (TypeMismatchException ex) {
+						if (value == null && this.primitivesDefaultedForNullValue) {
+							if (logger.isDebugEnabled()) {
+								logger.debug("Intercepted TypeMismatchException for row " + rowNumber +
+										" and column '" + column + "' with null value when setting property '" +
+										pd.getName() + "' of type [" +
+										ClassUtils.getQualifiedName(pd.getPropertyType()) +
+										"] on object: " + mappedObject, ex);
+							}
 						}
 						else {
-							throw e;
+							throw ex;
 						}
 					}
 					if (populatedProperties != null) {
@@ -268,14 +275,21 @@ public T mapRow(ResultSet rs, int rowNumber) throws SQLException {
 				}
 				catch (NotWritablePropertyException ex) {
 					throw new DataRetrievalFailureException(
-							"Unable to map column " + column + " to property " + pd.getName(), ex);
+							"Unable to map column '" + column + "' to property '" + pd.getName() + "'", ex);
+				}
+			}
+			else {
+				// No PropertyDescriptor found
+				if (rowNumber == 0 && logger.isDebugEnabled()) {
+					logger.debug("No property found for column '" + column + "' mapped to field '" + field + "'");
 				}
 			}
 		}
 
 		if (populatedProperties != null && !populatedProperties.equals(this.mappedProperties)) {
 			throw new InvalidDataAccessApiUsageException("Given ResultSet does not contain all fields " +
-					"necessary to populate object of class [" + this.mappedClass + "]: " + this.mappedProperties);
+					"necessary to populate object of class [" + this.mappedClass.getName() + "]: " +
+					this.mappedProperties);
 		}
 
 		return mappedObject;
@@ -310,7 +324,7 @@ protected Object getColumnValue(ResultSet rs, int index, PropertyDescriptor pd)
 
 
 	/**
-	 * Static factory method to create a new BeanPropertyRowMapper
+	 * Static factory method to create a new {@code BeanPropertyRowMapper}
 	 * (with the mapped class specified only once).
 	 * @param mappedClass the class that each row should be mapped to
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
index 6db102fc64..0c41df7cc5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -311,8 +311,7 @@ public interface JdbcOperations {
 	 * @return a result object returned by the action, or {@code null}
 	 * @throws DataAccessException if there is any problem
 	 */
-	<T> T execute(PreparedStatementCreator psc, PreparedStatementCallback<T> action)
-			throws DataAccessException;
+	<T> T execute(PreparedStatementCreator psc, PreparedStatementCallback<T> action) throws DataAccessException;
 
 	/**
 	 * Execute a JDBC data access operation, implemented as callback action
@@ -354,8 +353,7 @@ <T> T execute(PreparedStatementCreator psc, PreparedStatementCallback<T> action)
 	 * @return an arbitrary result object, as returned by the ResultSetExtractor
 	 * @throws DataAccessException if there is any problem
 	 */
-	<T> T query(String sql, PreparedStatementSetter pss, ResultSetExtractor<T> rse)
-			throws DataAccessException;
+	<T> T query(String sql, PreparedStatementSetter pss, ResultSetExtractor<T> rse) throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a list
@@ -370,8 +368,7 @@ <T> T query(String sql, PreparedStatementSetter pss, ResultSetExtractor<T> rse)
 	 * @throws DataAccessException if the query fails
 	 * @see java.sql.Types
 	 */
-	<T> T query(String sql, Object[] args, int[] argTypes, ResultSetExtractor<T> rse)
-			throws DataAccessException;
+	<T> T query(String sql, Object[] args, int[] argTypes, ResultSetExtractor<T> rse) throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a list
@@ -428,8 +425,7 @@ <T> T query(String sql, Object[] args, int[] argTypes, ResultSetExtractor<T> rse
 	 * @param rch object that will extract results, one row at a time
 	 * @throws DataAccessException if the query fails
 	 */
-	void query(String sql, PreparedStatementSetter pss, RowCallbackHandler rch)
-			throws DataAccessException;
+	void query(String sql, PreparedStatementSetter pss, RowCallbackHandler rch) throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a list of
@@ -443,8 +439,7 @@ void query(String sql, PreparedStatementSetter pss, RowCallbackHandler rch)
 	 * @throws DataAccessException if the query fails
 	 * @see java.sql.Types
 	 */
-	void query(String sql, Object[] args, int[] argTypes, RowCallbackHandler rch)
-			throws DataAccessException;
+	void query(String sql, Object[] args, int[] argTypes, RowCallbackHandler rch) throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a list of
@@ -500,8 +495,7 @@ void query(String sql, Object[] args, int[] argTypes, RowCallbackHandler rch)
 	 * @return the result List, containing mapped objects
 	 * @throws DataAccessException if the query fails
 	 */
-	<T> List<T> query(String sql, PreparedStatementSetter pss, RowMapper<T> rowMapper)
-			throws DataAccessException;
+	<T> List<T> query(String sql, PreparedStatementSetter pss, RowMapper<T> rowMapper) throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a list
@@ -516,8 +510,7 @@ <T> List<T> query(String sql, PreparedStatementSetter pss, RowMapper<T> rowMappe
 	 * @throws DataAccessException if the query fails
 	 * @see java.sql.Types
 	 */
-	<T> List<T> query(String sql, Object[] args, int[] argTypes, RowMapper<T> rowMapper)
-			throws DataAccessException;
+	<T> List<T> query(String sql, Object[] args, int[] argTypes, RowMapper<T> rowMapper) throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a list
@@ -582,8 +575,7 @@ <T> T queryForObject(String sql, Object[] args, int[] argTypes, RowMapper<T> row
 	 * return exactly one row
 	 * @throws DataAccessException if the query fails
 	 */
-	<T> T queryForObject(String sql, Object[] args, RowMapper<T> rowMapper)
-			throws DataAccessException;
+	<T> T queryForObject(String sql, Object[] args, RowMapper<T> rowMapper) throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a list
@@ -600,8 +592,7 @@ <T> T queryForObject(String sql, Object[] args, RowMapper<T> rowMapper)
 	 * return exactly one row
 	 * @throws DataAccessException if the query fails
 	 */
-	<T> T queryForObject(String sql, RowMapper<T> rowMapper, Object... args)
-			throws DataAccessException;
+	<T> T queryForObject(String sql, RowMapper<T> rowMapper, Object... args) throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a
@@ -1009,7 +1000,7 @@ <T>List<T> queryForList(String sql, Object[] args, int[] argTypes, Class<T> elem
 	 * @param batchArgs the List of Object arrays containing the batch of arguments for the query
 	 * @return an array containing the numbers of rows affected by each update in the batch
 	 */
-	public int[] batchUpdate(String sql, List<Object[]> batchArgs);
+	public int[] batchUpdate(String sql, List<Object[]> batchArgs) throws DataAccessException;
 
 	/**
 	 * Execute a batch using the supplied SQL statement with the batch of supplied arguments.
@@ -1019,7 +1010,7 @@ <T>List<T> queryForList(String sql, Object[] args, int[] argTypes, Class<T> elem
 	 * (constants from {@code java.sql.Types})
 	 * @return an array containing the numbers of rows affected by each update in the batch
 	 */
-	public int[] batchUpdate(String sql, List<Object[]> batchArgs, int[] argTypes);
+	public int[] batchUpdate(String sql, List<Object[]> batchArgs, int[] argTypes) throws DataAccessException;
 
 	/**
 	 * Execute multiple batches using the supplied SQL statement with the collect of supplied arguments.
@@ -1032,7 +1023,9 @@ <T>List<T> queryForList(String sql, Object[] args, int[] argTypes, Class<T> elem
 	 * @return an array containing for each batch another array containing the numbers of rows affected
 	 * by each update in the batch
 	 */
-	public <T> int[][] batchUpdate(String sql, Collection<T> batchArgs, int batchSize, ParameterizedPreparedStatementSetter<T> pss);
+	public <T> int[][] batchUpdate(String sql, Collection<T> batchArgs, int batchSize,
+			ParameterizedPreparedStatementSetter<T> pss) throws DataAccessException;
+
 
 	//-------------------------------------------------------------------------
 	// Methods dealing with callable statements
@@ -1051,8 +1044,7 @@ <T>List<T> queryForList(String sql, Object[] args, int[] argTypes, Class<T> elem
 	 * @return a result object returned by the action, or {@code null}
 	 * @throws DataAccessException if there is any problem
 	 */
-	<T> T execute(CallableStatementCreator csc, CallableStatementCallback<T> action)
-			throws DataAccessException;
+	<T> T execute(CallableStatementCreator csc, CallableStatementCallback<T> action) throws DataAccessException;
 
 	/**
 	 * Execute a JDBC data access operation, implemented as callback action
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
index 6edb4ca48c..b98adcdb42 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -367,7 +367,7 @@ public <T> T execute(ConnectionCallback<T> action) throws DataAccessException {
 	protected Connection createConnectionProxy(Connection con) {
 		return (Connection) Proxy.newProxyInstance(
 				ConnectionProxy.class.getClassLoader(),
-				new Class[] {ConnectionProxy.class},
+				new Class<?>[] {ConnectionProxy.class},
 				new CloseSuppressingInvocationHandler(con));
 	}
 
@@ -929,21 +929,17 @@ public int[] doInPreparedStatement(PreparedStatement ps) throws SQLException {
 		});
 	}
 
-	public int[] batchUpdate(String sql, List<Object[]> batchArgs) {
+	public int[] batchUpdate(String sql, List<Object[]> batchArgs) throws DataAccessException {
 		return batchUpdate(sql, batchArgs, new int[0]);
 	}
 
-	public int[] batchUpdate(String sql, List<Object[]> batchArgs, int[] argTypes) {
+	public int[] batchUpdate(String sql, List<Object[]> batchArgs, int[] argTypes) throws DataAccessException {
 		return BatchUpdateUtils.executeBatchUpdate(sql, batchArgs, argTypes, this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.jdbc.core.JdbcOperations#batchUpdate(java.lang.String, java.util.Collection, int, org.springframework.jdbc.core.ParameterizedPreparedStatementSetter)
-	 *
-	 * Contribution by Nicolas Fabre
-	 */
-	public <T> int[][] batchUpdate(String sql, final Collection<T> batchArgs, final int batchSize, final ParameterizedPreparedStatementSetter<T> pss) {
+	public <T> int[][] batchUpdate(String sql, final Collection<T> batchArgs, final int batchSize,
+			final ParameterizedPreparedStatementSetter<T> pss) throws DataAccessException {
+
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing SQL batch update [" + sql + "] with a batch size of " + batchSize);
 		}
@@ -1092,28 +1088,29 @@ public Map<String, Object> doInCallableStatement(CallableStatement cs) throws SQ
 	 * @param resultSetParameters Parameter list of declared resultSet parameters for the stored procedure
 	 * @return Map that contains returned results
 	 */
-	@SuppressWarnings("rawtypes")
-	protected Map<String, Object> extractReturnedResults(
-			CallableStatement cs, List updateCountParameters, List resultSetParameters, int updateCount)
+	protected Map<String, Object> extractReturnedResults(CallableStatement cs,
+			List<SqlParameter> updateCountParameters, List<SqlParameter> resultSetParameters, int updateCount)
 			throws SQLException {
 
 		Map<String, Object> returnedResults = new HashMap<String, Object>();
 		int rsIndex = 0;
 		int updateIndex = 0;
 		boolean moreResults;
-		if (!skipResultsProcessing) {
+		if (!this.skipResultsProcessing) {
 			do {
 				if (updateCount == -1) {
 					if (resultSetParameters != null && resultSetParameters.size() > rsIndex) {
-						SqlReturnResultSet declaredRsParam = (SqlReturnResultSet)resultSetParameters.get(rsIndex);
+						SqlReturnResultSet declaredRsParam = (SqlReturnResultSet) resultSetParameters.get(rsIndex);
 						returnedResults.putAll(processResultSet(cs.getResultSet(), declaredRsParam));
 						rsIndex++;
 					}
 					else {
-						if (!skipUndeclaredResults) {
+						if (!this.skipUndeclaredResults) {
 							String rsName = RETURN_RESULT_SET_PREFIX + (rsIndex + 1);
 							SqlReturnResultSet undeclaredRsParam = new SqlReturnResultSet(rsName, new ColumnMapRowMapper());
-							logger.info("Added default SqlReturnResultSet parameter named " + rsName);
+							if (logger.isDebugEnabled()) {
+								logger.debug("Added default SqlReturnResultSet parameter named '" + rsName + "'");
+							}
 							returnedResults.putAll(processResultSet(cs.getResultSet(), undeclaredRsParam));
 							rsIndex++;
 						}
@@ -1121,16 +1118,18 @@ protected Map<String, Object> extractReturnedResults(
 				}
 				else {
 					if (updateCountParameters != null && updateCountParameters.size() > updateIndex) {
-						SqlReturnUpdateCount ucParam = (SqlReturnUpdateCount)updateCountParameters.get(updateIndex);
+						SqlReturnUpdateCount ucParam = (SqlReturnUpdateCount) updateCountParameters.get(updateIndex);
 						String declaredUcName = ucParam.getName();
 						returnedResults.put(declaredUcName, updateCount);
 						updateIndex++;
 					}
 					else {
-						if (!skipUndeclaredResults) {
-							String undeclaredUcName = RETURN_UPDATE_COUNT_PREFIX + (updateIndex + 1);
-							logger.info("Added default SqlReturnUpdateCount parameter named " + undeclaredUcName);
-							returnedResults.put(undeclaredUcName, updateCount);
+						if (!this.skipUndeclaredResults) {
+							String undeclaredName = RETURN_UPDATE_COUNT_PREFIX + (updateIndex + 1);
+							if (logger.isDebugEnabled()) {
+								logger.debug("Added default SqlReturnUpdateCount parameter named '" + undeclaredName + "'");
+							}
+							returnedResults.put(undeclaredName, updateCount);
 							updateIndex++;
 						}
 					}
@@ -1174,8 +1173,10 @@ protected Map<String, Object> extractOutputParameters(CallableStatement cs, List
 						else {
 							String rsName = outParam.getName();
 							SqlReturnResultSet rsParam = new SqlReturnResultSet(rsName, new ColumnMapRowMapper());
-							returnedResults.putAll(processResultSet(cs.getResultSet(), rsParam));
-							logger.info("Added default SqlReturnResultSet parameter named " + rsName);
+							returnedResults.putAll(processResultSet((ResultSet) out, rsParam));
+							if (logger.isDebugEnabled()) {
+								logger.debug("Added default SqlReturnResultSet parameter named '" + rsName + "'");
+							}
 						}
 					}
 					else {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
index 9845cec064..500e1523e4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,8 @@
 import java.sql.SQLException;
 
 /**
- * Parameterized callback interface used by the {@link JdbcTemplate} class for batch updates.
+ * Parameterized callback interface used by the {@link JdbcTemplate} class for
+ * batch updates.
  *
  * <p>This interface sets values on a {@link java.sql.PreparedStatement} provided
  * by the JdbcTemplate class, for each of a number of updates in a batch using the
@@ -40,7 +41,6 @@ public interface ParameterizedPreparedStatementSetter<T> {
 
 	/**
 	 * Set parameter values on the given PreparedStatement.
-	 *
 	 * @param ps the PreparedStatement to invoke setter methods on
 	 * @param argument the object containing the values to be set
 	 * @throws SQLException if a SQLException is encountered (i.e. there is no need to catch SQLException)
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
index 6ba84b72b8..daa9e5c7d2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public class PreparedStatementCreatorFactory {
 	/** The SQL, which won't change when the parameters change */
 	private final String sql;
 
-	/** List of SqlParameter objects. May not be {@code null}. */
+	/** List of SqlParameter objects (may not be {@code null}) */
 	private final List<SqlParameter> declaredParameters;
 
 	private int resultSetType = ResultSet.TYPE_FORWARD_ONLY;
@@ -76,7 +76,7 @@ public PreparedStatementCreatorFactory(String sql) {
 	 * @param sql SQL to execute
 	 * @param types int array of JDBC types
 	 */
-	public PreparedStatementCreatorFactory(String sql, int[] types) {
+	public PreparedStatementCreatorFactory(String sql, int... types) {
 		this.sql = sql;
 		this.declaredParameters = SqlParameter.sqlTypesToAnonymousParameterList(types);
 	}
@@ -130,7 +130,7 @@ public void setReturnGeneratedKeys(boolean returnGeneratedKeys) {
 	/**
 	 * Set the column names of the auto-generated keys.
 	 */
-	public void setGeneratedKeysColumnNames(String[] names) {
+	public void setGeneratedKeysColumnNames(String... names) {
 		this.generatedKeysColumnNames = names;
 	}
 
@@ -194,13 +194,13 @@ private class PreparedStatementCreatorImpl
 
 		private final String actualSql;
 
-		private final List parameters;
+		private final List<?> parameters;
 
 		public PreparedStatementCreatorImpl(List<?> parameters) {
 			this(sql, parameters);
 		}
 
-		public PreparedStatementCreatorImpl(String actualSql, List parameters) {
+		public PreparedStatementCreatorImpl(String actualSql, List<?> parameters) {
 			this.actualSql = actualSql;
 			Assert.notNull(parameters, "Parameters List must not be null");
 			this.parameters = parameters;
@@ -281,7 +281,7 @@ public void setValues(PreparedStatement ps) throws SQLException {
 					declaredParameter = declaredParameters.get(i);
 				}
 				if (in instanceof Collection && declaredParameter.getSqlType() != Types.ARRAY) {
-					Collection entries = (Collection) in;
+					Collection<?> entries = (Collection<?>) in;
 					for (Object entry : entries) {
 						if (entry instanceof Object[]) {
 							Object[] valueArray = ((Object[])entry);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java
index 615ab1ae53..99397e37e4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -177,7 +177,7 @@ public boolean isResultsParameter() {
 	 * Convert a list of JDBC types, as defined in {@code java.sql.Types},
 	 * to a List of SqlParameter objects as used in this package.
 	 */
-	public static List<SqlParameter> sqlTypesToAnonymousParameterList(int[] types) {
+	public static List<SqlParameter> sqlTypesToAnonymousParameterList(int... types) {
 		List<SqlParameter> result = new LinkedList<SqlParameter>();
 		if (types != null) {
 			for (int type : types) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
index a1fbc4d520..123e7e2540 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,10 +30,12 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.core.SpringProperties;
 import org.springframework.jdbc.support.SqlValue;
 
 /**
@@ -58,9 +60,30 @@
  */
 public abstract class StatementCreatorUtils {
 
+	/**
+	 * System property that instructs Spring to ignore {@link java.sql.ParameterMetaData#getParameterType}
+	 * completely, i.e. to never even attempt to retrieve {@link PreparedStatement#getParameterMetaData()}
+	 * for {@link StatementCreatorUtils#setNull} calls.
+	 * <p>The default is "false", trying {@code getParameterType} calls first and falling back to
+	 * {@link PreparedStatement#setNull} / {@link PreparedStatement#setObject} calls based on well-known
+	 * behavior of common databases. Spring records JDBC drivers with non-working {@code getParameterType}
+	 * implementations and won't attempt to call that method for that driver again, always falling back.
+	 * <p>Consider switching this flag to "true" if you experience misbehavior at runtime, e.g. with
+	 * a connection pool setting back the {@link PreparedStatement} instance in case of an exception
+	 * thrown from {@code getParameterType} (as reported on JBoss AS 7).
+	 */
+	public static final String IGNORE_GETPARAMETERTYPE_PROPERTY_NAME = "spring.jdbc.getParameterType.ignore";
+
+
+	static final boolean shouldIgnoreGetParameterType = SpringProperties.getFlag(IGNORE_GETPARAMETERTYPE_PROPERTY_NAME);
+
+	// Using a ConcurrentHashMap as a Set (for Java 5 compatibility)
+	static final Map<String, Boolean> driversWithNoSupportForGetParameterType =
+			new ConcurrentHashMap<String, Boolean>(1);
+
 	private static final Log logger = LogFactory.getLog(StatementCreatorUtils.class);
 
-	private static Map<Class, Integer> javaTypeToSqlTypeMap = new HashMap<Class, Integer>(32);
+	private static final Map<Class<?>, Integer> javaTypeToSqlTypeMap = new HashMap<Class<?>, Integer>(32);
 
 	static {
 		/* JDBC 3.0 only - not compatible with e.g. MySQL at present
@@ -94,7 +117,7 @@ public abstract class StatementCreatorUtils {
 	 * @param javaType the Java type to translate
 	 * @return the corresponding SQL type, or {@code null} if none found
 	 */
-	public static int javaTypeToSqlParameterType(Class javaType) {
+	public static int javaTypeToSqlParameterType(Class<?> javaType) {
 		Integer sqlType = javaTypeToSqlTypeMap.get(javaType);
 		if (sqlType != null) {
 			return sqlType;
@@ -120,8 +143,7 @@ public static int javaTypeToSqlParameterType(Class javaType) {
 	 * @param inValue the value to set
 	 * @throws SQLException if thrown by PreparedStatement methods
 	 */
-	public static void setParameterValue(
-			PreparedStatement ps, int paramIndex, SqlParameter param, Object inValue)
+	public static void setParameterValue(PreparedStatement ps, int paramIndex, SqlParameter param, Object inValue)
 			throws SQLException {
 
 		setParameterValueInternal(ps, paramIndex, param.getSqlType(), param.getTypeName(), param.getScale(), inValue);
@@ -137,8 +159,7 @@ public static void setParameterValue(
 	 * @throws SQLException if thrown by PreparedStatement methods
 	 * @see SqlTypeValue
 	 */
-	public static void setParameterValue(
-			PreparedStatement ps, int paramIndex, int sqlType, Object inValue)
+	public static void setParameterValue(PreparedStatement ps, int paramIndex, int sqlType, Object inValue)
 			throws SQLException {
 
 		setParameterValueInternal(ps, paramIndex, sqlType, null, null, inValue);
@@ -156,9 +177,8 @@ public static void setParameterValue(
 	 * @throws SQLException if thrown by PreparedStatement methods
 	 * @see SqlTypeValue
 	 */
-	public static void setParameterValue(
-			PreparedStatement ps, int paramIndex, int sqlType, String typeName, Object inValue)
-			throws SQLException {
+	public static void setParameterValue(PreparedStatement ps, int paramIndex, int sqlType, String typeName,
+			Object inValue) throws SQLException {
 
 		setParameterValueInternal(ps, paramIndex, sqlType, typeName, null, inValue);
 	}
@@ -177,9 +197,8 @@ public static void setParameterValue(
 	 * @throws SQLException if thrown by PreparedStatement methods
 	 * @see SqlTypeValue
 	 */
-	private static void setParameterValueInternal(
-			PreparedStatement ps, int paramIndex, int sqlType, String typeName, Integer scale, Object inValue)
-			throws SQLException {
+	private static void setParameterValueInternal(PreparedStatement ps, int paramIndex, int sqlType,
+			String typeName, Integer scale, Object inValue) throws SQLException {
 
 		String typeNameToUse = typeName;
 		int sqlTypeToUse = sqlType;
@@ -190,8 +209,7 @@ private static void setParameterValueInternal(
 			SqlParameterValue parameterValue = (SqlParameterValue) inValue;
 			if (logger.isDebugEnabled()) {
 				logger.debug("Overriding type info with runtime info from SqlParameterValue: column index " + paramIndex +
-						", SQL type " + parameterValue.getSqlType() +
-						", Type name " + parameterValue.getTypeName());
+						", SQL type " + parameterValue.getSqlType() + ", type name " + parameterValue.getTypeName());
 			}
 			if (parameterValue.getSqlType() != SqlTypeValue.TYPE_UNKNOWN) {
 				sqlTypeToUse = parameterValue.getSqlType();
@@ -221,43 +239,68 @@ private static void setParameterValueInternal(
 	 * Set the specified PreparedStatement parameter to null,
 	 * respecting database-specific peculiarities.
 	 */
-	private static void setNull(PreparedStatement ps, int paramIndex, int sqlType, String typeName)
-			throws SQLException {
-
+	private static void setNull(PreparedStatement ps, int paramIndex, int sqlType, String typeName) throws SQLException {
 		if (sqlType == SqlTypeValue.TYPE_UNKNOWN) {
 			boolean useSetObject = false;
-			sqlType = Types.NULL;
-			try {
-				sqlType = ps.getParameterMetaData().getParameterType(paramIndex);
+			Integer sqlTypeToUse = null;
+			DatabaseMetaData dbmd = null;
+			String jdbcDriverName = null;
+			boolean checkGetParameterType = !shouldIgnoreGetParameterType;
+			if (checkGetParameterType && !driversWithNoSupportForGetParameterType.isEmpty()) {
+				try {
+					dbmd = ps.getConnection().getMetaData();
+					jdbcDriverName = dbmd.getDriverName();
+					checkGetParameterType = !driversWithNoSupportForGetParameterType.containsKey(jdbcDriverName);
+				}
+				catch (Throwable ex) {
+					logger.debug("Could not check connection metadata", ex);
+				}
+			}
+			if (checkGetParameterType) {
+				try {
+					sqlTypeToUse = ps.getParameterMetaData().getParameterType(paramIndex);
+				}
+				catch (Throwable ex) {
+					if (logger.isDebugEnabled()) {
+						logger.debug("JDBC 3.0 getParameterType call not supported - using fallback method instead: " + ex);
+					}
+				}
 			}
-			catch (Throwable ex) {
-				logger.debug("JDBC 3.0 getParameterType call not supported", ex);
-				// JDBC driver not compliant with JDBC 3.0
-				// -> proceed with database-specific checks
+			if (sqlTypeToUse == null) {
+				// JDBC driver not compliant with JDBC 3.0 -> proceed with database-specific checks
+				sqlTypeToUse = Types.NULL;
 				try {
-					DatabaseMetaData dbmd = ps.getConnection().getMetaData();
+					if (dbmd == null) {
+						dbmd = ps.getConnection().getMetaData();
+					}
+					if (jdbcDriverName == null) {
+						jdbcDriverName = dbmd.getDriverName();
+					}
+					if (checkGetParameterType) {
+						driversWithNoSupportForGetParameterType.put(jdbcDriverName, Boolean.TRUE);
+					}
 					String databaseProductName = dbmd.getDatabaseProductName();
-					String jdbcDriverName = dbmd.getDriverName();
 					if (databaseProductName.startsWith("Informix") ||
-							jdbcDriverName.startsWith("Microsoft SQL Server")) {
+							(jdbcDriverName.startsWith("Microsoft") && jdbcDriverName.contains("SQL Server"))) {
+							// "Microsoft SQL Server JDBC Driver 3.0" versus "Microsoft JDBC Driver 4.0 for SQL Server"
 						useSetObject = true;
 					}
 					else if (databaseProductName.startsWith("DB2") ||
 							jdbcDriverName.startsWith("jConnect") ||
 							jdbcDriverName.startsWith("SQLServer")||
 							jdbcDriverName.startsWith("Apache Derby")) {
-						sqlType = Types.VARCHAR;
+						sqlTypeToUse = Types.VARCHAR;
 					}
 				}
-				catch (Throwable ex2) {
-					logger.debug("Could not check database or driver name", ex2);
+				catch (Throwable ex) {
+					logger.debug("Could not check connection metadata", ex);
 				}
 			}
 			if (useSetObject) {
 				ps.setObject(paramIndex, null);
 			}
 			else {
-				ps.setNull(paramIndex, sqlType);
+				ps.setNull(paramIndex, sqlTypeToUse);
 			}
 		}
 		else if (typeName != null) {
@@ -368,7 +411,7 @@ else if (inValue instanceof Calendar) {
 	/**
 	 * Check whether the given value can be treated as a String value.
 	 */
-	private static boolean isStringValue(Class inValueType) {
+	private static boolean isStringValue(Class<?> inValueType) {
 		// Consider any CharSequence (including StringBuffer and StringBuilder) as a String.
 		return (CharSequence.class.isAssignableFrom(inValueType) ||
 				StringWriter.class.isAssignableFrom(inValueType));
@@ -378,7 +421,7 @@ private static boolean isStringValue(Class inValueType) {
 	 * Check whether the given value is a {@code java.util.Date}
 	 * (but not one of the JDBC-specific subclasses).
 	 */
-	private static boolean isDateValue(Class inValueType) {
+	private static boolean isDateValue(Class<?> inValueType) {
 		return (java.util.Date.class.isAssignableFrom(inValueType) &&
 				!(java.sql.Date.class.isAssignableFrom(inValueType) ||
 						java.sql.Time.class.isAssignableFrom(inValueType) ||
@@ -392,7 +435,7 @@ private static boolean isDateValue(Class inValueType) {
 	 * @see DisposableSqlTypeValue#cleanup()
 	 * @see org.springframework.jdbc.core.support.SqlLobValue#cleanup()
 	 */
-	public static void cleanupParameters(Object[] paramValues) {
+	public static void cleanupParameters(Object... paramValues) {
 		if (paramValues != null) {
 			cleanupParameters(Arrays.asList(paramValues));
 		}
@@ -405,7 +448,7 @@ public static void cleanupParameters(Object[] paramValues) {
 	 * @see DisposableSqlTypeValue#cleanup()
 	 * @see org.springframework.jdbc.core.support.SqlLobValue#cleanup()
 	 */
-	public static void cleanupParameters(Collection paramValues) {
+	public static void cleanupParameters(Collection<?> paramValues) {
 		if (paramValues != null) {
 			for (Object inValue : paramValues) {
 				if (inValue instanceof DisposableSqlTypeValue) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java
old mode 100644
new mode 100755
index dffae70361..45b496aa77
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,11 +65,8 @@ public class CallMetaDataContext {
 	/** List of SqlParameter objects to be used in call execution */
 	private List<SqlParameter> callParameters = new ArrayList<SqlParameter>();
 
-	/** Default name to use for the return value in the output map */
-	private String defaultFunctionReturnName = "return";
-
 	/** Actual name to use for the return value in the output map */
-	private String actualFunctionReturnName = null;
+	private String actualFunctionReturnName;
 
 	/** Set of in parameter names to exclude use for any not listed */
 	private Set<String> limitedInParameterNames = new HashSet<String>();
@@ -77,16 +74,16 @@ public class CallMetaDataContext {
 	/** List of SqlParameter names for out parameters */
 	private List<String> outParameterNames = new ArrayList<String>();
 
-	/** should we access call parameter meta data info or not */
-	private boolean accessCallParameterMetaData = true;
+	/** Indicates whether this is a procedure or a function **/
+	private boolean function = false;
 
-	/** indicates whether this is a procedure or a function **/
-	private boolean function;
+	/** Indicates whether this procedure's return value should be included  **/
+	private boolean returnValueRequired = false;
 
-	/** indicates whether this procedure's return value should be included  **/
-	private boolean returnValueRequired;
+	/** Should we access call parameter meta data info or not */
+	private boolean accessCallParameterMetaData = true;
 
-	/** the provider of call meta data */
+	/** The provider of call meta data */
 	private CallMetaDataProvider metaDataProvider;
 
 
@@ -101,7 +98,7 @@ public void setFunctionReturnName(String functionReturnName) {
 	 * Get the name used for the return value of the function.
 	 */
 	public String getFunctionReturnName() {
-		return this.actualFunctionReturnName != null ? this.actualFunctionReturnName : this.defaultFunctionReturnName;
+		return (this.actualFunctionReturnName != null ? this.actualFunctionReturnName : "return");
 	}
 
 	/**
@@ -224,7 +221,7 @@ public boolean isAccessCallParameterMetaData() {
 	 * @param rowMapper a RowMapper implementation used to map the data returned in the result set
 	 * @return the appropriate SqlParameter
 	 */
-	public SqlParameter createReturnResultSetParameter(String parameterName, RowMapper rowMapper) {
+	public SqlParameter createReturnResultSetParameter(String parameterName, RowMapper<?> rowMapper) {
 		if (this.metaDataProvider.isReturnResultSetSupported()) {
 			return new SqlReturnResultSet(parameterName, rowMapper);
 		}
@@ -283,88 +280,94 @@ public void processParameters(List<SqlParameter> parameters) {
 	 * Reconcile the provided parameters with available metadata and add new ones where appropriate.
 	 */
 	protected List<SqlParameter> reconcileParameters(List<SqlParameter> parameters) {
-		final List<SqlParameter> declaredReturnParameters = new ArrayList<SqlParameter>();
-		final Map<String, SqlParameter> declaredParameters = new LinkedHashMap<String, SqlParameter>();
+		final List<SqlParameter> declaredReturnParams = new ArrayList<SqlParameter>();
+		final Map<String, SqlParameter> declaredParams = new LinkedHashMap<String, SqlParameter>();
 		boolean returnDeclared = false;
-		List<String> outParameterNames = new ArrayList<String>();
-		List<String> metaDataParameterNames = new ArrayList<String>();
+		List<String> outParamNames = new ArrayList<String>();
+		List<String> metaDataParamNames = new ArrayList<String>();
 
 		// Get the names of the meta data parameters
 		for (CallParameterMetaData meta : this.metaDataProvider.getCallParameterMetaData()) {
 			if (meta.getParameterType() != DatabaseMetaData.procedureColumnReturn) {
-				metaDataParameterNames.add(meta.getParameterName().toLowerCase());
+				metaDataParamNames.add(meta.getParameterName().toLowerCase());
 			}
 		}
 
 		// Separate implicit return parameters from explicit parameters...
-		for (SqlParameter parameter : parameters) {
-			if (parameter.isResultsParameter()) {
-				declaredReturnParameters.add(parameter);
+		for (SqlParameter param : parameters) {
+			if (param.isResultsParameter()) {
+				declaredReturnParams.add(param);
 			}
 			else {
-				String parameterNameToMatch = this.metaDataProvider.parameterNameToUse(parameter.getName()).toLowerCase();
-				declaredParameters.put(parameterNameToMatch, parameter);
-				if (parameter instanceof SqlOutParameter) {
-					outParameterNames.add(parameter.getName());
-					if (isFunction() && !metaDataParameterNames.contains(parameterNameToMatch)) {
+				String paramName = param.getName();
+				if (paramName == null) {
+					throw new IllegalArgumentException("Anonymous parameters not supported for calls - " +
+							"please specify a name for the parameter of SQL type " + param.getSqlType());
+				}
+				String paramNameToMatch = this.metaDataProvider.parameterNameToUse(paramName).toLowerCase();
+				declaredParams.put(paramNameToMatch, param);
+				if (param instanceof SqlOutParameter) {
+					outParamNames.add(paramName);
+					if (isFunction() && !metaDataParamNames.contains(paramNameToMatch)) {
 						if (!returnDeclared) {
 							if (logger.isDebugEnabled()) {
-								logger.debug("Using declared out parameter '" + parameter.getName() + "' for function return value");
+								logger.debug("Using declared out parameter '" + paramName +
+										"' for function return value");
 							}
-							setFunctionReturnName(parameter.getName());
+							setFunctionReturnName(paramName);
 							returnDeclared = true;
 						}
 					}
 				}
 			}
 		}
-		setOutParameterNames(outParameterNames);
+		setOutParameterNames(outParamNames);
 
-		List<SqlParameter> workParameters = new ArrayList<SqlParameter>();
-		workParameters.addAll(declaredReturnParameters);
+		List<SqlParameter> workParams = new ArrayList<SqlParameter>();
+		workParams.addAll(declaredReturnParams);
 
 		if (!this.metaDataProvider.isProcedureColumnMetaDataUsed()) {
-			workParameters.addAll(declaredParameters.values());
-			return workParameters;
+			workParams.addAll(declaredParams.values());
+			return workParams;
 		}
 
 		Map<String, String> limitedInParamNamesMap = new HashMap<String, String>(this.limitedInParameterNames.size());
-		for (String limitedParameterName : this.limitedInParameterNames) {
+		for (String limitedParamName : this.limitedInParameterNames) {
 			limitedInParamNamesMap.put(
-					this.metaDataProvider.parameterNameToUse(limitedParameterName).toLowerCase(), limitedParameterName);
+					this.metaDataProvider.parameterNameToUse(limitedParamName).toLowerCase(), limitedParamName);
 		}
 
 		for (CallParameterMetaData meta : this.metaDataProvider.getCallParameterMetaData()) {
-			String parNameToCheck = null;
+			String paramNameToCheck = null;
 			if (meta.getParameterName() != null) {
-				parNameToCheck = this.metaDataProvider.parameterNameToUse(meta.getParameterName()).toLowerCase();
+				paramNameToCheck = this.metaDataProvider.parameterNameToUse(meta.getParameterName()).toLowerCase();
 			}
-			String parNameToUse = this.metaDataProvider.parameterNameToUse(meta.getParameterName());
-			if (declaredParameters.containsKey(parNameToCheck) ||
+			String paramNameToUse = this.metaDataProvider.parameterNameToUse(meta.getParameterName());
+			if (declaredParams.containsKey(paramNameToCheck) ||
 					(meta.getParameterType() == DatabaseMetaData.procedureColumnReturn && returnDeclared)) {
-				SqlParameter parameter;
+				SqlParameter param;
 				if (meta.getParameterType() == DatabaseMetaData.procedureColumnReturn) {
-					parameter = declaredParameters.get(getFunctionReturnName());
-					if (parameter == null && getOutParameterNames().size() > 0) {
-						parameter = declaredParameters.get(getOutParameterNames().get(0).toLowerCase());
+					param = declaredParams.get(getFunctionReturnName());
+					if (param == null && getOutParameterNames().size() > 0) {
+						param = declaredParams.get(getOutParameterNames().get(0).toLowerCase());
 					}
-					if (parameter == null) {
+					if (param == null) {
 						throw new InvalidDataAccessApiUsageException(
 								"Unable to locate declared parameter for function return value - " +
-								" add a SqlOutParameter with name \"" + getFunctionReturnName() +"\"");
+								" add a SqlOutParameter with name '" + getFunctionReturnName() + "'");
 					}
 					else {
-						setFunctionReturnName(parameter.getName());
+						setFunctionReturnName(param.getName());
 					}
 				}
 				else {
-					parameter = declaredParameters.get(parNameToCheck);
+					param = declaredParams.get(paramNameToCheck);
 				}
-				if (parameter != null) {
-					workParameters.add(parameter);
+				if (param != null) {
+					workParams.add(param);
 					if (logger.isDebugEnabled()) {
-						logger.debug("Using declared parameter for: " +
-								(parNameToUse == null ? getFunctionReturnName() : parNameToUse));
+						logger.debug("Using declared parameter for '" +
+								(paramNameToUse != null ? paramNameToUse : getFunctionReturnName()) + "'");
 					}
 				}
 			}
@@ -373,49 +376,49 @@ protected List<SqlParameter> reconcileParameters(List<SqlParameter> parameters)
 					if (!isFunction() && !isReturnValueRequired() &&
 							this.metaDataProvider.byPassReturnParameter(meta.getParameterName())) {
 						if (logger.isDebugEnabled()) {
-							logger.debug("Bypassing metadata return parameter for: " + meta.getParameterName());
+							logger.debug("Bypassing metadata return parameter for '" + meta.getParameterName() + "'");
 						}
 					}
 					else {
 						String returnNameToUse =(StringUtils.hasLength(meta.getParameterName()) ?
-								parNameToUse : getFunctionReturnName());
-						workParameters.add(new SqlOutParameter(returnNameToUse, meta.getSqlType()));
+								paramNameToUse : getFunctionReturnName());
+						workParams.add(this.metaDataProvider.createDefaultOutParameter(returnNameToUse, meta));
 						if (isFunction()) {
 							setFunctionReturnName(returnNameToUse);
-							outParameterNames.add(returnNameToUse);
+							outParamNames.add(returnNameToUse);
 						}
 						if (logger.isDebugEnabled()) {
-							logger.debug("Added metadata return parameter for: " + returnNameToUse);
+							logger.debug("Added metadata return parameter for '" + returnNameToUse + "'");
 						}
 					}
 				}
 				else {
 					if (meta.getParameterType() == DatabaseMetaData.procedureColumnOut) {
-						workParameters.add(this.metaDataProvider.createDefaultOutParameter(parNameToUse, meta));
-						outParameterNames.add(parNameToUse);
+						workParams.add(this.metaDataProvider.createDefaultOutParameter(paramNameToUse, meta));
+						outParamNames.add(paramNameToUse);
 						if (logger.isDebugEnabled()) {
-							logger.debug("Added metadata out parameter for: " + parNameToUse);
+							logger.debug("Added metadata out parameter for '" + paramNameToUse + "'");
 						}
 					}
 					else if (meta.getParameterType() == DatabaseMetaData.procedureColumnInOut) {
-						workParameters.add(this.metaDataProvider.createDefaultInOutParameter(parNameToUse, meta));
-						outParameterNames.add(parNameToUse);
+						workParams.add(this.metaDataProvider.createDefaultInOutParameter(paramNameToUse, meta));
+						outParamNames.add(paramNameToUse);
 						if (logger.isDebugEnabled()) {
-							logger.debug("Added metadata in out parameter for: " + parNameToUse);
+							logger.debug("Added metadata in out parameter for '" + paramNameToUse + "'");
 						}
 					}
 					else {
 						if (this.limitedInParameterNames.isEmpty() ||
-								limitedInParamNamesMap.containsKey(parNameToUse.toLowerCase())) {
-							workParameters.add(this.metaDataProvider.createDefaultInParameter(parNameToUse, meta));
+								limitedInParamNamesMap.containsKey(paramNameToUse.toLowerCase())) {
+							workParams.add(this.metaDataProvider.createDefaultInParameter(paramNameToUse, meta));
 							if (logger.isDebugEnabled()) {
-								logger.debug("Added metadata in parameter for: " + parNameToUse);
+								logger.debug("Added metadata in parameter for '" + paramNameToUse + "'");
 							}
 						}
 						else {
 							if (logger.isDebugEnabled()) {
 								logger.debug("Limited set of parameters " + limitedInParamNamesMap.keySet() +
-										" skipped parameter for: " + parNameToUse);
+										" skipped parameter for '" + paramNameToUse + "'");
 							}
 						}
 					}
@@ -423,7 +426,7 @@ else if (meta.getParameterType() == DatabaseMetaData.procedureColumnInOut) {
 			}
 		}
 
-		return workParameters;
+		return workParams;
 	}
 
 	/**
@@ -434,7 +437,7 @@ else if (meta.getParameterType() == DatabaseMetaData.procedureColumnInOut) {
 	public Map<String, Object> matchInParameterValuesWithCallParameters(SqlParameterSource parameterSource) {
 		// For parameter source lookups we need to provide case-insensitive lookup support
 		// since the database metadata is not necessarily providing case sensitive parameter names.
-		Map caseInsensitiveParameterNames =
+		Map<String, String> caseInsensitiveParameterNames =
 				SqlParameterSourceUtils.extractCaseInsensitiveParameterNames(parameterSource);
 
 		Map<String, String> callParameterNames = new HashMap<String, String>(this.callParameters.size());
@@ -467,7 +470,7 @@ public Map<String, Object> matchInParameterValuesWithCallParameters(SqlParameter
 								}
 								else {
 									if (caseInsensitiveParameterNames.containsKey(lowerCaseName)) {
-										String sourceName = (String) caseInsensitiveParameterNames.get(lowerCaseName);
+										String sourceName = caseInsensitiveParameterNames.get(lowerCaseName);
 										matchedParameters.put(parameterName, SqlParameterSourceUtils.getTypedValue(parameterSource, sourceName));
 									}
 									else {
@@ -571,15 +574,15 @@ public String createCallString() {
 		// and the catalog name since the cataog is used for the package name
 		if (this.metaDataProvider.isSupportsSchemasInProcedureCalls() &&
 				!this.metaDataProvider.isSupportsCatalogsInProcedureCalls()) {
-			schemaNameToUse = this.metaDataProvider.catalogNameToUse(this.getCatalogName());
-			catalogNameToUse = this.metaDataProvider.schemaNameToUse(this.getSchemaName());
+			schemaNameToUse = this.metaDataProvider.catalogNameToUse(getCatalogName());
+			catalogNameToUse = this.metaDataProvider.schemaNameToUse(getSchemaName());
 		}
 		else {
-			catalogNameToUse = this.metaDataProvider.catalogNameToUse(this.getCatalogName());
-			schemaNameToUse = this.metaDataProvider.schemaNameToUse(this.getSchemaName());
+			catalogNameToUse = this.metaDataProvider.catalogNameToUse(getCatalogName());
+			schemaNameToUse = this.metaDataProvider.schemaNameToUse(getSchemaName());
 		}
-		String procedureNameToUse = this.metaDataProvider.procedureNameToUse(this.getProcedureName());
-		if (this.isFunction() || this.isReturnValueRequired()) {
+		String procedureNameToUse = this.metaDataProvider.procedureNameToUse(getProcedureName());
+		if (isFunction() || isReturnValueRequired()) {
 			callString = "{? = call " +
 					(StringUtils.hasLength(catalogNameToUse) ? catalogNameToUse + "." : "") +
 					(StringUtils.hasLength(schemaNameToUse) ? schemaNameToUse + "." : "") +
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProvider.java
index 29accf8ffa..7640c9d24a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProvider.java
@@ -24,7 +24,8 @@
 
 /**
  * Interface specifying the API to be implemented by a class providing call metadata.
- * This is intended for internal use by Spring's
+ *
+ * <p>This is intended for internal use by Spring's
  * {@link org.springframework.jdbc.core.simple.SimpleJdbcCall}.
  *
  * @author Thomas Risberg
@@ -74,15 +75,15 @@ void initializeWithProcedureColumnMetaData(
 
 	/**
 	 * Provide any modification of the catalog name passed in to match the meta data currently used.
-	 * The returned value will be used for meta data lookups. This could include altering the case used
-	 * or providing a base catalog if none is provided.
+	 * The returned value will be used for meta data lookups. This could include altering the case
+	 * used or providing a base catalog if none is provided.
 	 */
 	String metaDataCatalogNameToUse(String catalogName) ;
 
 	/**
 	 * Provide any modification of the schema name passed in to match the meta data currently used.
-	 * The returned value will be used for meta data lookups. This could include altering the case used
-	 * or providing a base schema if none is provided.
+	 * The returned value will be used for meta data lookups. This could include altering the case
+	 * used or providing a base schema if none is provided.
 	 */
 	String metaDataSchemaNameToUse(String schemaName) ;
 
@@ -94,8 +95,8 @@ void initializeWithProcedureColumnMetaData(
 	String parameterNameToUse(String parameterName);
 
 	/**
-	 * Create a default out parameter based on the provided meta data. This is used when no
-	 * explicit parameter declaration has been made.
+	 * Create a default out parameter based on the provided meta data.
+	 * This is used when no explicit parameter declaration has been made.
 	 * @param parameterName the name of the parameter
 	 * @param meta meta data used for this call
 	 * @return the configured SqlOutParameter
@@ -103,8 +104,8 @@ void initializeWithProcedureColumnMetaData(
 	SqlParameter createDefaultOutParameter(String parameterName, CallParameterMetaData meta);
 
 	/**
-	 * Create a default inout parameter based on the provided meta data. This is used when no
-	 * explicit parameter declaration has been made.
+	 * Create a default inout parameter based on the provided meta data.
+	 * This is used when no explicit parameter declaration has been made.
 	 * @param parameterName the name of the parameter
 	 * @param meta meta data used for this call
 	 * @return the configured SqlInOutParameter
@@ -112,8 +113,8 @@ void initializeWithProcedureColumnMetaData(
 	SqlParameter createDefaultInOutParameter(String parameterName, CallParameterMetaData meta);
 
 	/**
-	 * Create a default in parameter based on the provided meta data. This is used when no
-	 * explicit parameter declaration has been made.
+	 * Create a default in parameter based on the provided meta data.
+	 * This is used when no explicit parameter declaration has been made.
 	 * @param parameterName the name of the parameter
 	 * @param meta meta data used for this call
 	 * @return the configured SqlParameter
@@ -121,26 +122,26 @@ void initializeWithProcedureColumnMetaData(
 	SqlParameter createDefaultInParameter(String parameterName, CallParameterMetaData meta);
 
 	/**
-	 * Get the name of the current user.  Useful for meta data lookups etc.
+	 * Get the name of the current user. Useful for meta data lookups etc.
 	 * @return current user name from database connection
 	 */
 	String getUserName();
 
 	/**
-	 * Does this database support returning resultsets that should be retrieved with the JDBC call
+	 * Does this database support returning ResultSets that should be retrieved with the JDBC call.
 	 * {@link java.sql.Statement#getResultSet()}
 	 */
 	boolean isReturnResultSetSupported();
 
 	/**
-	 * Does this database support returning resultsets as ref cursors to be retrieved with
+	 * Does this database support returning ResultSets as ref cursors to be retrieved with
 	 * {@link java.sql.CallableStatement#getObject(int)} for the specified column.
 	 */
 	boolean isRefCursorSupported();
 
 	/**
-	 * Get the {@link java.sql.Types} type for columns that return resultsets as ref cursors if this feature
-	 * is supported.
+	 * Get the {@link java.sql.Types} type for columns that return ResultSets as ref cursors
+	 * if this feature is supported.
 	 */
 	int getRefCursorSqlType();
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java
index 33087c446c..9a2d709956 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
-
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
@@ -32,16 +31,14 @@
 import org.springframework.jdbc.support.MetaDataAccessException;
 
 /**
- * Factory used to create a {@link CallMetaDataProvider} implementation based on the type of databse being used.
+ * Factory used to create a {@link CallMetaDataProvider} implementation
+ * based on the type of database being used.
  *
  * @author Thomas Risberg
  * @since 2.5
  */
 public class CallMetaDataProviderFactory {
 
-	/** Logger */
-	private static final Log logger = LogFactory.getLog(CallMetaDataProviderFactory.class);
-
 	/** List of supported database products for procedure calls */
 	public static final List<String> supportedDatabaseProductsForProcedures = Arrays.asList(
 			"Apache Derby",
@@ -52,6 +49,7 @@ public class CallMetaDataProviderFactory {
 			"PostgreSQL",
 			"Sybase"
 		);
+
 	/** List of supported database products for function calls */
 	public static final List<String> supportedDatabaseProductsForFunctions = Arrays.asList(
 			"MySQL",
@@ -60,10 +58,13 @@ public class CallMetaDataProviderFactory {
 			"PostgreSQL"
 		);
 
+	private static final Log logger = LogFactory.getLog(CallMetaDataProviderFactory.class);
+
+
 	/**
-	 * Create a CallMetaDataProvider based on the database metedata
-	 * @param dataSource used to retrieve metedata
-	 * @param context the class that holds configuration and metedata
+	 * Create a CallMetaDataProvider based on the database metadata
+	 * @param dataSource used to retrieve metadata
+	 * @param context the class that holds configuration and metadata
 	 * @return instance of the CallMetaDataProvider implementation to be used
 	 */
 	static public CallMetaDataProvider createMetaDataProvider(DataSource dataSource, final CallMetaDataContext context) {
@@ -124,17 +125,16 @@ else if ("Microsoft SQL Server".equals(databaseProductName)) {
 					}
 					provider.initializeWithMetaData(databaseMetaData);
 					if (accessProcedureColumnMetaData) {
-						provider.initializeWithProcedureColumnMetaData(
-								databaseMetaData, context.getCatalogName(), context.getSchemaName(), context.getProcedureName());
+						provider.initializeWithProcedureColumnMetaData(databaseMetaData,
+								context.getCatalogName(), context.getSchemaName(), context.getProcedureName());
 					}
 					return provider;
 				}
 			});
 		}
 		catch (MetaDataAccessException ex) {
-			throw new DataAccessResourceFailureException("Error retreiving database metadata", ex);
+			throw new DataAccessResourceFailureException("Error retrieving database metadata", ex);
 		}
-
 	}
 
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java
index af8281fc6d..22e19d6e04 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,26 +72,34 @@ public void initializeWithMetaData(DatabaseMetaData databaseMetaData) throws SQL
 		try {
 			setSupportsCatalogsInProcedureCalls(databaseMetaData.supportsCatalogsInProcedureCalls());
 		}
-		catch (SQLException se) {
-			logger.warn("Error retrieving 'DatabaseMetaData.supportsCatalogsInProcedureCalls' - " + se.getMessage());
+		catch (SQLException ex) {
+			if (logger.isWarnEnabled()) {
+				logger.warn("Error retrieving 'DatabaseMetaData.supportsCatalogsInProcedureCalls' - " + ex.getMessage());
+			}
 		}
 		try {
 			setSupportsSchemasInProcedureCalls(databaseMetaData.supportsSchemasInProcedureCalls());
 		}
-		catch (SQLException se) {
-			logger.warn("Error retrieving 'DatabaseMetaData.supportsSchemasInProcedureCalls' - " + se.getMessage());
+		catch (SQLException ex) {
+			if (logger.isWarnEnabled()) {
+				logger.warn("Error retrieving 'DatabaseMetaData.supportsSchemasInProcedureCalls' - " + ex.getMessage());
+			}
 		}
 		try {
 			setStoresUpperCaseIdentifiers(databaseMetaData.storesUpperCaseIdentifiers());
 		}
-		catch (SQLException se) {
-			logger.warn("Error retrieving 'DatabaseMetaData.storesUpperCaseIdentifiers' - " + se.getMessage());
+		catch (SQLException ex) {
+			if (logger.isWarnEnabled()) {
+				logger.warn("Error retrieving 'DatabaseMetaData.storesUpperCaseIdentifiers' - " + ex.getMessage());
+			}
 		}
 		try {
 			setStoresLowerCaseIdentifiers(databaseMetaData.storesLowerCaseIdentifiers());
 		}
-		catch (SQLException se) {
-			logger.warn("Error retrieving 'DatabaseMetaData.storesLowerCaseIdentifiers' - " + se.getMessage());
+		catch (SQLException ex) {
+			if (logger.isWarnEnabled()) {
+				logger.warn("Error retrieving 'DatabaseMetaData.storesLowerCaseIdentifiers' - " + ex.getMessage());
+			}
 		}
 	}
 
@@ -113,7 +121,7 @@ public String procedureNameToUse(String procedureName) {
 		else if (isStoresUpperCaseIdentifiers()) {
 			return procedureName.toUpperCase();
 		}
-		else if(isStoresLowerCaseIdentifiers()) {
+		else if (isStoresLowerCaseIdentifiers()) {
 			return procedureName.toLowerCase();
 		}
 		else {
@@ -128,7 +136,7 @@ public String catalogNameToUse(String catalogName) {
 		else if (isStoresUpperCaseIdentifiers()) {
 			return catalogName.toUpperCase();
 		}
-		else if(isStoresLowerCaseIdentifiers()) {
+		else if (isStoresLowerCaseIdentifiers()) {
 			return catalogName.toLowerCase();
 		}
 		else {
@@ -143,7 +151,7 @@ public String schemaNameToUse(String schemaName) {
 		else if (isStoresUpperCaseIdentifiers()) {
 			return schemaName.toUpperCase();
 		}
-		else if(isStoresLowerCaseIdentifiers()) {
+		else if (isStoresLowerCaseIdentifiers()) {
 			return schemaName.toLowerCase();
 		}
 		else {
@@ -176,7 +184,7 @@ public String parameterNameToUse(String parameterName) {
 		else if (isStoresUpperCaseIdentifiers()) {
 			return parameterName.toUpperCase();
 		}
-		else if(isStoresLowerCaseIdentifiers()) {
+		else if (isStoresLowerCaseIdentifiers()) {
 			return parameterName.toLowerCase();
 		}
 		else {
@@ -321,12 +329,8 @@ private void processProcedureColumns(DatabaseMetaData databaseMetaData, String c
 						columnType == DatabaseMetaData.procedureColumnInOut ||
 						columnType == DatabaseMetaData.procedureColumnOut)) {
 					if (logger.isDebugEnabled()) {
-						logger.debug("Skipping metadata for: "
-							+ columnName +
-							" " + columnType +
-							" " + procs.getInt("DATA_TYPE") +
-							" " + procs.getString("TYPE_NAME") +
-							" " + procs.getBoolean("NULLABLE") +
+						logger.debug("Skipping metadata for: " + columnType + " " + procs.getInt("DATA_TYPE") +
+							" " + procs.getString("TYPE_NAME") + " " + procs.getBoolean("NULLABLE") +
 							" (probably a member of a collection)"
 						);
 					}
@@ -335,18 +339,19 @@ private void processProcedureColumns(DatabaseMetaData databaseMetaData, String c
 					CallParameterMetaData meta = new CallParameterMetaData(columnName, columnType,
 							procs.getInt("DATA_TYPE"), procs.getString("TYPE_NAME"), procs.getBoolean("NULLABLE")
 					);
-					callParameterMetaData.add(meta);
+					this.callParameterMetaData.add(meta);
 					if (logger.isDebugEnabled()) {
 						logger.debug("Retrieved metadata: " + meta.getParameterName() + " " +
-								meta.getParameterType() + " " + meta.getSqlType() +
-								" " + meta.getTypeName() + " " + meta.isNullable()
-						);
+								meta.getParameterType() + " " + meta.getSqlType() + " " +
+								meta.getTypeName() + " " + meta.isNullable());
 					}
 				}
 			}
 		}
 		catch (SQLException ex) {
-			logger.warn("Error while retrieving metadata for procedure columns: " + ex);
+			if (logger.isWarnEnabled()) {
+				logger.warn("Error while retrieving metadata for procedure columns: " + ex);
+			}
 		}
 		finally {
 			try {
@@ -355,7 +360,9 @@ private void processProcedureColumns(DatabaseMetaData databaseMetaData, String c
 				}
 			}
 			catch (SQLException ex) {
-				logger.warn("Problem closing ResultSet for procedure column metadata: " + ex);
+				if (logger.isWarnEnabled()) {
+					logger.warn("Problem closing ResultSet for procedure column metadata: " + ex);
+				}
 			}
 		}
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
index 8eb1e1ea5a..6adcabc97a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,7 +70,7 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 			Arrays.asList("Apache Derby", "HSQL Database Engine");
 
 	/** Collection of TableParameterMetaData objects */
-	private List<TableParameterMetaData> insertParameterMetaData = new ArrayList<TableParameterMetaData>();
+	private List<TableParameterMetaData> tableParameterMetaData = new ArrayList<TableParameterMetaData>();
 
 	/** NativeJdbcExtractor that can be used to retrieve the native connection */
 	private NativeJdbcExtractor nativeJdbcExtractor;
@@ -85,40 +85,29 @@ protected GenericTableMetaDataProvider(DatabaseMetaData databaseMetaData) throws
 	}
 
 
-	/**
-	 * Specify whether identifiers use upper case
-	 */
 	public void setStoresUpperCaseIdentifiers(boolean storesUpperCaseIdentifiers) {
 		this.storesUpperCaseIdentifiers = storesUpperCaseIdentifiers;
 	}
 
-	/**
-	 * Get whether identifiers use upper case
-	 */
 	public boolean isStoresUpperCaseIdentifiers() {
 		return this.storesUpperCaseIdentifiers;
 	}
 
-	/**
-	 * Specify whether identifiers use lower case.
-	 */
 	public void setStoresLowerCaseIdentifiers(boolean storesLowerCaseIdentifiers) {
 		this.storesLowerCaseIdentifiers = storesLowerCaseIdentifiers;
 	}
 
-	/**
-	 * Get whether identifiers use lower case
-	 */
 	public boolean isStoresLowerCaseIdentifiers() {
 		return this.storesLowerCaseIdentifiers;
 	}
 
+
 	public boolean isTableColumnMetaDataUsed() {
 		return this.tableColumnMetaDataUsed;
 	}
 
 	public List<TableParameterMetaData> getTableParameterMetaData() {
-		return this.insertParameterMetaData;
+		return this.tableParameterMetaData;
 	}
 
 	public boolean isGetGeneratedKeysSupported() {
@@ -133,16 +122,10 @@ public String getSimpleQueryForGetGeneratedKey(String tableName, String keyColum
 		return null;
 	}
 
-	/**
-	 * Specify whether a column name array is supported for generated keys
-	 */
 	public void setGetGeneratedKeysSupported(boolean getGeneratedKeysSupported) {
 		this.getGeneratedKeysSupported = getGeneratedKeysSupported;
 	}
 
-	/**
-	 * Specify whether a column name array is supported for generated keys
-	 */
 	public void setGeneratedKeysColumnNameArraySupported(boolean generatedKeysColumnNameArraySupported) {
 		this.generatedKeysColumnNameArraySupported = generatedKeysColumnNameArraySupported;
 	}
@@ -171,8 +154,8 @@ public void initializeWithMetaData(DatabaseMetaData databaseMetaData) throws SQL
 				setGetGeneratedKeysSupported(false);
 			}
 		}
-		catch (SQLException se) {
-			logger.warn("Error retrieving 'DatabaseMetaData.getGeneratedKeys' - " + se.getMessage());
+		catch (SQLException ex) {
+			logger.warn("Error retrieving 'DatabaseMetaData.getGeneratedKeys' - " + ex.getMessage());
 		}
 		try {
 			String databaseProductName = databaseMetaData.getDatabaseProductName();
@@ -190,26 +173,26 @@ public void initializeWithMetaData(DatabaseMetaData databaseMetaData) throws SQL
 				}
 			}
 		}
-		catch (SQLException se) {
-			logger.warn("Error retrieving 'DatabaseMetaData.getDatabaseProductName' - " + se.getMessage());
+		catch (SQLException ex) {
+			logger.warn("Error retrieving 'DatabaseMetaData.getDatabaseProductName' - " + ex.getMessage());
 		}
 		try {
 			this.databaseVersion = databaseMetaData.getDatabaseProductVersion();
 		}
-		catch (SQLException se) {
-			logger.warn("Error retrieving 'DatabaseMetaData.getDatabaseProductVersion' - " + se.getMessage());
+		catch (SQLException ex) {
+			logger.warn("Error retrieving 'DatabaseMetaData.getDatabaseProductVersion' - " + ex.getMessage());
 		}
 		try {
 			setStoresUpperCaseIdentifiers(databaseMetaData.storesUpperCaseIdentifiers());
 		}
-		catch (SQLException se) {
-			logger.warn("Error retrieving 'DatabaseMetaData.storesUpperCaseIdentifiers' - " + se.getMessage());
+		catch (SQLException ex) {
+			logger.warn("Error retrieving 'DatabaseMetaData.storesUpperCaseIdentifiers' - " + ex.getMessage());
 		}
 		try {
 			setStoresLowerCaseIdentifiers(databaseMetaData.storesLowerCaseIdentifiers());
 		}
-		catch (SQLException se) {
-			logger.warn("Error retrieving 'DatabaseMetaData.storesLowerCaseIdentifiers' - " + se.getMessage());
+		catch (SQLException ex) {
+			logger.warn("Error retrieving 'DatabaseMetaData.storesLowerCaseIdentifiers' - " + ex.getMessage());
 		}
 
 	}
@@ -228,7 +211,7 @@ public String tableNameToUse(String tableName) {
 		else if (isStoresUpperCaseIdentifiers()) {
 			return tableName.toUpperCase();
 		}
-		else if(isStoresLowerCaseIdentifiers()) {
+		else if (isStoresLowerCaseIdentifiers()) {
 			return tableName.toLowerCase();
 		}
 		else {
@@ -243,7 +226,7 @@ public String catalogNameToUse(String catalogName) {
 		else if (isStoresUpperCaseIdentifiers()) {
 			return catalogName.toUpperCase();
 		}
-		else if(isStoresLowerCaseIdentifiers()) {
+		else if (isStoresLowerCaseIdentifiers()) {
 			return catalogName.toLowerCase();
 		}
 		else {
@@ -258,7 +241,7 @@ public String schemaNameToUse(String schemaName) {
 		else if (isStoresUpperCaseIdentifiers()) {
 			return schemaName.toUpperCase();
 		}
-		else if(isStoresLowerCaseIdentifiers()) {
+		else if (isStoresLowerCaseIdentifiers()) {
 			return schemaName.toLowerCase();
 		}
 		else {
@@ -311,22 +294,23 @@ private void locateTableAndProcessMetaData(DatabaseMetaData databaseMetaData, St
 				tmd.setSchemaName(tables.getString("TABLE_SCHEM"));
 				tmd.setTableName(tables.getString("TABLE_NAME"));
 				if (tmd.getSchemaName() == null) {
-					tableMeta.put(userName != null ? userName.toUpperCase() : "", tmd);
+					tableMeta.put(this.userName != null ? this.userName.toUpperCase() : "", tmd);
 				}
 				else {
 					tableMeta.put(tmd.getSchemaName().toUpperCase(), tmd);
 				}
 			}
 		}
-		catch (SQLException se) {
-			logger.warn("Error while accessing table meta data results" + se.getMessage());
+		catch (SQLException ex) {
+			logger.warn("Error while accessing table meta data results" + ex.getMessage());
 		}
 		finally {
 			if (tables != null) {
 				try {
 					tables.close();
-				} catch (SQLException e) {
-					logger.warn("Error while closing table meta data reults" + e.getMessage());
+				}
+				catch (SQLException ex) {
+					logger.warn("Error while closing table meta data results" + ex.getMessage());
 				}
 			}
 		}
@@ -365,7 +349,7 @@ private void locateTableAndProcessMetaData(DatabaseMetaData databaseMetaData, St
 	}
 
 	/**
-	 * Method supporting the metedata processing for a table's columns
+	 * Method supporting the metadata processing for a table's columns
 	 */
 	private void processTableColumns(DatabaseMetaData databaseMetaData, TableMetaData tmd) {
 		ResultSet tableColumns = null;
@@ -378,17 +362,14 @@ private void processTableColumns(DatabaseMetaData databaseMetaData, TableMetaDat
 		}
 		try {
 			tableColumns = databaseMetaData.getColumns(
-					metaDataCatalogName,
-					metaDataSchemaName,
-					metaDataTableName,
-					null);
+					metaDataCatalogName, metaDataSchemaName, metaDataTableName, null);
 			while (tableColumns.next()) {
 				String columnName = tableColumns.getString("COLUMN_NAME");
 				int dataType = tableColumns.getInt("DATA_TYPE");
 				if (dataType == Types.DECIMAL) {
 					String typeName = tableColumns.getString("TYPE_NAME");
 					int decimalDigits = tableColumns.getInt("DECIMAL_DIGITS");
-					// override a DECIMAL data type for no-decimal numerics
+					// Override a DECIMAL data type for no-decimal numerics
 					// (this is for better Oracle support where there have been issues
 					// using DECIMAL for certain inserts (see SPR-6912))
 					if ("NUMBER".equals(typeName) && decimalDigits == 0) {
@@ -402,31 +383,24 @@ private void processTableColumns(DatabaseMetaData databaseMetaData, TableMetaDat
 					}
 				}
 				boolean nullable = tableColumns.getBoolean("NULLABLE");
-				TableParameterMetaData meta = new TableParameterMetaData(
-						columnName,
-						dataType,
-						nullable
-				);
-				this.insertParameterMetaData.add(meta);
+				TableParameterMetaData meta = new TableParameterMetaData(columnName, dataType, nullable);
+				this.tableParameterMetaData.add(meta);
 				if (logger.isDebugEnabled()) {
-					logger.debug("Retrieved metadata: "
-						+ meta.getParameterName() +
-						" " + meta.getSqlType() +
-						" " + meta.isNullable()
-					);
+					logger.debug("Retrieved metadata: " + meta.getParameterName() +
+						" " + meta.getSqlType() + " " + meta.isNullable());
 				}
 			}
 		}
-		catch (SQLException se) {
-			logger.warn("Error while retrieving metadata for table columns: " + se.getMessage());
+		catch (SQLException ex) {
+			logger.warn("Error while retrieving metadata for table columns: " + ex.getMessage());
 		}
 		finally {
 			try {
 				if (tableColumns != null)
 					tableColumns.close();
 			}
-			catch (SQLException se) {
-				logger.warn("Problem closing ResultSet for table column metadata " + se.getMessage());
+			catch (SQLException ex) {
+				logger.warn("Problem closing ResultSet for table column metadata " + ex.getMessage());
 			}
 		}
 
@@ -444,7 +418,6 @@ private static class TableMetaData {
 
 		private String tableName;
 
-
 		public void setCatalogName(String catalogName) {
 			this.catalogName = catalogName;
 		}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java
index cb6796a2d1..1ef669a904 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,9 @@
 import java.sql.SQLException;
 
 /**
- * The HSQL specific implementation of the {@link TableMetaDataProvider}. Suports a feature for
- * retreiving generated keys without the JDBC 3.0 getGeneratedKeys support.
+ * The HSQL specific implementation of {@link TableMetaDataProvider}.
+ * Supports a feature for retrieving generated keys without the JDBC 3.0
+ * {@code getGeneratedKeys} support.
  *
  * @author Thomas Risberg
  * @since 2.5
@@ -32,15 +33,14 @@ public HsqlTableMetaDataProvider(DatabaseMetaData databaseMetaData) throws SQLEx
 		super(databaseMetaData);
 	}
 
-
 	@Override
 	public boolean isGetGeneratedKeysSimulated() {
 		return true;
 	}
 
-
 	@Override
 	public String getSimpleQueryForGetGeneratedKey(String tableName, String keyColumnName) {
 		return "select max(identity()) from " + tableName;
 	}
+
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java
index 75ba14dc10..7c82762176 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@
 
 /**
  * Oracle-specific implementation of the {@link org.springframework.jdbc.core.metadata.TableMetaDataProvider}.
- * Supports a feature for including synonyms in the metadata lookup. Also supports lookup of current schema using
- * the sys_context.
+ * Supports a feature for including synonyms in the metadata lookup. Also supports lookup of current schema
+ * using the sys_context.
  *
  * <p>Thanks to Mike Youngstrom and Bruce Campbell for submitting the original suggestion for the Oracle
  * current schema lookup implementation.
@@ -56,9 +56,10 @@ public OracleTableMetaDataProvider(DatabaseMetaData databaseMetaData, boolean in
 		lookupDefaultSchema(databaseMetaData);
 	}
 
+
 	@Override
 	protected String getDefaultSchema() {
-		if (defaultSchema != null) {
+		if (this.defaultSchema != null) {
 			return defaultSchema;
 		}
 		return super.getDefaultSchema();
@@ -81,7 +82,7 @@ public void initializeWithTableColumnMetaData(DatabaseMetaData databaseMetaData,
 		}
 		boolean isOracleCon;
 		try {
-			Class<?> oracleConClass = getClass().getClassLoader().loadClass("oracle.jdbc.OracleConnection");
+			Class<?> oracleConClass = con.getClass().getClassLoader().loadClass("oracle.jdbc.OracleConnection");
 			isOracleCon = oracleConClass.isInstance(con);
 		}
 		catch (ClassNotFoundException ex) {
@@ -107,7 +108,7 @@ public void initializeWithTableColumnMetaData(DatabaseMetaData databaseMetaData,
 			ReflectionUtils.makeAccessible(getIncludeSynonyms);
 			originalValueForIncludeSynonyms = (Boolean) getIncludeSynonyms.invoke(con);
 
-			setIncludeSynonyms = con.getClass().getMethod("setIncludeSynonyms", new Class[] {boolean.class});
+			setIncludeSynonyms = con.getClass().getMethod("setIncludeSynonyms", boolean.class);
 			ReflectionUtils.makeAccessible(setIncludeSynonyms);
 			setIncludeSynonyms.invoke(con, Boolean.TRUE);
 		}
@@ -126,9 +127,7 @@ public void initializeWithTableColumnMetaData(DatabaseMetaData databaseMetaData,
 	}
 
 	/*
-	 * Oracle implementation for detecting current schema
-	 *
-	 * @param databaseMetaData
+	 * Oracle-based implementation for detecting the current schema.
 	 */
 	private void lookupDefaultSchema(DatabaseMetaData databaseMetaData) {
 		try {
@@ -144,7 +143,9 @@ private void lookupDefaultSchema(DatabaseMetaData databaseMetaData) {
 					cstmt.close();
 				}
 			}
-		} catch (Exception ignore) {}
+		}
+		catch (Exception ignore) {
+		}
 	}
 
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java
index 000ffc40c7..da5cc30f18 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,9 @@
 import java.sql.SQLException;
 
 /**
- * The PostgreSQL specific implementation of the {@link org.springframework.jdbc.core.metadata.TableMetaDataProvider}.
- * Suports a feature for retreiving generated keys without the JDBC 3.0 getGeneratedKeys support.
+ * The PostgreSQL specific implementation of {@link TableMetaDataProvider}.
+ * Supports a feature for retrieving generated keys without the JDBC 3.0
+ * {@code getGeneratedKeys} support.
  *
  * @author Thomas Risberg
  * @since 2.5
@@ -38,7 +39,10 @@ public boolean isGetGeneratedKeysSimulated() {
 			return true;
 		}
 		else {
-			logger.warn("PostgreSQL does not support getGeneratedKeys or INSERT ... RETURNING in version " + getDatabaseVersion());
+			if (logger.isWarnEnabled()) {
+				logger.warn("PostgreSQL does not support getGeneratedKeys or INSERT ... RETURNING in version " +
+						getDatabaseVersion());
+			}
 			return false;
 		}
 	}
@@ -47,4 +51,5 @@ public boolean isGetGeneratedKeysSimulated() {
 	public String getSimpleQueryForGetGeneratedKey(String tableName, String keyColumnName) {
 		return "RETURNING " + keyColumnName;
 	}
+
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java
index 31f73add5f..c9bb919c3c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
@@ -202,7 +201,8 @@ public void setNativeJdbcExtractor(NativeJdbcExtractor nativeJdbcExtractor) {
 	 * @param generatedKeyNames name of generated keys
 	 */
 	public void processMetaData(DataSource dataSource, List<String> declaredColumns, String[] generatedKeyNames) {
-		this.metaDataProvider = TableMetaDataProviderFactory.createMetaDataProvider(dataSource, this, this.nativeJdbcExtractor);
+		this.metaDataProvider =
+				TableMetaDataProviderFactory.createMetaDataProvider(dataSource, this, this.nativeJdbcExtractor);
 		this.tableColumns = reconcileColumnsToUse(declaredColumns, generatedKeyNames);
 	}
 
@@ -239,7 +239,7 @@ public List<Object> matchInParameterValuesWithInsertColumns(SqlParameterSource p
 		List<Object> values = new ArrayList<Object>();
 		// for parameter source lookups we need to provide caseinsensitive lookup support since the
 		// database metadata is not necessarily providing case sensitive column names
-		Map caseInsensitiveParameterNames =
+		Map<String, String> caseInsensitiveParameterNames =
 				SqlParameterSourceUtils.extractCaseInsensitiveParameterNames(parameterSource);
 		for (String column : this.tableColumns) {
 			if (parameterSource.hasValue(column)) {
@@ -259,7 +259,7 @@ public List<Object> matchInParameterValuesWithInsertColumns(SqlParameterSource p
 						if (caseInsensitiveParameterNames.containsKey(lowerCaseName)) {
 							values.add(
 									SqlParameterSourceUtils.getTypedValue(parameterSource,
-											(String) caseInsensitiveParameterNames.get(lowerCaseName)));
+											caseInsensitiveParameterNames.get(lowerCaseName)));
 						}
 						else {
 							values.add(null);
@@ -292,21 +292,21 @@ public List<Object> matchInParameterValuesWithInsertColumns(Map<String, Object>
 	 * Build the insert string based on configuration and metadata information
 	 * @return the insert string to be used
 	 */
-	public String createInsertString(String[] generatedKeyNames) {
+	public String createInsertString(String... generatedKeyNames) {
 		HashSet<String> keys = new HashSet<String>(generatedKeyNames.length);
 		for (String key : generatedKeyNames) {
 			keys.add(key.toUpperCase());
 		}
 		StringBuilder insertStatement = new StringBuilder();
 		insertStatement.append("INSERT INTO ");
-		if (this.getSchemaName() != null) {
-			insertStatement.append(this.getSchemaName());
+		if (getSchemaName() != null) {
+			insertStatement.append(getSchemaName());
 			insertStatement.append(".");
 		}
-		insertStatement.append(this.getTableName());
+		insertStatement.append(getTableName());
 		insertStatement.append(" (");
 		int columnCount = 0;
-		for (String columnName : this.getTableColumns()) {
+		for (String columnName : getTableColumns()) {
 			if (!keys.contains(columnName.toUpperCase())) {
 				columnCount++;
 				if (columnCount > 1) {
@@ -319,11 +319,11 @@ public String createInsertString(String[] generatedKeyNames) {
 		if (columnCount < 1) {
 			if (this.generatedKeyColumnsUsed) {
 				logger.info("Unable to locate non-key columns for table '" +
-						this.getTableName() + "' so an empty insert statement is generated");
+						getTableName() + "' so an empty insert statement is generated");
 			}
 			else {
 				throw new InvalidDataAccessApiUsageException("Unable to locate columns for table '" +
-						this.getTableName() + "' so an insert statement can't be generated");
+						getTableName() + "' so an insert statement can't be generated");
 			}
 		}
 		for (int i = 0; i < columnCount; i++) {
@@ -341,14 +341,14 @@ public String createInsertString(String[] generatedKeyNames) {
 	 * @return the array of types to be used
 	 */
 	public int[] createInsertTypes() {
-		int[] types = new int[this.getTableColumns().size()];
+		int[] types = new int[getTableColumns().size()];
 		List<TableParameterMetaData> parameters = this.metaDataProvider.getTableParameterMetaData();
 		Map<String, TableParameterMetaData> parameterMap = new HashMap<String, TableParameterMetaData>(parameters.size());
 		for (TableParameterMetaData tpmd : parameters) {
 			parameterMap.put(tpmd.getParameterName().toUpperCase(), tpmd);
 		}
 		int typeIndx = 0;
-		for (String column : this.getTableColumns()) {
+		for (String column : getTableColumns()) {
 			if (column == null) {
 				types[typeIndx] = SqlTypeValue.TYPE_UNKNOWN;
 			}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java
index 15421a998a..1054bc672c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,8 @@
 import org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor;
 
 /**
- * Factory used to create a {@link TableMetaDataProvider} implementation based on the type of databse being used.
+ * Factory used to create a {@link TableMetaDataProvider} implementation
+ * based on the type of database being used.
  *
  * @author Thomas Risberg
  * @since 2.5
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
index d8258cefc9..f1aea7da1f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,6 +52,8 @@
  * exposed to allow for convenient access to the traditional
  * {@link org.springframework.jdbc.core.JdbcTemplate} methods.
  *
+ * <p><b>NOTE: An instance of this class is thread-safe once configured.</b>
+ *
  * @author Thomas Risberg
  * @author Juergen Hoeller
  * @since 2.0
@@ -320,7 +322,7 @@ public int[] batchUpdate(String sql, Map<String, ?>[] batchValues) {
 	}
 
 	public int[] batchUpdate(String sql, SqlParameterSource[] batchArgs) {
-		ParsedSql parsedSql = this.getParsedSql(sql);
+		ParsedSql parsedSql = getParsedSql(sql);
 		return NamedParameterBatchUpdateUtils.executeBatchUpdateWithNamedParameters(parsedSql, batchArgs, getJdbcOperations());
 	}
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
index b28f05c620..31f84b50e5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,8 @@
 
 /**
  * Helper methods for named parameter parsing.
- * Only intended for internal use within Spring's JDBC framework.
+ *
+ * <p>Only intended for internal use within Spring's JDBC framework.
  *
  * @author Thomas Risberg
  * @author Juergen Hoeller
@@ -112,11 +113,13 @@ public static ParsedSql parseSqlStatement(final String sql) {
 					while (j < statement.length && !('}' == statement[j])) {
 						j++;
 						if (':' == statement[j] || '{' == statement[j]) {
-							throw new InvalidDataAccessApiUsageException("Parameter name contains invalid character '" + statement[j] + "' at position " + i + " in statement " + sql);
+							throw new InvalidDataAccessApiUsageException("Parameter name contains invalid character '" +
+									statement[j] + "' at position " + i + " in statement: " + sql);
 						}
 					}
 					if (j >= statement.length) {
-						throw new InvalidDataAccessApiUsageException("Non-terminated named parameter declaration at position " + i + " in statement " + sql);
+						throw new InvalidDataAccessApiUsageException(
+								"Non-terminated named parameter declaration at position " + i + " in statement: " + sql);
 					}
 					if (j - i > 3) {
 						parameter = sql.substring(i + 2, j);
@@ -165,8 +168,9 @@ public static ParsedSql parseSqlStatement(final String sql) {
 		return parsedSql;
 	}
 
-	private static int addNamedParameter(List<ParameterHolder> parameterList, int totalParameterCount, int escapes, int i, int j,
-			String parameter) {
+	private static int addNamedParameter(
+			List<ParameterHolder> parameterList, int totalParameterCount, int escapes, int i, int j, String parameter) {
+
 		parameterList.add(new ParameterHolder(parameter, i - escapes, j - escapes));
 		totalParameterCount++;
 		return totalParameterCount;
@@ -229,18 +233,18 @@ private static int skipCommentsAndQuotes(char[] statement, int position) {
 	}
 
 	/**
-	 * Parse the SQL statement and locate any placeholders or named parameters.
-	 * Named parameters are substituted for a JDBC placeholder and any select list
-	 * is expanded to the required number of placeholders.  Select lists may contain
-	 * an array of objects and in that case the placeholders will be grouped and
-	 * enclosed with parantheses.  This allows for the use of "expression lists" in
-	 * the SQL statement like:<br/>
-	 * select id, name, state from table where (name, age) in (('John', 35), ('Ann', 50))
-	 * <p>The parameter values passed in are used to determine the number of
-	 * placeholder to be used for a select list. Select lists should be limited
-	 * to 100 or fewer elements. A larger number of elements is not guaramteed to
-	 * be supported by the database and is strictly vendor-dependent.
-	 * @param parsedSql the parsed represenation of the SQL statement
+	 * Parse the SQL statement and locate any placeholders or named parameters. Named
+	 * parameters are substituted for a JDBC placeholder, and any select list is expanded
+	 * to the required number of placeholders. Select lists may contain an array of
+	 * objects, and in that case the placeholders will be grouped and enclosed with
+	 * parentheses. This allows for the use of "expression lists" in the SQL statement
+	 * like: <br /><br />
+	 * {@code select id, name, state from table where (name, age) in (('John', 35), ('Ann', 50))}
+	 * <p>The parameter values passed in are used to determine the number of placeholders to
+	 * be used for a select list. Select lists should be limited to 100 or fewer elements.
+	 * A larger number of elements is not guaranteed to be supported by the database and
+	 * is strictly vendor-dependent.
+	 * @param parsedSql the parsed representation of the SQL statement
 	 * @param paramSource the source for named parameters
 	 * @return the SQL statement with substituted parameters
 	 * @see #parseSqlStatement
@@ -255,7 +259,7 @@ public static String substituteNamedParameters(ParsedSql parsedSql, SqlParameter
 			int[] indexes = parsedSql.getParameterIndexes(i);
 			int startIndex = indexes[0];
 			int endIndex = indexes[1];
-			actualSql.append(originalSql.substring(lastIndex, startIndex));
+			actualSql.append(originalSql, lastIndex, startIndex);
 			if (paramSource != null && paramSource.hasValue(paramName)) {
 				Object value = paramSource.getValue(paramName);
 				if (value instanceof SqlParameterValue) {
@@ -295,7 +299,7 @@ public static String substituteNamedParameters(ParsedSql parsedSql, SqlParameter
 			}
 			lastIndex = endIndex;
 		}
-		actualSql.append(originalSql.substring(lastIndex, originalSql.length()));
+		actualSql.append(originalSql, lastIndex, originalSql.length());
 		return actualSql.toString();
 	}
 
@@ -314,10 +318,10 @@ public static Object[] buildValueArray(
 		Object[] paramArray = new Object[parsedSql.getTotalParameterCount()];
 		if (parsedSql.getNamedParameterCount() > 0 && parsedSql.getUnnamedParameterCount() > 0) {
 			throw new InvalidDataAccessApiUsageException(
-					"You can't mix named and traditional ? placeholders. You have " +
+					"Not allowed to mix named and traditional ? placeholders. You have " +
 					parsedSql.getNamedParameterCount() + " named parameter(s) and " +
-					parsedSql.getUnnamedParameterCount() + " traditonal placeholder(s) in [" +
-					parsedSql.getOriginalSql() + "]");
+					parsedSql.getUnnamedParameterCount() + " traditional placeholder(s) in statement: " +
+					parsedSql.getOriginalSql());
 		}
 		List<String> paramNames = parsedSql.getParameterNames();
 		for (int i = 0; i < paramNames.size(); i++) {
@@ -408,15 +412,12 @@ public static List<SqlParameter> buildSqlParameterList(ParsedSql parsedSql, SqlP
 		List<String> paramNames = parsedSql.getParameterNames();
 		List<SqlParameter> params = new LinkedList<SqlParameter>();
 		for (String paramName : paramNames) {
-			SqlParameter param = new SqlParameter(
-					paramName,
-					paramSource.getSqlType(paramName),
-					paramSource.getTypeName(paramName));
-			params.add(param);
+			params.add(new SqlParameter(paramName, paramSource.getSqlType(paramName), paramSource.getTypeName(paramName)));
 		}
 		return params;
 	}
 
+
 	//-------------------------------------------------------------------------
 	// Convenience methods operating on a plain SQL String
 	//-------------------------------------------------------------------------
@@ -463,28 +464,32 @@ public static Object[] buildValueArray(String sql, Map<String, ?> paramMap) {
 		return buildValueArray(parsedSql, new MapSqlParameterSource(paramMap), null);
 	}
 
+
 	private static class ParameterHolder {
-		private String parameterName;
-		private int startIndex;
-		private int endIndex;
+
+		private final String parameterName;
+
+		private final int startIndex;
+
+		private final int endIndex;
 
 		public ParameterHolder(String parameterName, int startIndex, int endIndex) {
-			super();
 			this.parameterName = parameterName;
 			this.startIndex = startIndex;
 			this.endIndex = endIndex;
 		}
 
 		public String getParameterName() {
-			return parameterName;
+			return this.parameterName;
 		}
 
 		public int getStartIndex() {
-			return startIndex;
+			return this.startIndex;
 		}
 
 		public int getEndIndex() {
-			return endIndex;
+			return this.endIndex;
 		}
 	}
+
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java
index 12e1dbd85e..8971016a5c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
  * This class provides the base SPI for {@link SimpleJdbcCall}.
  *
  * @author Thomas Risberg
+ * @author Juergen Hoeller
  * @since 2.5
  */
 public abstract class AbstractJdbcCall {
@@ -53,6 +54,9 @@ public abstract class AbstractJdbcCall {
 	/** Lower-level class used to execute SQL */
 	private final JdbcTemplate jdbcTemplate;
 
+	/** Context used to retrieve and manage database metadata */
+	private final CallMetaDataContext callMetaDataContext = new CallMetaDataContext();
+
 	/** List of SqlParameter objects */
 	private final List<SqlParameter> declaredParameters = new ArrayList<SqlParameter>();
 
@@ -60,20 +64,16 @@ public abstract class AbstractJdbcCall {
 	private final Map<String, RowMapper> declaredRowMappers = new LinkedHashMap<String, RowMapper>();
 
 	/**
-	 * Has this operation been compiled? Compilation means at
-	 * least checking that a DataSource and sql have been provided,
-	 * but subclasses may also implement their own custom validation.
+	 * Has this operation been compiled? Compilation means at least checking
+	 * that a DataSource or JdbcTemplate has been provided.
 	 */
-	private boolean compiled = false;
+	private volatile boolean compiled = false;
 
-	/** the generated string used for call statement */
+	/** The generated string used for call statement */
 	private String callString;
 
-	/** context used to retrieve and manage database metadata */
-	private CallMetaDataContext callMetaDataContext = new CallMetaDataContext();
-
 	/**
-	 * Object enabling us to create CallableStatementCreators
+	 * A delegate enabling us to create CallableStatementCreators
 	 * efficiently, based on this class's declared parameters.
 	 */
 	private CallableStatementCreatorFactory callableStatementFactory;
@@ -92,6 +92,7 @@ protected AbstractJdbcCall(DataSource dataSource) {
 	 * @param jdbcTemplate the JdbcTemplate to use
 	 */
 	protected AbstractJdbcCall(JdbcTemplate jdbcTemplate) {
+		Assert.notNull(jdbcTemplate, "JdbcTemplate must not be null");
 		this.jdbcTemplate = jdbcTemplate;
 	}
 
@@ -103,13 +104,6 @@ public JdbcTemplate getJdbcTemplate() {
 		return this.jdbcTemplate;
 	}
 
-	/**
-	 * Get the {@link CallableStatementCreatorFactory} being used
-	 */
-	protected CallableStatementCreatorFactory getCallableStatementFactory() {
-		return this.callableStatementFactory;
-	}
-
 	/**
 	 * Set the name of the stored procedure.
 	 */
@@ -153,7 +147,7 @@ public String getCatalogName() {
 	}
 
 	/**
-	 * Set the schema name to use,
+	 * Set the schema name to use.
 	 */
 	public void setSchemaName(String schemaName) {
 		this.callMetaDataContext.setSchemaName(schemaName);
@@ -168,6 +162,7 @@ public String getSchemaName() {
 
 	/**
 	 * Specify whether this call is a function call.
+	 * The default is {@code false}.
 	 */
 	public void setFunction(boolean function) {
 		this.callMetaDataContext.setFunction(function);
@@ -181,10 +176,11 @@ public boolean isFunction() {
 	}
 
 	/**
-	 * Specify whether the call requires a rerurn value.
+	 * Specify whether the call requires a return value.
+	 * The default is {@code false}.
 	 */
-	public void setReturnValueRequired(boolean b) {
-		this.callMetaDataContext.setReturnValueRequired(b);
+	public void setReturnValueRequired(boolean returnValueRequired) {
+		this.callMetaDataContext.setReturnValueRequired(returnValueRequired);
 	}
 
 	/**
@@ -194,12 +190,35 @@ public boolean isReturnValueRequired() {
 		return this.callMetaDataContext.isReturnValueRequired();
 	}
 
+	/**
+	 * Specify whether the parameter metadata for the call should be used.
+	 * The default is {@code true}.
+	 */
+	public void setAccessCallParameterMetaData(boolean accessCallParameterMetaData) {
+		this.callMetaDataContext.setAccessCallParameterMetaData(accessCallParameterMetaData);
+	}
+
+	/**
+	 * Get the call string that should be used based on parameters and meta data.
+	 */
+	public String getCallString() {
+		return this.callString;
+	}
+
+	/**
+	 * Get the {@link CallableStatementCreatorFactory} being used
+	 */
+	protected CallableStatementCreatorFactory getCallableStatementFactory() {
+		return this.callableStatementFactory;
+	}
+
+
 	/**
 	 * Add a declared parameter to the list of parameters for the call.
-	 * Only parameters declared as {@code SqlParameter} and {@code SqlInOutParameter}
-	 * will be used to provide input values. This is different from the {@code StoredProcedure} class
-	 * which for backwards compatibility reasons allows input values to be provided for parameters declared
-	 * as {@code SqlOutParameter}.
+	 * <p>Only parameters declared as {@code SqlParameter} and {@code SqlInOutParameter} will
+	 * be used to provide input values. This is different from the {@code StoredProcedure}
+	 * class which - for backwards compatibility reasons - allows input values to be provided
+	 * for parameters declared as {@code SqlOutParameter}.
 	 * @param parameter the {@link SqlParameter} to add
 	 */
 	public void addDeclaredParameter(SqlParameter parameter) {
@@ -235,29 +254,15 @@ public void addDeclaredRowMapper(String parameterName, ParameterizedRowMapper ro
 		addDeclaredRowMapper(parameterName, (RowMapper) rowMapper);
 	}
 
-	/**
-	 * Get the call string that should be used based on parameters and meta data.
-	 */
-	public String getCallString() {
-		return this.callString;
-	}
-
-	/**
-	 * Specify whether the parameter metadata for the call should be used. The default is true.
-	 */
-	public void setAccessCallParameterMetaData(boolean accessCallParameterMetaData) {
-		this.callMetaDataContext.setAccessCallParameterMetaData(accessCallParameterMetaData);
-	}
-
 
 	//-------------------------------------------------------------------------
 	// Methods handling compilation issues
 	//-------------------------------------------------------------------------
 
 	/**
-	 * Compile this JdbcCall using provided parameters and meta data plus other settings.  This
-	 * finalizes the configuration for this object and subsequent attempts to compile are ignored.
-	 * This will be implicitly called the first time an un-compiled call is executed.
+	 * Compile this JdbcCall using provided parameters and meta data plus other settings.
+	 * <p>This finalizes the configuration for this object and subsequent attempts to compile are
+	 * ignored. This will be implicitly called the first time an un-compiled call is executed.
 	 * @throws org.springframework.dao.InvalidDataAccessApiUsageException if the object hasn't
 	 * been correctly initialized, for example if no DataSource has been provided
 	 */
@@ -275,19 +280,21 @@ public synchronized final void compile() throws InvalidDataAccessApiUsageExcepti
 			compileInternal();
 			this.compiled = true;
 			if (logger.isDebugEnabled()) {
-				logger.debug("SqlCall for " + (isFunction() ? "function" : "procedure") + " [" + getProcedureName() + "] compiled");
+				logger.debug("SqlCall for " + (isFunction() ? "function" : "procedure") +
+						" [" + getProcedureName() + "] compiled");
 			}
 		}
 	}
 
 	/**
-	 * Method to perform the actual compilation.  Subclasses can override this template method to perform
-	 * their own compilation.  Invoked after this base class's compilation is complete.
+	 * Delegate method to perform the actual compilation.
+	 * <p>Subclasses can override this template method to perform their own compilation.
+	 * Invoked after this base class's compilation is complete.
 	 */
 	protected void compileInternal() {
 		this.callMetaDataContext.initializeMetaData(getJdbcTemplate().getDataSource());
 
-		// iterate over the declared RowMappers and register the corresponding SqlParameter
+		// Iterate over the declared RowMappers and register the corresponding SqlParameter
 		for (Map.Entry<String, RowMapper> entry : this.declaredRowMappers.entrySet()) {
 			SqlParameter resultSetParameter =
 					this.callMetaDataContext.createReturnResultSetParameter(entry.getKey(), entry.getValue());
@@ -316,7 +323,7 @@ protected void onCompileInternal() {
 
 	/**
 	 * Is this operation "compiled"?
-	 * @return whether this operation is compiled, and ready to use.
+	 * @return whether this operation is compiled and ready to use
 	 */
 	public boolean isCompiled() {
 		return this.compiled;
@@ -340,7 +347,7 @@ protected void checkCompiled() {
 	//-------------------------------------------------------------------------
 
 	/**
-	 * Method that provides execution of the call using the passed in {@link SqlParameterSource}
+	 * Delegate method that executes the call using the passed-in {@link SqlParameterSource}.
 	 * @param parameterSource parameter names and values to be used in call
 	 * @return Map of out parameters
 	 */
@@ -351,18 +358,19 @@ protected Map<String, Object> doExecute(SqlParameterSource parameterSource) {
 	}
 
 	/**
-	 * Method that provides execution of the call using the passed in array of parameters
-	 * @param args array of parameter values; order must match the order declared for the stored procedure
+	 * Delegate method that executes the call using the passed-in array of parameters.
+	 * @param args array of parameter values. The order of values must match the order
+	 * declared for the stored procedure.
 	 * @return Map of out parameters
 	 */
-	protected Map<String, Object> doExecute(Object[] args) {
+	protected Map<String, Object> doExecute(Object... args) {
 		checkCompiled();
 		Map<String, ?> params = matchInParameterValuesWithCallParameters(args);
 		return executeCallInternal(params);
 	}
 
 	/**
-	 * Method that provides execution of the call using the passed in Map of parameters
+	 * Delegate method that executes the call using the passed-in Map of parameters.
 	 * @param args Map of parameter name and values
 	 * @return Map of out parameters
 	 */
@@ -373,20 +381,23 @@ protected Map<String, Object> doExecute(Map<String, ?> args) {
 	}
 
 	/**
-	 * Method to perform the actual call processing
+	 * Delegate method to perform the actual call processing.
 	 */
-	private Map<String, Object> executeCallInternal(Map<String, ?> params) {
-		CallableStatementCreator csc = getCallableStatementFactory().newCallableStatementCreator(params);
+	private Map<String, Object> executeCallInternal(Map<String, ?> args) {
+		CallableStatementCreator csc = getCallableStatementFactory().newCallableStatementCreator(args);
 		if (logger.isDebugEnabled()) {
-			logger.debug("The following parameters are used for call " + getCallString() + " with: " + params);
+			logger.debug("The following parameters are used for call " + getCallString() + " with " + args);
 			int i = 1;
-			for (SqlParameter p : getCallParameters()) {
-				logger.debug(i++ + ": " +  p.getName() + " SQL Type "+ p.getSqlType() + " Type Name " + p.getTypeName() + " " + p.getClass().getName());
+			for (SqlParameter param : getCallParameters()) {
+				logger.debug(i + ": " +  param.getName() + ", SQL type "+ param.getSqlType() + ", type name " +
+						param.getTypeName() + ", parameter class [" + param.getClass().getName() + "]");
+				i++;
 			}
 		}
 		return getJdbcTemplate().call(csc, getCallParameters());
 	}
 
+
 	/**
 	 * Get the name of a single out parameter or return value.
 	 * Used for functions or procedures with one out parameter.
@@ -395,6 +406,14 @@ protected String getScalarOutParameterName() {
 		return this.callMetaDataContext.getScalarOutParameterName();
 	}
 
+	/**
+	 * Get a List of all the call parameters to be used for call.
+	 * This includes any parameters added based on meta data processing.
+	 */
+	protected List<SqlParameter> getCallParameters() {
+		return this.callMetaDataContext.getCallParameters();
+	}
+
 	/**
 	 * Match the provided in parameter values with registered parameters and
 	 * parameters defined via metadata processing.
@@ -425,12 +444,4 @@ protected Map<String, Object> matchInParameterValuesWithCallParameters(SqlParame
 		return this.callMetaDataContext.matchInParameterValuesWithCallParameters(args);
 	}
 
-	/**
-	 * Get a List of all the call parameters to be used for call. This includes any parameters added
-	 * based on meta data processing.
-	 */
-	protected List<SqlParameter> getCallParameters() {
-		return this.callMetaDataContext.getCallParameters();
-	}
-
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java
index cb66d803c7..62d055f693 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,12 +73,14 @@ public abstract class AbstractJdbcInsert {
 	/** List of columns objects to be used in insert statement */
 	private final List<String> declaredColumns = new ArrayList<String>();
 
+	/** The names of the columns holding the generated key */
+	private String[] generatedKeyNames = new String[0];
+
 	/**
 	 * Has this operation been compiled? Compilation means at least checking
-	 * that a DataSource or JdbcTemplate has been provided, but subclasses
-	 * may also implement their own custom validation.
+	 * that a DataSource or JdbcTemplate has been provided.
 	 */
-	private boolean compiled = false;
+	private volatile boolean compiled = false;
 
 	/** The generated string used for insert statement */
 	private String insertString;
@@ -86,19 +88,18 @@ public abstract class AbstractJdbcInsert {
 	/** The SQL type information for the insert columns */
 	private int[] insertTypes;
 
-	/** The names of the columns holding the generated key */
-	private String[] generatedKeyNames = new String[0];
-
 
 	/**
-	 * Constructor for sublasses to delegate to for setting the DataSource.
+	 * Constructor to be used when initializing using a {@link DataSource}.
+	 * @param dataSource the DataSource to be used
 	 */
 	protected AbstractJdbcInsert(DataSource dataSource) {
 		this.jdbcTemplate = new JdbcTemplate(dataSource);
 	}
 
 	/**
-	 * Constructor for sublasses to delegate to for setting the JdbcTemplate.
+	 * Constructor to be used when initializing using a {@link JdbcTemplate}.
+	 * @param jdbcTemplate the JdbcTemplate to use
 	 */
 	protected AbstractJdbcInsert(JdbcTemplate jdbcTemplate) {
 		Assert.notNull(jdbcTemplate, "JdbcTemplate must not be null");
@@ -112,14 +113,14 @@ protected AbstractJdbcInsert(JdbcTemplate jdbcTemplate) {
 	//-------------------------------------------------------------------------
 
 	/**
-	 * Get the {@link JdbcTemplate} that is configured to be used.
+	 * Get the configured {@link JdbcTemplate}.
 	 */
 	public JdbcTemplate getJdbcTemplate() {
 		return this.jdbcTemplate;
 	}
 
 	/**
-	 * Set the name of the table for this insert
+	 * Set the name of the table for this insert.
 	 */
 	public void setTableName(String tableName) {
 		checkIfConfigurationModificationIsAllowed();
@@ -127,14 +128,14 @@ public void setTableName(String tableName) {
 	}
 
 	/**
-	 * Get the name of the table for this insert
+	 * Get the name of the table for this insert.
 	 */
 	public String getTableName() {
 		return this.tableMetaDataContext.getTableName();
 	}
 
 	/**
-	 * Set the name of the schema for this insert
+	 * Set the name of the schema for this insert.
 	 */
 	public void setSchemaName(String schemaName) {
 		checkIfConfigurationModificationIsAllowed();
@@ -142,14 +143,14 @@ public void setSchemaName(String schemaName) {
 	}
 
 	/**
-	 * Get the name of the schema for this insert
+	 * Get the name of the schema for this insert.
 	 */
 	public String getSchemaName() {
 		return this.tableMetaDataContext.getSchemaName();
 	}
 
 	/**
-	 * Set the name of the catalog for this insert
+	 * Set the name of the catalog for this insert.
 	 */
 	public void setCatalogName(String catalogName) {
 		checkIfConfigurationModificationIsAllowed();
@@ -157,14 +158,14 @@ public void setCatalogName(String catalogName) {
 	}
 
 	/**
-	 * Get the name of the catalog for this insert
+	 * Get the name of the catalog for this insert.
 	 */
 	public String getCatalogName() {
 		return this.tableMetaDataContext.getCatalogName();
 	}
 
 	/**
-	 * Set the names of the columns to be used
+	 * Set the names of the columns to be used.
 	 */
 	public void setColumnNames(List<String> columnNames) {
 		checkIfConfigurationModificationIsAllowed();
@@ -173,44 +174,46 @@ public void setColumnNames(List<String> columnNames) {
 	}
 
 	/**
-	 * Get the names of the columns used
+	 * Get the names of the columns used.
 	 */
 	public List<String> getColumnNames() {
 		return Collections.unmodifiableList(this.declaredColumns);
 	}
 
 	/**
-	 * Get the names of any generated keys
+	 * Specify the name of a single generated key column.
 	 */
-	public String[] getGeneratedKeyNames() {
-		return this.generatedKeyNames;
+	public void setGeneratedKeyName(String generatedKeyName) {
+		checkIfConfigurationModificationIsAllowed();
+		this.generatedKeyNames = new String[] {generatedKeyName};
 	}
 
 	/**
-	 * Set the names of any generated keys
+	 * Set the names of any generated keys.
 	 */
-	public void setGeneratedKeyNames(String[] generatedKeyNames) {
+	public void setGeneratedKeyNames(String... generatedKeyNames) {
 		checkIfConfigurationModificationIsAllowed();
 		this.generatedKeyNames = generatedKeyNames;
 	}
 
 	/**
-	 * Specify the name of a single generated key column
+	 * Get the names of any generated keys.
 	 */
-	public void setGeneratedKeyName(String generatedKeyName) {
-		checkIfConfigurationModificationIsAllowed();
-		this.generatedKeyNames = new String[] {generatedKeyName};
+	public String[] getGeneratedKeyNames() {
+		return this.generatedKeyNames;
 	}
 
 	/**
-	 * Specify whether the parameter metadata for the call should be used.  The default is true.
+	 * Specify whether the parameter metadata for the call should be used.
+	 * The default is {@code true}.
 	 */
 	public void setAccessTableColumnMetaData(boolean accessTableColumnMetaData) {
 		this.tableMetaDataContext.setAccessTableColumnMetaData(accessTableColumnMetaData);
 	}
 
 	/**
-	 * Specify whether the default for including synonyms should be changed.  The default is false.
+	 * Specify whether the default for including synonyms should be changed.
+	 * The default is {@code false}.
 	 */
 	public void setOverrideIncludeSynonymsDefault(boolean override) {
 		this.tableMetaDataContext.setOverrideIncludeSynonymsDefault(override);
@@ -224,14 +227,14 @@ public void setNativeJdbcExtractor(NativeJdbcExtractor nativeJdbcExtractor) {
 	}
 
 	/**
-	 * Get the insert string to be used
+	 * Get the insert string to be used.
 	 */
 	public String getInsertString() {
 		return this.insertString;
 	}
 
 	/**
-	 * Get the array of {@link java.sql.Types} to be used for insert
+	 * Get the array of {@link java.sql.Types} to be used for insert.
 	 */
 	public int[] getInsertTypes() {
 		return this.insertTypes;
@@ -269,8 +272,9 @@ public synchronized final void compile() throws InvalidDataAccessApiUsageExcepti
 	}
 
 	/**
-	 * Method to perform the actual compilation. Subclasses can override this template method
-	 * to perform  their own compilation. Invoked after this base class's compilation is complete.
+	 * Delegate method to perform the actual compilation.
+	 * <p>Subclasses can override this template method to perform  their own compilation.
+	 * Invoked after this base class's compilation is complete.
 	 */
 	protected void compileInternal() {
 		this.tableMetaDataContext.processMetaData(
@@ -285,14 +289,14 @@ protected void compileInternal() {
 
 	/**
 	 * Hook method that subclasses may override to react to compilation.
-	 * This implementation does nothing.
+	 * <p>This implementation is empty.
 	 */
 	protected void onCompileInternal() {
 	}
 
 	/**
 	 * Is this operation "compiled"?
-	 * @return whether this operation is compiled, and ready to use.
+	 * @return whether this operation is compiled and ready to use
 	 */
 	public boolean isCompiled() {
 		return this.compiled;
@@ -311,7 +315,7 @@ protected void checkCompiled() {
 	}
 
 	/**
-	 * Method to check whether we are allowd to make any configuration changes at this time.
+	 * Method to check whether we are allowed to make any configuration changes at this time.
 	 * If the class has been compiled, then no further changes to the configuration are allowed.
 	 */
 	protected void checkIfConfigurationModificationIsAllowed() {
@@ -327,9 +331,9 @@ protected void checkIfConfigurationModificationIsAllowed() {
 	//-------------------------------------------------------------------------
 
 	/**
-	 * Method that provides execution of the insert using the passed in Map of parameters
+	 * Delegate method that executes the insert using the passed-in Map of parameters.
 	 * @param args Map with parameter names and values to be used in insert
-	 * @return number of rows affected
+	 * @return the number of rows affected
 	 */
 	protected int doExecute(Map<String, Object> args) {
 		checkCompiled();
@@ -338,9 +342,9 @@ protected int doExecute(Map<String, Object> args) {
 	}
 
 	/**
-	 * Method that provides execution of the insert using the passed in {@link SqlParameterSource}
+	 * Delegate method that executes the insert using the passed-in {@link SqlParameterSource}.
 	 * @param parameterSource parameter names and values to be used in insert
-	 * @return number of rows affected
+	 * @return the number of rows affected
 	 */
 	protected int doExecute(SqlParameterSource parameterSource) {
 		checkCompiled();
@@ -349,7 +353,7 @@ protected int doExecute(SqlParameterSource parameterSource) {
 	}
 
 	/**
-	 * Method to execute the insert.
+	 * Delegate method to execute the insert.
 	 */
 	private int executeInsertInternal(List<Object> values) {
 		if (logger.isDebugEnabled()) {
@@ -359,9 +363,8 @@ private int executeInsertInternal(List<Object> values) {
 	}
 
 	/**
-	 * Method that provides execution of the insert using the passed in Map of parameters
-	 * and returning a generated key
-	 *
+	 * Method that provides execution of the insert using the passed-in
+	 * Map of parameters and returning a generated key.
 	 * @param args Map with parameter names and values to be used in insert
 	 * @return the key generated by the insert
 	 */
@@ -372,9 +375,8 @@ protected Number doExecuteAndReturnKey(Map<String, Object> args) {
 	}
 
 	/**
-	 * Method that provides execution of the insert using the passed in {@link SqlParameterSource}
-	 * and returning a generated key
-	 *
+	 * Method that provides execution of the insert using the passed-in
+	 * {@link SqlParameterSource} and returning a generated key.
 	 * @param parameterSource parameter names and values to be used in insert
 	 * @return the key generated by the insert
 	 */
@@ -385,9 +387,8 @@ protected Number doExecuteAndReturnKey(SqlParameterSource parameterSource) {
 	}
 
 	/**
-	 * Method that provides execution of the insert using the passed in Map of parameters
-	 * and returning all generated keys
-	 *
+	 * Method that provides execution of the insert using the passed-in
+	 * Map of parameters and returning all generated keys.
 	 * @param args Map with parameter names and values to be used in insert
 	 * @return the KeyHolder containing keys generated by the insert
 	 */
@@ -398,9 +399,8 @@ protected KeyHolder doExecuteAndReturnKeyHolder(Map<String, Object> args) {
 	}
 
 	/**
-	 * Method that provides execution of the insert using the passed in {@link SqlParameterSource}
-	 * and returning all generated keys
-	 *
+	 * Method that provides execution of the insert using the passed-in
+	 * {@link SqlParameterSource} and returning all generated keys.
 	 * @param parameterSource parameter names and values to be used in insert
 	 * @return the KeyHolder containing keys generated by the insert
 	 */
@@ -411,7 +411,7 @@ protected KeyHolder doExecuteAndReturnKeyHolder(SqlParameterSource parameterSour
 	}
 
 	/**
-	 * Method to execute the insert generating single key
+	 * Delegate method to execute the insert, generating a single key.
 	 */
 	private Number executeInsertAndReturnKeyInternal(final List<Object> values) {
 		KeyHolder kh = executeInsertAndReturnKeyHolderInternal(values);
@@ -425,7 +425,7 @@ private Number executeInsertAndReturnKeyInternal(final List<Object> values) {
 	}
 
 	/**
-	 * Method to execute the insert generating any number of keys
+	 * Delegate method to execute the insert, generating any number of keys.
 	 */
 	private KeyHolder executeInsertAndReturnKeyHolderInternal(final List<Object> values) {
 		if (logger.isDebugEnabled()) {
@@ -449,12 +449,12 @@ public PreparedStatement createPreparedStatement(Connection con) throws SQLExcep
 						"The getGeneratedKeys feature is not supported by this database");
 			}
 			if (getGeneratedKeyNames().length < 1) {
-				throw new InvalidDataAccessApiUsageException("Generated Key Name(s) not specificed. " +
+				throw new InvalidDataAccessApiUsageException("Generated Key Name(s) not specified. " +
 						"Using the generated keys features requires specifying the name(s) of the generated column(s)");
 			}
 			if (getGeneratedKeyNames().length > 1) {
 				throw new InvalidDataAccessApiUsageException(
-						"Current database only supports retreiving the key for a single column. There are " +
+						"Current database only supports retrieving the key for a single column. There are " +
 						getGeneratedKeyNames().length  + " columns specified: " + Arrays.asList(getGeneratedKeyNames()));
 			}
 			// This is a hack to be able to get the generated key from a database that doesn't support
@@ -510,16 +510,14 @@ public Object doInConnection(Connection con) throws SQLException, DataAccessExce
 	}
 
 	/**
-	 * Create the PreparedStatement to be used for insert that have generated keys
-	 *
-	 * @param con the connection used
-	 * @return PreparedStatement to use
-	 * @throws SQLException
+	 * Create a PreparedStatement to be used for an insert operation with generated keys.
+	 * @param con the Connection to use
+	 * @return the PreparedStatement
 	 */
 	private PreparedStatement prepareStatementForGeneratedKeys(Connection con) throws SQLException {
 		if (getGeneratedKeyNames().length < 1) {
-			throw new InvalidDataAccessApiUsageException("Generated Key Name(s) not specificed. " +
-					"Using the generated keys features requires specifying the name(s) of the generated column(s)");
+			throw new InvalidDataAccessApiUsageException("Generated Key Name(s) not specified. " +
+					"Using the generated keys features requires specifying the name(s) of the generated column(s).");
 		}
 		PreparedStatement ps;
 		if (this.tableMetaDataContext.isGeneratedKeysColumnNameArraySupported()) {
@@ -538,14 +536,14 @@ private PreparedStatement prepareStatementForGeneratedKeys(Connection con) throw
 	}
 
 	/**
-	 * Method that provides execution of a batch insert using the passed in Maps of parameters.
+	 * Delegate method that executes a batch insert using the passed-in Maps of parameters.
 	 * @param batch array of Maps with parameter names and values to be used in batch insert
 	 * @return array of number of rows affected
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({"unchecked", "rawtypes"})
 	protected int[] doExecuteBatch(Map<String, Object>[] batch) {
 		checkCompiled();
-		List<Object>[] batchValues = new ArrayList[batch.length];
+		List[] batchValues = new ArrayList[batch.length];
 		int i = 0;
 		for (Map<String, Object> args : batch) {
 			List<Object> values = matchInParameterValuesWithInsertColumns(args);
@@ -555,14 +553,14 @@ protected int[] doExecuteBatch(Map<String, Object>[] batch) {
 	}
 
 	/**
-	 * Method that provides execution of a batch insert using the passed in array of {@link SqlParameterSource}
+	 * Delegate method that executes a batch insert using the passed-in {@link SqlParameterSource}s.
 	 * @param batch array of SqlParameterSource with parameter names and values to be used in insert
 	 * @return array of number of rows affected
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({"unchecked", "rawtypes"})
 	protected int[] doExecuteBatch(SqlParameterSource[] batch) {
 		checkCompiled();
-		List<Object>[] batchValues = new ArrayList[batch.length];
+		List[] batchValues = new ArrayList[batch.length];
 		int i = 0;
 		for (SqlParameterSource parameterSource : batch) {
 			List<Object> values = matchInParameterValuesWithInsertColumns(parameterSource);
@@ -572,7 +570,7 @@ protected int[] doExecuteBatch(SqlParameterSource[] batch) {
 	}
 
 	/**
-	 * Method to execute the batch insert.
+	 * Delegate method to execute the batch insert.
 	 */
 	private int[] executeBatchInternal(final List<Object>[] batchValues) {
 		if (logger.isDebugEnabled()) {
@@ -611,9 +609,9 @@ private void setParameterValues(PreparedStatement preparedStatement, List<Object
 	}
 
 	/**
-	 * Match the provided in parameter values with regitered parameters and parameters defined
-	 * via metadata processing.
-	 * @param parameterSource the parameter vakues provided as a {@link SqlParameterSource}
+	 * Match the provided in parameter values with registered parameters and parameters
+	 * defined via metadata processing.
+	 * @param parameterSource the parameter values provided as a {@link SqlParameterSource}
 	 * @return Map with parameter names and values
 	 */
 	protected List<Object> matchInParameterValuesWithInsertColumns(SqlParameterSource parameterSource) {
@@ -621,8 +619,8 @@ protected List<Object> matchInParameterValuesWithInsertColumns(SqlParameterSourc
 	}
 
 	/**
-	 * Match the provided in parameter values with regitered parameters and parameters defined
-	 * via metadata processing.
+	 * Match the provided in parameter values with registered parameters and parameters
+	 * defined via metadata processing.
 	 * @param args the parameter values provided in a Map
 	 * @return Map with parameter names and values
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java
index 6ace2d863e..64368f4a3d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.jdbc.core.simple;
 
 import java.util.Arrays;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import javax.sql.DataSource;
 
@@ -36,13 +36,13 @@
  * when the stored procedure was created.
  *
  * <p>The meta data processing is based on the DatabaseMetaData provided by
- * the JDBC driver. Since we rely on the JDBC driver this "auto-detection"
+ * the JDBC driver. Since we rely on the JDBC driver, this "auto-detection"
  * can only be used for databases that are known to provide accurate meta data.
  * These currently include Derby, MySQL, Microsoft SQL Server, Oracle, DB2,
  * Sybase and PostgreSQL. For any other databases you are required to declare all
  * parameters explicitly. You can of course declare all parameters explicitly even
  * if the database provides the necessary meta data. In that case your declared
- * parameters will take precedence. You can also turn off any mete data processing
+ * parameters will take precedence. You can also turn off any meta data processing
  * if you want to use parameter names that do not match what is declared during
  * the stored procedure compilation.
  *
@@ -50,7 +50,7 @@
  * {@link org.springframework.jdbc.core.JdbcTemplate}.
  *
  * <p>Many of the configuration methods return the current instance of the SimpleJdbcCall
- * to provide the ability to string multiple ones together in a "fluid" interface style.
+ * to provide the ability to chain multiple ones together in a "fluent" interface style.
  *
  * @author Thomas Risberg
  * @since 2.5
@@ -116,7 +116,7 @@ public SimpleJdbcCall declareParameters(SqlParameter... sqlParameters) {
 	}
 
 	public SimpleJdbcCall useInParameterNames(String... inParameterNames) {
-		setInParameterNames(new HashSet<String>(Arrays.asList(inParameterNames)));
+		setInParameterNames(new LinkedHashSet<String>(Arrays.asList(inParameterNames)));
 		return this;
 	}
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java
index cac760a9cb..0cd4307dc1 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@
 
 /**
  * Interface specifying the API for a Simple JDBC Call implemented by {@link SimpleJdbcCall}.
- * This interface is not often used directly, but provides the
- * option to enhance testability, as it can easily be mocked or stubbed.
+ * This interface is not often used directly, but provides the option to enhance testability,
+ * as it can easily be mocked or stubbed.
  *
  * @author Thomas Risberg
  * @since 2.5
@@ -55,8 +55,8 @@ public interface SimpleJdbcCallOperations {
 
 	/**
 	 * Optionally, specify the name of the catalog that contins the stored procedure.
-	 * To provide consistency with the Oracle DatabaseMetaData, this is used to specify the package name if
-	 * the procedure is declared as part of a package.
+	 * <p>To provide consistency with the Oracle DatabaseMetaData, this is used to specify the
+	 * package name if the procedure is declared as part of a package.
 	 * @param catalogName the catalog or package name
 	 * @return the instance of this SimpleJdbcCall
 	 */
@@ -69,12 +69,12 @@ public interface SimpleJdbcCallOperations {
 	SimpleJdbcCallOperations withReturnValue();
 
 	/**
-	 * Specify one or more parameters if desired. These parameters will be supplemented with any
-	 * parameter information retrieved from the database meta data.
-	 * Note that only parameters declared as {@code SqlParameter} and {@code SqlInOutParameter}
-	 * will be used to provide input values.  This is different from the {@code StoredProcedure} class
-	 * which for backwards compatibility reasons allows input values to be provided for parameters declared
-	 * as {@code SqlOutParameter}.
+	 * Specify one or more parameters if desired. These parameters will be supplemented with
+	 * any parameter information retrieved from the database meta data.
+	 * <p>Note that only parameters declared as {@code SqlParameter} and {@code SqlInOutParameter}
+	 * will be used to provide input values. This is different from the {@code StoredProcedure}
+	 * class which - for backwards compatibility reasons - allows input values to be provided
+	 * for parameters declared as {@code SqlOutParameter}.
 	 * @param sqlParameters the parameters to use
 	 * @return the instance of this SimpleJdbcCall
 	 */
@@ -84,11 +84,11 @@ public interface SimpleJdbcCallOperations {
 	SimpleJdbcCallOperations useInParameterNames(String... inParameterNames);
 
 	/**
-	 * Used to specify when a ResultSet is returned by the stored procedure and you want it mapped
-	 * by a RowMapper. The results will be returned using the parameter name specified. Multiple
-	 * ResultSets must be declared in the correct order. If the database you are using uses ref cursors
-	 * then the name specified must match the name of the parameter declared for the procedure in the
-	 * database.
+	 * Used to specify when a ResultSet is returned by the stored procedure and you want it
+	 * mapped by a {@link RowMapper}. The results will be returned using the parameter name
+	 * specified. Multiple ResultSets must be declared in the correct order.
+	 * <p>If the database you are using uses ref cursors then the name specified must match
+	 * the name of the parameter declared for the procedure in the database.
 	 * @param parameterName the name of the returned results and/or the name of the ref cursor parameter
 	 * @param rowMapper the RowMapper implementation that will map the data returned for each row
 	 * */
@@ -113,7 +113,8 @@ public interface SimpleJdbcCallOperations {
 
 
 	/**
-	 * Execute the stored function and return the results obtained as an Object of the specified return type.
+	 * Execute the stored function and return the results obtained as an Object of the
+	 * specified return type.
 	 * @param returnType the type of the value to return
 	 * @param args optional array containing the in parameter values to be used in the call.
 	 * Parameter values must be provided in the same order as the parameters are defined
@@ -122,66 +123,73 @@ public interface SimpleJdbcCallOperations {
 	<T> T executeFunction(Class<T> returnType, Object... args);
 
 	/**
-	 * Execute the stored function and return the results obtained as an Object of the specified return type.
+	 * Execute the stored function and return the results obtained as an Object of the
+	 * specified return type.
 	 * @param returnType the type of the value to return
-	 * @param args Map containing the parameter values to be used in the call.
+	 * @param args Map containing the parameter values to be used in the call
 	 */
 	<T> T executeFunction(Class<T> returnType, Map<String, ?> args);
 
 	/**
-	 * Execute the stored function and return the results obtained as an Object of the specified return type.
+	 * Execute the stored function and return the results obtained as an Object of the
+	 * specified return type.
 	 * @param returnType the type of the value to return
-	 * @param args MapSqlParameterSource containing the parameter values to be used in the call.
+	 * @param args MapSqlParameterSource containing the parameter values to be used in the call
 	 */
 	<T> T executeFunction(Class<T> returnType, SqlParameterSource args);
 
 	/**
-	 * Execute the stored procedure and return the single out parameter as an Object of the specified return type.
-	 * In the case where there are multiple out parameters, the first one is returned and additional out parameters
-	 * are ignored.
+	 * Execute the stored procedure and return the single out parameter as an Object
+	 * of the specified return type. In the case where there are multiple out parameters,
+	 * the first one is returned and additional out parameters are ignored.
 	 * @param returnType the type of the value to return
-	 * @param args optional array containing the in parameter values to be used in the call. Parameter values must
-	 * be provided in the same order as the parameters are defined for the stored procedure.
+	 * @param args optional array containing the in parameter values to be used in the call.
+	 * Parameter values must be provided in the same order as the parameters are defined for
+	 * the stored procedure.
 	 */
 	<T> T executeObject(Class<T> returnType, Object... args);
 
 	/**
-	 * Execute the stored procedure and return the single out parameter as an Object of the specified return type.
-	 * In the case where there are multiple out parameters, the first one is returned and additional out parameters
-	 * are ignored.
+	 * Execute the stored procedure and return the single out parameter as an Object
+	 * of the specified return type. In the case where there are multiple out parameters,
+	 * the first one is returned and additional out parameters are ignored.
 	 * @param returnType the type of the value to return
-	 * @param args Map containing the parameter values to be used in the call.
+	 * @param args Map containing the parameter values to be used in the call
 	 */
 	<T> T executeObject(Class<T> returnType, Map<String, ?> args);
 
 	/**
-	 * Execute the stored procedure and return the single out parameter as an Object of the specified return type.
-	 * In the case where there are multiple out parameters, the first one is returned and additional out parameters
-	 * are ignored.
+	 * Execute the stored procedure and return the single out parameter as an Object
+	 * of the specified return type. In the case where there are multiple out parameters,
+	 * the first one is returned and additional out parameters are ignored.
 	 * @param returnType the type of the value to return
-	 * @param args MapSqlParameterSource containing the parameter values to be used in the call.
+	 * @param args MapSqlParameterSource containing the parameter values to be used in the call
 	 */
 	<T> T executeObject(Class<T> returnType, SqlParameterSource args);
 
 	/**
-	 * Execute the stored procedure and return a map of output params, keyed by name as in parameter declarations.
-	 * @param args optional array containing the in parameter values to be used in the call. Parameter values must
-	 * be provided in the same order as the parameters are defined for the stored procedure.
-	 * @return map of output params.
+	 * Execute the stored procedure and return a map of output params, keyed by name
+	 * as in parameter declarations.
+	 * @param args optional array containing the in parameter values to be used in the call.
+	 * Parameter values must be provided in the same order as the parameters are defined for
+	 * the stored procedure.
+	 * @return Map of output params
 	 */
 	Map<String, Object> execute(Object... args);
 
 	/**
-	 * Execute the stored procedure and return a map of output params, keyed by name as in parameter declarations..
-	 * @param args Map containing the parameter values to be used in the call.
-	 * @return map of output params.
+	 * Execute the stored procedure and return a map of output params, keyed by name
+	 * as in parameter declarations.
+	 * @param args Map containing the parameter values to be used in the call
+	 * @return Map of output params
 	 */
 	Map<String, Object> execute(Map<String, ?> args);
 
 	/**
-	 * Execute the stored procedure and return a map of output params, keyed by name as in parameter declarations..
-	 * @param args SqlParameterSource containing the parameter values to be used in the call.
-	 * @return map of output params.
+	 * Execute the stored procedure and return a map of output params, keyed by name
+	 * as in parameter declarations.
+	 * @param args SqlParameterSource containing the parameter values to be used in the call
+	 * @return Map of output params
 	 */
 	Map<String, Object> execute(SqlParameterSource args);
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java
index 98b89e9f1f..ba6d109ab9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.util.Arrays;
 import java.util.Map;
-
 import javax.sql.DataSource;
 
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -41,7 +40,7 @@
  * {@link org.springframework.jdbc.core.JdbcTemplate}.
  *
  * <p>Many of the configuration methods return the current instance of the SimpleJdbcInsert
- * to provide the ability to string multiple ones together in a "fluid" interface style.
+ * to provide the ability to chain multiple ones together in a "fluent" interface style.
  *
  * @author Thomas Risberg
  * @since 2.5
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertOperations.java
index 30950b72d2..c3bb41cbed 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertOperations.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@
 
 /**
  * Interface specifying the API for a Simple JDBC Insert implemented by {@link SimpleJdbcInsert}.
- * This interface is not often used directly, but provides the
- * option to enhance testability, as it can easily be mocked or stubbed.
+ * This interface is not often used directly, but provides the option to enhance testability,
+ * as it can easily be mocked or stubbed.
  *
  * @author Thomas Risberg
  * @since 2.5
@@ -40,7 +40,7 @@ public interface SimpleJdbcInsertOperations {
 	SimpleJdbcInsertOperations withTableName(String tableName);
 
 	/**
-	 * Specify the shema name, if any, to be used for the insert.
+	 * Specify the schema name, if any, to be used for the insert.
 	 * @param schemaName the name of the schema
 	 * @return the instance of this SimpleJdbcInsert
 	 */
@@ -61,7 +61,7 @@ public interface SimpleJdbcInsertOperations {
 	SimpleJdbcInsertOperations usingColumns(String... columnNames);
 
 	/**
-	 * Specify the name sof any columns that have auto generated keys.
+	 * Specify the names of any columns that have auto generated keys.
 	 * @param columnNames one or more column names
 	 * @return the instance of this SimpleJdbcInsert
 	 */
@@ -108,36 +108,40 @@ public interface SimpleJdbcInsertOperations {
 	int execute(SqlParameterSource parameterSource);
 
 	/**
-	 * Execute the insert using the values passed in and return the generated key.  This requires that
-	 * the name of the columns with auto generated keys have been specified. This method will always
-	 * return a key or throw an exception if a key was not returned.
+	 * Execute the insert using the values passed in and return the generated key.
+	 * <p>This requires that the name of the columns with auto generated keys have been specified.
+	 * This method will always return a KeyHolder but the caller must verify that it actually
+	 * contains the generated keys.
 	 * @param args Map containing column names and corresponding value
 	 * @return the generated key value
 	 */
 	Number executeAndReturnKey(Map<String, Object> args);
 
 	/**
-	 * Execute the insert using the values passed in and return the generated key.  This requires that
-	 * the name of the columns with auto generated keys have been specified. This method will always
-	 * return a key or throw an exception if a key was not returned.
+	 * Execute the insert using the values passed in and return the generated key.
+	 * <p>This requires that the name of the columns with auto generated keys have been specified.
+	 * This method will always return a KeyHolder but the caller must verify that it actually
+	 * contains the generated keys.
 	 * @param parameterSource SqlParameterSource containing values to use for insert
 	 * @return the generated key value.
 	 */
 	Number executeAndReturnKey(SqlParameterSource parameterSource);
 
 	/**
-	 * Execute the insert using the values passed in and return the generated keys.  This requires that
-	 * the name of the columns with auto generated keys have been specified. This method will always return
-	 * a KeyHolder but the caller must verify that it actually contains the generated keys.
+	 * Execute the insert using the values passed in and return the generated keys.
+	 * <p>This requires that the name of the columns with auto generated keys have been specified.
+	 * This method will always return a KeyHolder but the caller must verify that it actually
+	 * contains the generated keys.
 	 * @param args Map containing column names and corresponding value
 	 * @return the KeyHolder containing all generated keys
 	 */
 	KeyHolder executeAndReturnKeyHolder(Map<String, Object> args);
 
 	/**
-	 * Execute the insert using the values passed in and return the generated keys.  This requires that
-	 * the name of the columns with auto generated keys have been specified. This method will always return
-	 * a KeyHolder but the caller must verify that it actually contains the generated keys.
+	 * Execute the insert using the values passed in and return the generated keys.
+	 * <p>This requires that the name of the columns with auto generated keys have been specified.
+	 * This method will always return a KeyHolder but the caller must verify that it actually
+	 * contains the generated keys.
 	 * @param parameterSource SqlParameterSource containing values to use for insert
 	 * @return the KeyHolder containing all generated keys
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHandle.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHandle.java
index 4223dfed1a..7b361385ac 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHandle.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,13 @@
 
 /**
  * Simple interface to be implemented by handles for a JDBC Connection.
- * Used by JdoDialect, for example.
+ * Used by JpaDialect and JdoDialect, for example.
  *
  * @author Juergen Hoeller
  * @since 1.1
  * @see SimpleConnectionHandle
  * @see ConnectionHolder
+ * @see org.springframework.orm.jpa.JpaDialect#getJdbcConnection
  * @see org.springframework.orm.jdo.JdoDialect#getJdbcConnection
  */
 public interface ConnectionHandle {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java
index 6ed77ef0c1..9544749071 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -161,9 +161,9 @@ public Connection getConnection() {
 	 */
 	public boolean supportsSavepoints() throws SQLException {
 		if (this.savepointsSupported == null) {
-			this.savepointsSupported = new Boolean(getConnection().getMetaData().supportsSavepoints());
+			this.savepointsSupported = getConnection().getMetaData().supportsSavepoints();
 		}
-		return this.savepointsSupported.booleanValue();
+		return this.savepointsSupported;
 	}
 
 	/**
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java
index b0e9811e3a..3acd77498a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,10 +33,9 @@
  * {@link org.springframework.transaction.PlatformTransactionManager}
  * implementation for a single JDBC {@link javax.sql.DataSource}. This class is
  * capable of working in any environment with any JDBC driver, as long as the setup
- * uses a JDBC 2.0 Standard Extensions / JDBC 3.0 {@code javax.sql.DataSource}
- * as its Connection factory mechanism. Binds a JDBC Connection from the specified
- * DataSource to the current thread, potentially allowing for one thread-bound
- * Connection per DataSource.
+ * uses a {@code javax.sql.DataSource} as its {@code Connection} factory mechanism.
+ * Binds a JDBC Connection from the specified DataSource to the current thread,
+ * potentially allowing for one thread-bound Connection per DataSource.
  *
  * <p><b>Note: The DataSource that this transaction manager operates on needs
  * to return independent Connections.</b> The Connections may come from a pool
@@ -75,8 +74,8 @@
  * an actual JDBC Connection from the target DataSource until a Statement gets executed,
  * lazily applying the specified transaction settings to the target Connection.
  *
- * <p>On JDBC 3.0, this transaction manager supports nested transactions via the
- * JDBC 3.0 {@link java.sql.Savepoint} mechanism. The
+ * <p>This transaction manager supports nested transactions via the JDBC 3.0
+ * {@link java.sql.Savepoint} mechanism. The
  * {@link #setNestedTransactionAllowed "nestedTransactionAllowed"} flag defaults
  * to "true", since nested transactions will work without restrictions on JDBC
  * drivers that support savepoints (such as the Oracle JDBC driver).
@@ -178,7 +177,7 @@ protected Object doGetTransaction() {
 		DataSourceTransactionObject txObject = new DataSourceTransactionObject();
 		txObject.setSavepointAllowed(isNestedTransactionAllowed());
 		ConnectionHolder conHolder =
-			(ConnectionHolder) TransactionSynchronizationManager.getResource(this.dataSource);
+				(ConnectionHolder) TransactionSynchronizationManager.getResource(this.dataSource);
 		txObject.setConnectionHolder(conHolder, false);
 		return txObject;
 	}
@@ -236,8 +235,11 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 			}
 		}
 
-		catch (Exception ex) {
-			DataSourceUtils.releaseConnection(con, this.dataSource);
+		catch (Throwable ex) {
+			if (txObject.isNewConnectionHolder()) {
+				DataSourceUtils.releaseConnection(con, this.dataSource);
+				txObject.setConnectionHolder(null, false);
+			}
 			throw new CannotCreateTransactionException("Could not open JDBC Connection for transaction", ex);
 		}
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java
index 634eb57cde..91e01730ce 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.sql.Statement;
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
@@ -35,15 +34,24 @@ abstract class AbstractEmbeddedDatabaseConfigurer implements EmbeddedDatabaseCon
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
+
 	public void shutdown(DataSource dataSource, String databaseName) {
+		Connection con = null;
 		try {
-			Connection connection = dataSource.getConnection();
-			Statement stmt = connection.createStatement();
-			stmt.execute("SHUTDOWN");
+			con = dataSource.getConnection();
+			con.createStatement().execute("SHUTDOWN");
 		}
 		catch (SQLException ex) {
-			if (logger.isWarnEnabled()) {
-				logger.warn("Could not shutdown embedded database", ex);
+			logger.warn("Could not shut down embedded database", ex);
+		}
+		finally {
+			if (con != null) {
+				try {
+					con.close();
+				}
+				catch (Throwable ex) {
+					logger.debug("Could not close JDBC Connection on shutdown", ex);
+				}
 			}
 		}
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
index 05fad27124..bb745d1103 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,11 +43,6 @@ final class DerbyEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigure
 	// Error code that indicates successful shutdown
 	private static final String SHUTDOWN_CODE = "08006";
 
-	private static final boolean IS_AT_LEAST_DOT_SIX = new EmbeddedDriver().getMinorVersion() >= 6;
-
-	private static final String SHUTDOWN_COMMAND =
-			String.format("%s=true", IS_AT_LEAST_DOT_SIX ? "drop" : "shutdown");
-
 	private static DerbyEmbeddedDatabaseConfigurer INSTANCE;
 
 
@@ -77,16 +72,19 @@ public void configureConnectionProperties(ConnectionProperties properties, Strin
 	}
 
 	public void shutdown(DataSource dataSource, String databaseName) {
+		EmbeddedDriver embeddedDriver = new EmbeddedDriver();
+		boolean isAtLeastDotSix = (embeddedDriver.getMinorVersion() >= 6);
+		String shutdownCommand = String.format("%s=true", isAtLeastDotSix ? "drop" : "shutdown");
 		try {
-			new EmbeddedDriver().connect(
-					String.format(URL_TEMPLATE, databaseName, SHUTDOWN_COMMAND), new Properties());
+			embeddedDriver.connect(
+					String.format(URL_TEMPLATE, databaseName, shutdownCommand), new Properties());
 		}
 		catch (SQLException ex) {
 			if (!SHUTDOWN_CODE.equals(ex.getSQLState())) {
 				logger.warn("Could not shutdown in-memory Derby database", ex);
 				return;
 			}
-			if (!IS_AT_LEAST_DOT_SIX) {
+			if (!isAtLeastDotSix) {
 				// Explicitly purge the in-memory database, to prevent it
 				// from hanging around after being shut down.
 				try {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
index 82b0a31c3b..7d78a51b1b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
  * A builder that provides a convenient API for constructing an embedded database.
  *
  * <p>Usage example:
- * <pre>
+ * <pre class="code">
  * EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
  * EmbeddedDatabase db = builder.setType(H2).addScript("schema.sql").addScript("data.sql").build();
  * db.shutdown();
@@ -44,6 +44,7 @@ public class EmbeddedDatabaseBuilder {
 
 	private final ResourceLoader resourceLoader;
 
+
 	/**
 	 * Create a new embedded database builder.
 	 */
@@ -62,6 +63,7 @@ public EmbeddedDatabaseBuilder(ResourceLoader resourceLoader) {
 		this.resourceLoader = resourceLoader;
 	}
 
+
 	/**
 	 * Set the name of the embedded database.
 	 * <p>Defaults to "testdb" if not called.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
index 20a5bfdf61..e9b9559d72 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,26 +30,42 @@
 import org.springframework.util.Assert;
 
 /**
- * Creates a {@link EmbeddedDatabase} instance. Callers are guaranteed that the returned database has been fully
- * initialized and populated.
+ * Factory for creating {@link EmbeddedDatabase} instances.
  *
- * <p>Can be configured:<br>
- * Call {@link #setDatabaseName(String)} to change the name of the database.<br>
- * Call {@link #setDatabaseType(EmbeddedDatabaseType)} to set the database type if you wish to use one of the supported types.<br>
- * Call {@link #setDatabaseConfigurer(EmbeddedDatabaseConfigurer)} to configure support for your own embedded database type.<br>
- * Call {@link #setDatabasePopulator(DatabasePopulator)} to change the algorithm used to populate the database.<br>
- * Call {@link #setDataSourceFactory(DataSourceFactory)} to change the type of DataSource used to connect to the database.<br>
- * Call {@link #getDatabase()} to get the {@link EmbeddedDatabase} instance.<br>
+ * <p>Callers are guaranteed that a returned database has been fully initialized
+ * and populated.
+ *
+ * <p>Can be configured:
+ * <ul>
+ * <li>Call {@link #setDatabaseName(String)} to change the name of the database.
+ * <li>Call {@link #setDatabaseType(EmbeddedDatabaseType)} to set the database
+ * type if you wish to use one of the supported types.
+ * <li>Call {@link #setDatabaseConfigurer(EmbeddedDatabaseConfigurer)} to
+ * configure support for your own embedded database type.
+ * <li>Call {@link #setDatabasePopulator(DatabasePopulator)} to change the
+ * algorithm used to populate the database.
+ * <li>Call {@link #setDataSourceFactory(DataSourceFactory)} to change the type
+ * of {@link DataSource} used to connect to the database.
+ * </ul>
+ *
+ * <p>Call {@link #getDatabase()} to get the {@link EmbeddedDatabase} instance.
  *
  * @author Keith Donald
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 3.0
  */
 public class EmbeddedDatabaseFactory {
 
-	private static Log logger = LogFactory.getLog(EmbeddedDatabaseFactory.class);
+	/**
+	 * Default name for an embedded database: &quot;testdb&quot;.
+	 */
+	public static final String DEFAULT_DATABASE_NAME = "testdb";
+
+
+	private static final Log logger = LogFactory.getLog(EmbeddedDatabaseFactory.class);
 
-	private String databaseName = "testdb";
+	private String databaseName = DEFAULT_DATABASE_NAME;
 
 	private DataSourceFactory dataSourceFactory = new SimpleDriverDataSourceFactory();
 
@@ -61,16 +77,18 @@ public class EmbeddedDatabaseFactory {
 
 
 	/**
-	 * Set the name of the database. Defaults to "testdb".
-	 * @param databaseName name of the test database
+	 * Set the name of the database.
+	 * <p>Defaults to {@value #DEFAULT_DATABASE_NAME}.
+	 * @param databaseName name of the embedded database
 	 */
 	public void setDatabaseName(String databaseName) {
-		Assert.notNull(databaseName, "Database name is required");
+		Assert.hasText(databaseName, "Database name is required");
 		this.databaseName = databaseName;
 	}
 
 	/**
-	 * Set the factory to use to create the DataSource instance that connects to the embedded database.
+	 * Set the factory to use to create the {@link DataSource} instance that
+	 * connects to the embedded database.
 	 * <p>Defaults to {@link SimpleDriverDataSourceFactory}.
 	 */
 	public void setDataSourceFactory(DataSourceFactory dataSourceFactory) {
@@ -79,9 +97,10 @@ public void setDataSourceFactory(DataSourceFactory dataSourceFactory) {
 	}
 
 	/**
-	 * Set the type of embedded database to use. Call this when you wish to configure
-	 * one of the pre-supported types. Defaults to HSQL.
-	 * @param type the test database type
+	 * Set the type of embedded database to use.
+	 * <p>Call this when you wish to configure one of the pre-supported types.
+	 * <p>Defaults to HSQL.
+	 * @param type the database type
 	 */
 	public void setDatabaseType(EmbeddedDatabaseType type) {
 		this.databaseConfigurer = EmbeddedDatabaseConfigurerFactory.getConfigurer(type);
@@ -96,15 +115,17 @@ public void setDatabaseConfigurer(EmbeddedDatabaseConfigurer configurer) {
 	}
 
 	/**
-	 * Set the strategy that will be used to populate the embedded database. Defaults to null.
-	 * @see org.springframework.jdbc.datasource.init.DataSourceInitializer#setDatabasePopulator
+	 * Set the strategy that will be used to initialize or populate the embedded
+	 * database.
+	 * <p>Defaults to {@code null}.
 	 */
 	public void setDatabasePopulator(DatabasePopulator populator) {
 		this.databasePopulator = populator;
 	}
 
 	/**
-	 * Factory method that returns the embedded database instance.
+	 * Factory method that returns the {@link EmbeddedDatabase embedded database}
+	 * instance, which is also a {@link DataSource}.
 	 */
 	public EmbeddedDatabase getDatabase() {
 		if (this.dataSource == null) {
@@ -115,8 +136,10 @@ public EmbeddedDatabase getDatabase() {
 
 
 	/**
-	 * Hook to initialize the embedded database. Subclasses may call to force initialization. After calling this method,
-	 * {@link #getDataSource()} returns the DataSource providing connectivity to the db.
+	 * Hook to initialize the embedded database. Subclasses may call this method
+	 * to force initialization.
+	 * <p>After calling this method, {@link #getDataSource()} returns the
+	 * {@link DataSource} providing connectivity to the database.
 	 */
 	protected void initDatabase() {
 		// Create the embedded database source first
@@ -144,8 +167,10 @@ protected void initDatabase() {
 	}
 
 	/**
-	 * Hook to shutdown the embedded database. Subclasses may call to force shutdown.
-	 * After calling, {@link #getDataSource()} returns null. Does nothing if no embedded database has been initialized.
+	 * Hook to shutdown the embedded database. Subclasses may call this method
+	 * to force shutdown.
+	 * <p>After calling, {@link #getDataSource()} returns {@code null}.
+	 * <p>Does nothing if no embedded database has been initialized.
 	 */
 	protected void shutdownDatabase() {
 		if (this.dataSource != null) {
@@ -155,9 +180,11 @@ protected void shutdownDatabase() {
 	}
 
 	/**
-	 * Hook that gets the DataSource that provides the connectivity to the embedded database.
-	 * <p>Returns {@code null} if the DataSource has not been initialized or the database
-	 * has been shut down. Subclasses may call to access the DataSource instance directly.
+	 * Hook that gets the {@link DataSource} that provides the connectivity to the
+	 * embedded database.
+	 * <p>Returns {@code null} if the {@code DataSource} has not been initialized
+	 * or if the database has been shut down. Subclasses may call this method to
+	 * access the {@code DataSource} instance directly.
 	 */
 	protected final DataSource getDataSource() {
 		return this.dataSource;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java
index e2f6eafe36..1b44edf223 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,7 +81,7 @@ public void addScript(Resource script) {
 	 * Set the scripts to execute to populate the database.
 	 * @param scripts the scripts to execute
 	 */
-	public void setScripts(Resource[] scripts) {
+	public void setScripts(Resource... scripts) {
 		this.scripts = Arrays.asList(scripts);
 	}
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java
index 1cf222e002..e6804c570c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,39 +18,44 @@
 
 import java.util.Map;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.util.Assert;
-import org.springframework.dao.InvalidDataAccessResourceUsageException;
 
-public class GenericSqlQuery extends SqlQuery {
+/**
+ * A concrete variant of {@link SqlQuery} which can be configured
+ * with a {@link RowMapper}.
+ *
+ * @author Thomas Risberg
+ * @author Juergen Hoeller
+ * @since 3.0
+ * @see #setRowMapperClass
+ */
+public class GenericSqlQuery<T> extends SqlQuery<T> {
 
-	Class rowMapperClass;
+	@SuppressWarnings("rawtypes")
+	private Class<? extends RowMapper> rowMapperClass;
 
-	RowMapper rowMapper;
 
-	public void setRowMapperClass(Class rowMapperClass)
-			throws IllegalAccessException, InstantiationException {
+	/**
+	 * Set a {@link RowMapper} class for this query, creating a fresh
+	 * {@link RowMapper} instance per execution.
+	 */
+	@SuppressWarnings("rawtypes")
+	public void setRowMapperClass(Class<? extends RowMapper> rowMapperClass) {
 		this.rowMapperClass = rowMapperClass;
-		if (!RowMapper.class.isAssignableFrom(rowMapperClass))
-			throw new IllegalStateException("The specified class '" +
-					rowMapperClass.getName() + " is not a sub class of " +
-					"'org.springframework.jdbc.core.RowMapper'");
 	}
 
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
-		Assert.notNull(rowMapperClass, "The 'rowMapperClass' property is required");
+		Assert.notNull(this.rowMapperClass, "'rowMapperClass' is required");
 	}
 
-	protected RowMapper newRowMapper(Object[] parameters, Map context) {
-		try {
-			return (RowMapper) rowMapperClass.newInstance();
-		}
-		catch (InstantiationException e) {
-			throw new InvalidDataAccessResourceUsageException("Unable to instantiate RowMapper", e);
-		}
-		catch (IllegalAccessException e) {
-			throw new InvalidDataAccessResourceUsageException("Unable to instantiate RowMapper", e);
-		}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	protected RowMapper<T> newRowMapper(Object[] parameters, Map context) {
+		return BeanUtils.instantiateClass(this.rowMapperClass);
 	}
+
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java
index f2d0bb58a0..f5646730dd 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,7 +81,7 @@ public abstract class RdbmsOperation implements InitializingBean {
 	 * least checking that a DataSource and sql have been provided,
 	 * but subclasses may also implement their own custom validation.
 	 */
-	private boolean compiled;
+	private volatile boolean compiled;
 
 
 	/**
@@ -210,7 +210,7 @@ public boolean isReturnGeneratedKeys() {
 	 * Set the column names of the auto-generated keys.
 	 * @see java.sql.Connection#prepareStatement(String, String[])
 	 */
-	public void setGeneratedKeysColumnNames(String[] names) {
+	public void setGeneratedKeysColumnNames(String... names) {
 		if (isCompiled()) {
 			throw new InvalidDataAccessApiUsageException(
 					"The column names for the generated keys must be set before the operation is compiled");
@@ -349,7 +349,7 @@ public final void compile() throws InvalidDataAccessApiUsageException {
 	 * Is this operation "compiled"? Compilation, as in JDO,
 	 * means that the operation is fully configured, and ready to use.
 	 * The exact meaning of compilation will vary between subclasses.
-	 * @return whether this operation is compiled, and ready to use.
+	 * @return whether this operation is compiled and ready to use
 	 */
 	public boolean isCompiled() {
 		return this.compiled;
@@ -400,7 +400,7 @@ protected void validateParameters(Object[] parameters) throws InvalidDataAccessA
 	 */
 	protected void validateNamedParameters(Map<String, ?> parameters) throws InvalidDataAccessApiUsageException {
 		checkCompiled();
-		Map paramsToUse = (parameters != null ? parameters : Collections.emptyMap());
+		Map<String, ?> paramsToUse = (parameters != null ? parameters : Collections.<String, Object> emptyMap());
 		int declaredInParameters = 0;
 		for (SqlParameter param : this.declaredParameters) {
 			if (param.isInputValueProvided()) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java
index 2fc21917c5..c359b49f2c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package org.springframework.jdbc.object;
 
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 import javax.sql.DataSource;
 
 import org.springframework.dao.DataAccessException;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java
index 26b528e9f9..7febfc2989 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,22 +65,22 @@ public SQLExceptionSubclassTranslator() {
 	@Override
 	protected DataAccessException doTranslate(String task, String sql, SQLException ex) {
 		if (ex instanceof SQLTransientException) {
-			if (ex instanceof SQLTransactionRollbackException) {
-				return new ConcurrencyFailureException(buildMessage(task, sql, ex), ex);
-			}
 			if (ex instanceof SQLTransientConnectionException) {
 				return new TransientDataAccessResourceException(buildMessage(task, sql, ex), ex);
 			}
-			if (ex instanceof SQLTimeoutException) {
+			else if (ex instanceof SQLTransactionRollbackException) {
+				return new ConcurrencyFailureException(buildMessage(task, sql, ex), ex);
+			}
+			else if (ex instanceof SQLTimeoutException) {
 				return new QueryTimeoutException(buildMessage(task, sql, ex), ex);
 			}
 		}
 		else if (ex instanceof SQLNonTransientException) {
-			if (ex instanceof SQLDataException) {
-				return new DataIntegrityViolationException(buildMessage(task, sql, ex), ex);
+			if (ex instanceof SQLNonTransientConnectionException) {
+				return new DataAccessResourceFailureException(buildMessage(task, sql, ex), ex);
 			}
-			else if (ex instanceof SQLFeatureNotSupportedException) {
-				return new InvalidDataAccessApiUsageException(buildMessage(task, sql, ex), ex);
+			else if (ex instanceof SQLDataException) {
+				return new DataIntegrityViolationException(buildMessage(task, sql, ex), ex);
 			}
 			else if (ex instanceof SQLIntegrityConstraintViolationException) {
 				return new DataIntegrityViolationException(buildMessage(task, sql, ex), ex);
@@ -88,12 +88,12 @@ else if (ex instanceof SQLIntegrityConstraintViolationException) {
 			else if (ex instanceof SQLInvalidAuthorizationSpecException) {
 				return new PermissionDeniedDataAccessException(buildMessage(task, sql, ex), ex);
 			}
-			else if (ex instanceof SQLNonTransientConnectionException) {
-				return new DataAccessResourceFailureException(buildMessage(task, sql, ex), ex);
-			}
 			else if (ex instanceof SQLSyntaxErrorException) {
 				return new BadSqlGrammarException(task, sql, ex);
 			}
+			else if (ex instanceof SQLFeatureNotSupportedException) {
+				return new InvalidDataAccessApiUsageException(buildMessage(task, sql, ex), ex);
+			}
 		}
 		else if (ex instanceof SQLRecoverableException) {
 			return new RecoverableDataAccessException(buildMessage(task, sql, ex), ex);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java
index 666b39ef8c..0fc68068b1 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,7 +62,6 @@ public class SQLStateSQLExceptionTranslator extends AbstractFallbackSQLException
 		BAD_SQL_GRAMMAR_CODES.add("37");	// Syntax error dynamic SQL
 		BAD_SQL_GRAMMAR_CODES.add("42");	// General SQL syntax error
 		BAD_SQL_GRAMMAR_CODES.add("65");	// Oracle: unknown identifier
-		BAD_SQL_GRAMMAR_CODES.add("S0");	// MySQL uses this - from ODBC error codes?
 
 		DATA_INTEGRITY_VIOLATION_CODES.add("01");	// Data truncation
 		DATA_INTEGRITY_VIOLATION_CODES.add("02");	// No data found
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java
index 39c5245e27..75b4e10d20 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-
 import javax.sql.DataSource;
 
 import org.springframework.dao.DataAccessException;
@@ -51,7 +50,7 @@
  * is rolled back, the unused values will never be served. The maximum hole size in
  * numbering is consequently the value of cacheSize.
  *
- * <b>HINT:</b>  Since Derby supports the JDBC 3.0 {@code getGeneratedKeys} method,
+ * <b>HINT:</b> Since Derby supports the JDBC 3.0 {@code getGeneratedKeys} method,
  * it is recommended to use IDENTITY columns directly in the tables and then utilizing
  * a {@link org.springframework.jdbc.support.KeyHolder} when calling the with the
  * {@code update(PreparedStatementCreator psc, KeyHolder generatedKeyHolder)}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.java
index ddcbae6929..a864fec5be 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.java
@@ -1,16 +1,32 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.jdbc.support.incrementer;
 
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import javax.sql.DataSource;
+
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.jdbc.support.JdbcUtils;
 
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
 /**
  * {@link DataFieldMaxValueIncrementer} that increments the maximum value of a given SQL Server table
  * with the equivalent of an auto-increment column. Note: If you use this class, your Derby key
@@ -32,8 +48,8 @@
  * is rolled back, the unused values will never be served. The maximum hole size in
  * numbering is consequently the value of cacheSize.
  *
- * <b>HINT:</b>  Since Microsoft SQL Server supports the JDBC 3.0 {@code getGeneratedKeys} method,
- * it is recommended to use IDENTITY columns directly in the tables and then using a
+ * <b>HINT:</b> Since Microsoft SQL Server supports the JDBC 3.0 {@code getGeneratedKeys}
+ * method, it is recommended to use IDENTITY columns directly in the tables and then using a
  * {@link org.springframework.jdbc.core.simple.SimpleJdbcInsert} or utilizing
  * a {@link org.springframework.jdbc.support.KeyHolder} when calling the with the
  * {@code update(PreparedStatementCreator psc, KeyHolder generatedKeyHolder)}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java
index ec863daff1..726fdb5fa4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
  * is rolled back, the unused values will never be served. The maximum hole size in
  * numbering is consequently the value of cacheSize.
  *
- * <b>HINT:</b>  Since Sybase Anywhere supports the JDBC 3.0 {@code getGeneratedKeys} method,
+ * <b>HINT:</b> Since Sybase Anywhere supports the JDBC 3.0 {@code getGeneratedKeys} method,
  * it is recommended to use IDENTITY columns directly in the tables and then using a
  * {@link org.springframework.jdbc.core.simple.SimpleJdbcInsert} or utilizing
  * a {@link org.springframework.jdbc.support.KeyHolder} when calling the with the
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java
index eeb20c0000..6c86bc9435 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
 
 package org.springframework.jdbc.support.incrementer;
 
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import javax.sql.DataSource;
+
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.jdbc.support.JdbcUtils;
 
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
 /**
  * {@link DataFieldMaxValueIncrementer} that increments
  * the maximum value of a given Sybase SQL Server table
@@ -49,7 +49,7 @@
  * is rolled back, the unused values will never be served. The maximum hole size in
  * numbering is consequently the value of cacheSize.
  *
- * <b>HINT:</b>  Since Sybase supports the JDBC 3.0 {@code getGeneratedKeys} method,
+ * <b>HINT:</b> Since Sybase supports the JDBC 3.0 {@code getGeneratedKeys} method,
  * it is recommended to use IDENTITY columns directly in the tables and then using a
  * {@link org.springframework.jdbc.core.simple.SimpleJdbcInsert} or utilizing
  * a {@link org.springframework.jdbc.support.KeyHolder} when calling the with the
@@ -133,8 +133,8 @@ protected synchronized long getNextKey() throws DataAccessException {
 	}
 
 	/**
-	 * Statement to use to increment the "sequence" value. Can be overridden by sub-classes.
-	 * @return The SQL statement to use
+	 * Statement to use to increment the "sequence" value. Can be overridden by subclasses.
+	 * @return the SQL statement to use
 	 */
 	protected String getIncrementStatement() {
 		return "insert into " + getIncrementerName() + " values()";
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java
index 69f10432e4..83fb15c1e9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,12 +31,11 @@
 import org.springframework.jdbc.InvalidResultSetAccessException;
 
 /**
- * Default implementation of Spring's {@link SqlRowSet} interface.
+ * The default implementation of Spring's {@link SqlRowSet} interface, wrapping a
+ * {@link java.sql.ResultSet}, catching any {@link SQLException}s and translating
+ * them to a corresponding Spring {@link InvalidResultSetAccessException}.
  *
- * <p>This implementation wraps a {@code javax.sql.ResultSet}, catching any SQLExceptions
- * and translating them to the appropriate Spring {@link InvalidResultSetAccessException}.
- *
- * <p>The passed-in ResultSets should already be disconnected if the SqlRowSet is supposed
+ * <p>The passed-in ResultSet should already be disconnected if the SqlRowSet is supposed
  * to be usable in a disconnected fashion. This means that you will usually pass in a
  * {@code javax.sql.rowset.CachedRowSet}, which implements the ResultSet interface.
  *
@@ -99,7 +98,12 @@ public ResultSetWrappingSqlRowSet(ResultSet resultSet) throws InvalidResultSetAc
 				int columnCount = rsmd.getColumnCount();
 				this.columnLabelMap = new HashMap<String, Integer>(columnCount);
 				for (int i = 1; i <= columnCount; i++) {
-					this.columnLabelMap.put(rsmd.getColumnLabel(i), i);
+					String key = rsmd.getColumnLabel(i);
+					// Make sure to preserve first matching column for any given name,
+					// as defined in ResultSet's type-level javadoc (lines 81 to 83).
+					if (!this.columnLabelMap.containsKey(key)) {
+						this.columnLabelMap.put(key, i);
+					}
 				}
 			}
 			else {
@@ -208,11 +212,11 @@ public byte getByte(String columnLabel) throws InvalidResultSetAccessException {
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getDate(int, java.util.Calendar)
+	 * @see java.sql.ResultSet#getDate(int)
 	 */
-	public Date getDate(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
+	public Date getDate(int columnIndex) throws InvalidResultSetAccessException {
 		try {
-			return this.resultSet.getDate(columnIndex, cal);
+			return this.resultSet.getDate(columnIndex);
 		}
 		catch (SQLException se) {
 			throw new InvalidResultSetAccessException(se);
@@ -220,30 +224,31 @@ public Date getDate(int columnIndex, Calendar cal) throws InvalidResultSetAccess
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getDate(int)
+	 * @see java.sql.ResultSet#getDate(String)
 	 */
-	public Date getDate(int columnIndex) throws InvalidResultSetAccessException {
+	public Date getDate(String columnLabel) throws InvalidResultSetAccessException {
+		return getDate(findColumn(columnLabel));
+	}
+
+	/**
+	 * @see java.sql.ResultSet#getDate(int, Calendar)
+	 */
+	public Date getDate(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
 		try {
-			return this.resultSet.getDate(columnIndex);
+			return this.resultSet.getDate(columnIndex, cal);
 		}
 		catch (SQLException se) {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
+
 	/**
-	 * @see java.sql.ResultSet#getDate(String, java.util.Calendar)
+	 * @see java.sql.ResultSet#getDate(String, Calendar)
 	 */
 	public Date getDate(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
 		return getDate(findColumn(columnLabel), cal);
 	}
 
-	/**
-	 * @see java.sql.ResultSet#getDate(String)
-	 */
-	public Date getDate(String columnLabel) throws InvalidResultSetAccessException {
-		return getDate(findColumn(columnLabel));
-	}
-
 	/**
 	 * @see java.sql.ResultSet#getDouble(int)
 	 */
@@ -281,6 +286,7 @@ public float getFloat(int columnIndex) throws InvalidResultSetAccessException {
 	public float getFloat(String columnLabel) throws InvalidResultSetAccessException {
 		return getFloat(findColumn(columnLabel));
 	}
+
 	/**
 	 * @see java.sql.ResultSet#getInt(int)
 	 */
@@ -320,11 +326,11 @@ public long getLong(String columnLabel) throws InvalidResultSetAccessException {
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getObject(int, java.util.Map)
+	 * @see java.sql.ResultSet#getObject(int)
 	 */
-	public Object getObject(int i,  Map<String, Class<?>> map) throws InvalidResultSetAccessException {
+	public Object getObject(int columnIndex) throws InvalidResultSetAccessException {
 		try {
-			return this.resultSet.getObject(i, map);
+			return this.resultSet.getObject(columnIndex);
 		}
 		catch (SQLException se) {
 			throw new InvalidResultSetAccessException(se);
@@ -332,11 +338,18 @@ public Object getObject(int i,  Map<String, Class<?>> map) throws InvalidResultS
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getObject(int)
+	 * @see java.sql.ResultSet#getObject(String)
 	 */
-	public Object getObject(int columnIndex) throws InvalidResultSetAccessException {
+	public Object getObject(String columnLabel) throws InvalidResultSetAccessException {
+		return getObject(findColumn(columnLabel));
+	}
+
+	/**
+	 * @see java.sql.ResultSet#getObject(int, Map)
+	 */
+	public Object getObject(int columnIndex, Map<String, Class<?>> map) throws InvalidResultSetAccessException {
 		try {
-			return this.resultSet.getObject(columnIndex);
+			return this.resultSet.getObject(columnIndex, map);
 		}
 		catch (SQLException se) {
 			throw new InvalidResultSetAccessException(se);
@@ -344,19 +357,12 @@ public Object getObject(int columnIndex) throws InvalidResultSetAccessException
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getObject(String, java.util.Map)
+	 * @see java.sql.ResultSet#getObject(String, Map)
 	 */
-	public Object getObject(String columnLabel,  Map<String, Class<?>> map) throws InvalidResultSetAccessException {
+	public Object getObject(String columnLabel, Map<String, Class<?>> map) throws InvalidResultSetAccessException {
 		return getObject(findColumn(columnLabel), map);
 	}
 
-	/**
-	 * @see java.sql.ResultSet#getObject(String)
-	 */
-	public Object getObject(String columnLabel) throws InvalidResultSetAccessException {
-		return getObject(findColumn(columnLabel));
-	}
-
 	/**
 	 * @see java.sql.ResultSet#getShort(int)
 	 */
@@ -395,18 +401,6 @@ public String getString(String columnLabel) throws InvalidResultSetAccessExcepti
 		return getString(findColumn(columnLabel));
 	}
 
-	/**
-	 * @see java.sql.ResultSet#getTime(int, java.util.Calendar)
-	 */
-	public Time getTime(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
-		try {
-			return this.resultSet.getTime(columnIndex, cal);
-		}
-		catch (SQLException se) {
-			throw new InvalidResultSetAccessException(se);
-		}
-	}
-
 	/**
 	 * @see java.sql.ResultSet#getTime(int)
 	 */
@@ -419,13 +413,6 @@ public Time getTime(int columnIndex) throws InvalidResultSetAccessException {
 		}
 	}
 
-	/**
-	 * @see java.sql.ResultSet#getTime(String, java.util.Calendar)
-	 */
-	public Time getTime(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
-		return getTime(findColumn(columnLabel), cal);
-	}
-
 	/**
 	 * @see java.sql.ResultSet#getTime(String)
 	 */
@@ -434,17 +421,24 @@ public Time getTime(String columnLabel) throws InvalidResultSetAccessException {
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getTimestamp(int, java.util.Calendar)
+	 * @see java.sql.ResultSet#getTime(int, Calendar)
 	 */
-	public Timestamp getTimestamp(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
+	public Time getTime(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
 		try {
-			return this.resultSet.getTimestamp(columnIndex, cal);
+			return this.resultSet.getTime(columnIndex, cal);
 		}
 		catch (SQLException se) {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
 
+	/**
+	 * @see java.sql.ResultSet#getTime(String, Calendar)
+	 */
+	public Time getTime(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
+		return getTime(findColumn(columnLabel), cal);
+	}
+
 	/**
 	 * @see java.sql.ResultSet#getTimestamp(int)
 	 */
@@ -458,17 +452,29 @@ public Timestamp getTimestamp(int columnIndex) throws InvalidResultSetAccessExce
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getTimestamp(String, java.util.Calendar)
+	 * @see java.sql.ResultSet#getTimestamp(String)
 	 */
-	public Timestamp getTimestamp(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
-		return getTimestamp(findColumn(columnLabel), cal);
+	public Timestamp getTimestamp(String columnLabel) throws InvalidResultSetAccessException {
+		return getTimestamp(findColumn(columnLabel));
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getTimestamp(String)
+	 * @see java.sql.ResultSet#getTimestamp(int, Calendar)
 	 */
-	public Timestamp getTimestamp(String columnLabel) throws InvalidResultSetAccessException {
-		return getTimestamp(findColumn(columnLabel));
+	public Timestamp getTimestamp(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
+		try {
+			return this.resultSet.getTimestamp(columnIndex, cal);
+		}
+		catch (SQLException se) {
+			throw new InvalidResultSetAccessException(se);
+		}
+	}
+
+	/**
+	 * @see java.sql.ResultSet#getTimestamp(String, Calendar)
+	 */
+	public Timestamp getTimestamp(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
+		return getTimestamp(findColumn(columnLabel), cal);
 	}
 
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSetMetaData.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSetMetaData.java
index 31d9d9e14e..ababa338ed 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSetMetaData.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSetMetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,17 +22,16 @@
 import org.springframework.jdbc.InvalidResultSetAccessException;
 
 /**
- * Default implementation of Spring's SqlRowSetMetaData interface.
- * Used by ResultSetWrappingSqlRowSet.
+ * The default implementation of Spring's {@link SqlRowSetMetaData} interface, wrapping
+ * a {@link java.sql.ResultSetMetaData} instance, catching any {@link SQLException}s
+ * and translating them to a corresponding Spring {@link InvalidResultSetAccessException}.
  *
- * <p>This implementation wraps a {@code javax.sql.ResultSetMetaData}
- * instance, catching any SQLExceptions and translating them to the
- * appropriate Spring DataAccessException.
+ * <p>Used by {@link ResultSetWrappingSqlRowSet}.
  *
  * @author Thomas Risberg
  * @author Juergen Hoeller
  * @since 1.2
- * @see ResultSetWrappingSqlRowSet#getMetaData
+ * @see ResultSetWrappingSqlRowSet#getMetaData()
  */
 public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java
index 88900de919..eca734050d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,17 +27,17 @@
 import org.springframework.jdbc.InvalidResultSetAccessException;
 
 /**
- * Mirror interface for {@code javax.sql.RowSet}, representing
- * disconnected {@code java.sql.ResultSet} data.
+ * Mirror interface for {@link javax.sql.RowSet}, representing
+ * disconnected {@link java.sql.ResultSet} data.
  *
- * <p>The main difference to the standard JDBC RowSet is that an SQLException
- * is never thrown here. This allows a SqlRowSet to be used without having
- * to deal with checked exceptions. A SqlRowSet will throw Spring's
- * {@code org.springframework.jdbc.InvalidResultSetAccessException}
+ * <p>The main difference to the standard JDBC RowSet is that a
+ * {@link java.sql.SQLException} is never thrown here. This allows a
+ * SqlRowSet to be used without having to deal with checked exceptions.
+ * A SqlRowSet will throw Spring's {@link InvalidResultSetAccessException}
  * instead (when appropriate).
  *
- * <p>Note: This interface extends the {@code java.io.Serializable}
- * marker interface. Implementations, which typically hold disconnected data,
+ * <p>Note: This interface extends the {@code java.io.Serializable} marker
+ * interface. Implementations, which typically hold disconnected data,
  * are encouraged to be actually serializable (as far as possible).
  *
  * @author Thomas Risberg
@@ -51,15 +51,15 @@
 public interface SqlRowSet extends Serializable {
 
 	/**
-	 * Retrieves the meta data (number, types and properties for the columns)
-	 * of this row set.
+	 * Retrieve the meta data, i.e. number, types and properties
+	 * for the columns of this row set.
 	 * @return a corresponding SqlRowSetMetaData instance
 	 * @see java.sql.ResultSet#getMetaData()
 	 */
 	SqlRowSetMetaData getMetaData();
 
 	/**
-	 * Maps the given column label to its column index.
+	 * Map the given column label to its column index.
 	 * @param columnLabel the name of the column
 	 * @return the column index for the given column label
 	 * @see java.sql.ResultSet#findColumn(String)
@@ -70,8 +70,8 @@ public interface SqlRowSet extends Serializable {
 	// RowSet methods for extracting data values
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * an BigDecimal object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a BigDecimal object.
 	 * @param columnIndex the column index
 	 * @return an BigDecimal object representing the column value
 	 * @see java.sql.ResultSet#getBigDecimal(int)
@@ -79,17 +79,17 @@ public interface SqlRowSet extends Serializable {
 	BigDecimal getBigDecimal(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * an BigDecimal object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a BigDecimal object.
 	 * @param columnLabel the column label
 	 * @return an BigDecimal object representing the column value
-	 * @see java.sql.ResultSet#getBigDecimal(java.lang.String)
+	 * @see java.sql.ResultSet#getBigDecimal(String)
 	 */
 	BigDecimal getBigDecimal(String columnLabel) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a boolean.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a boolean.
 	 * @param columnIndex the column index
 	 * @return a boolean representing the column value
 	 * @see java.sql.ResultSet#getBoolean(int)
@@ -97,17 +97,17 @@ public interface SqlRowSet extends Serializable {
 	boolean getBoolean(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a boolean.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a boolean.
 	 * @param columnLabel the column label
 	 * @return a boolean representing the column value
-	 * @see java.sql.ResultSet#getBoolean(java.lang.String)
+	 * @see java.sql.ResultSet#getBoolean(String)
 	 */
 	boolean getBoolean(String columnLabel) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a byte.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a byte.
 	 * @param columnIndex the column index
 	 * @return a byte representing the column value
 	 * @see java.sql.ResultSet#getByte(int)
@@ -115,55 +115,55 @@ public interface SqlRowSet extends Serializable {
 	byte getByte(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a byte.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a byte.
 	 * @param columnLabel the column label
 	 * @return a byte representing the column value
-	 * @see java.sql.ResultSet#getByte(java.lang.String)
+	 * @see java.sql.ResultSet#getByte(String)
 	 */
 	byte getByte(String columnLabel) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Date object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Date object.
 	 * @param columnIndex the column index
-	 * @param cal the Calendar to use in constructing the Date
 	 * @return a Date object representing the column value
-	 * @see java.sql.ResultSet#getDate(int, java.util.Calendar)
+	 * @see java.sql.ResultSet#getDate(int)
 	 */
-	Date getDate(int columnIndex, Calendar cal) throws InvalidResultSetAccessException;
+	Date getDate(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Date object.
-	 * @param columnIndex the column index
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Date object.
+	 * @param columnLabel the column label
 	 * @return a Date object representing the column value
-	 * @see java.sql.ResultSet#getDate(int)
+	 * @see java.sql.ResultSet#getDate(String)
 	 */
-	Date getDate(int columnIndex) throws InvalidResultSetAccessException;
+	Date getDate(String columnLabel) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Date object.
-	 * @param columnLabel the column label
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Date object.
+	 * @param columnIndex the column index
 	 * @param cal the Calendar to use in constructing the Date
 	 * @return a Date object representing the column value
-	 * @see java.sql.ResultSet#getDate(java.lang.String, java.util.Calendar)
+	 * @see java.sql.ResultSet#getDate(int, Calendar)
 	 */
-	Date getDate(String columnLabel, Calendar cal) throws InvalidResultSetAccessException;
+	Date getDate(int columnIndex, Calendar cal) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Date object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Date object.
 	 * @param columnLabel the column label
+	 * @param cal the Calendar to use in constructing the Date
 	 * @return a Date object representing the column value
-	 * @see java.sql.ResultSet#getDate(java.lang.String)
+	 * @see java.sql.ResultSet#getDate(String, Calendar)
 	 */
-	Date getDate(String columnLabel) throws InvalidResultSetAccessException;
+	Date getDate(String columnLabel, Calendar cal) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Double object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Double object.
 	 * @param columnIndex the column index
 	 * @return a Double object representing the column value
 	 * @see java.sql.ResultSet#getDouble(int)
@@ -171,17 +171,17 @@ public interface SqlRowSet extends Serializable {
 	double getDouble(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Double object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Double object.
 	 * @param columnLabel the column label
 	 * @return a Double object representing the column value
-	 * @see java.sql.ResultSet#getDouble(java.lang.String)
+	 * @see java.sql.ResultSet#getDouble(String)
 	 */
 	double getDouble(String columnLabel) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a float.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a float.
 	 * @param columnIndex the column index
 	 * @return a float representing the column value
 	 * @see java.sql.ResultSet#getFloat(int)
@@ -189,17 +189,17 @@ public interface SqlRowSet extends Serializable {
 	float getFloat(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a float.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a float.
 	 * @param columnLabel the column label
 	 * @return a float representing the column value
-	 * @see java.sql.ResultSet#getFloat(java.lang.String)
+	 * @see java.sql.ResultSet#getFloat(String)
 	 */
 	float getFloat(String columnLabel) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * an int.
+	 * Retrieve the value of the indicated column in the current row
+	 * as an int.
 	 * @param columnIndex the column index
 	 * @return an int representing the column value
 	 * @see java.sql.ResultSet#getInt(int)
@@ -207,17 +207,17 @@ public interface SqlRowSet extends Serializable {
 	int getInt(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * an int.
+	 * Retrieve the value of the indicated column in the current row
+	 * as an int.
 	 * @param columnLabel the column label
 	 * @return an int representing the column value
-	 * @see java.sql.ResultSet#getInt(java.lang.String)
+	 * @see java.sql.ResultSet#getInt(String)
 	 */
 	int getInt(String columnLabel) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a long.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a long.
 	 * @param columnIndex the column index
 	 * @return a long representing the column value
 	 * @see java.sql.ResultSet#getLong(int)
@@ -225,55 +225,55 @@ public interface SqlRowSet extends Serializable {
 	long getLong(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a long.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a long.
 	 * @param columnLabel the column label
 	 * @return a long representing the column value
-	 * @see java.sql.ResultSet#getLong(java.lang.String)
+	 * @see java.sql.ResultSet#getLong(String)
 	 */
 	long getLong(String columnLabel) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * an Object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as an Object.
 	 * @param columnIndex the column index
-	 * @param map a Map object containing the mapping from SQL types to Java types
 	 * @return a Object representing the column value
-	 * @see java.sql.ResultSet#getObject(int, java.util.Map)
+	 * @see java.sql.ResultSet#getObject(int)
 	 */
-	Object getObject(int columnIndex,  Map<String, Class<?>> map) throws InvalidResultSetAccessException;
+	Object getObject(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * an Object.
-	 * @param columnIndex the column index
+	 * Retrieve the value of the indicated column in the current row
+	 * as an Object.
+	 * @param columnLabel the column label
 	 * @return a Object representing the column value
-	 * @see java.sql.ResultSet#getObject(int)
+	 * @see java.sql.ResultSet#getObject(String)
 	 */
-	Object getObject(int columnIndex) throws InvalidResultSetAccessException;
+	Object getObject(String columnLabel) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * an Object.
-	 * @param columnLabel the column label
+	 * Retrieve the value of the indicated column in the current row
+	 * as an Object.
+	 * @param columnIndex the column index
 	 * @param map a Map object containing the mapping from SQL types to Java types
 	 * @return a Object representing the column value
-	 * @see java.sql.ResultSet#getObject(java.lang.String, java.util.Map)
+	 * @see java.sql.ResultSet#getObject(int, Map)
 	 */
-	Object getObject(String columnLabel,  Map<String, Class<?>> map) throws InvalidResultSetAccessException;
+	Object getObject(int columnIndex,  Map<String, Class<?>> map) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * an Object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as an Object.
 	 * @param columnLabel the column label
+	 * @param map a Map object containing the mapping from SQL types to Java types
 	 * @return a Object representing the column value
-	 * @see java.sql.ResultSet#getObject(java.lang.String)
+	 * @see java.sql.ResultSet#getObject(String, Map)
 	 */
-	Object getObject(String columnLabel) throws InvalidResultSetAccessException;
+	Object getObject(String columnLabel,  Map<String, Class<?>> map) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a short.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a short.
 	 * @param columnIndex the column index
 	 * @return a short representing the column value
 	 * @see java.sql.ResultSet#getShort(int)
@@ -281,17 +281,17 @@ public interface SqlRowSet extends Serializable {
 	short getShort(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a short.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a short.
 	 * @param columnLabel the column label
 	 * @return a short representing the column value
-	 * @see java.sql.ResultSet#getShort(java.lang.String)
+	 * @see java.sql.ResultSet#getShort(String)
 	 */
 	short getShort(String columnLabel) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a String.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a String.
 	 * @param columnIndex the column index
 	 * @return a String representing the column value
 	 * @see java.sql.ResultSet#getString(int)
@@ -299,27 +299,17 @@ public interface SqlRowSet extends Serializable {
 	String getString(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a String.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a String.
 	 * @param columnLabel the column label
 	 * @return a String representing the column value
-	 * @see java.sql.ResultSet#getString(java.lang.String)
+	 * @see java.sql.ResultSet#getString(String)
 	 */
 	String getString(String columnLabel) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Time object.
-	 * @param columnIndex the column index
-	 * @param cal the Calendar to use in constructing the Date
-	 * @return a Time object representing the column value
-	 * @see java.sql.ResultSet#getTime(int, java.util.Calendar)
-	 */
-	Time getTime(int columnIndex, Calendar cal) throws InvalidResultSetAccessException;
-
-	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Time object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Time object.
 	 * @param columnIndex the column index
 	 * @return a Time object representing the column value
 	 * @see java.sql.ResultSet#getTime(int)
@@ -327,37 +317,37 @@ public interface SqlRowSet extends Serializable {
 	Time getTime(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Time object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Time object.
 	 * @param columnLabel the column label
-	 * @param cal the Calendar to use in constructing the Date
 	 * @return a Time object representing the column value
-	 * @see java.sql.ResultSet#getTime(java.lang.String, java.util.Calendar)
+	 * @see java.sql.ResultSet#getTime(String)
 	 */
-	Time getTime(String columnLabel, Calendar cal) throws InvalidResultSetAccessException;
+	Time getTime(String columnLabel) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Time object.
-	 * @param columnLabel the column label
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Time object.
+	 * @param columnIndex the column index
+	 * @param cal the Calendar to use in constructing the Date
 	 * @return a Time object representing the column value
-	 * @see java.sql.ResultSet#getTime(java.lang.String)
+	 * @see java.sql.ResultSet#getTime(int, Calendar)
 	 */
-	Time getTime(String columnLabel) throws InvalidResultSetAccessException;
+	Time getTime(int columnIndex, Calendar cal) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Timestamp object.
-	 * @param columnIndex the column index
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Time object.
+	 * @param columnLabel the column label
 	 * @param cal the Calendar to use in constructing the Date
-	 * @return a Timestamp object representing the column value
-	 * @see java.sql.ResultSet#getTimestamp(int, java.util.Calendar)
+	 * @return a Time object representing the column value
+	 * @see java.sql.ResultSet#getTime(String, Calendar)
 	 */
-	Timestamp getTimestamp(int columnIndex, Calendar cal) throws InvalidResultSetAccessException;
+	Time getTime(String columnLabel, Calendar cal) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Timestamp object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Timestamp object.
 	 * @param columnIndex the column index
 	 * @return a Timestamp object representing the column value
 	 * @see java.sql.ResultSet#getTimestamp(int)
@@ -365,123 +355,146 @@ public interface SqlRowSet extends Serializable {
 	Timestamp getTimestamp(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Timestamp object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Timestamp object.
 	 * @param columnLabel the column label
+	 * @return a Timestamp object representing the column value
+	 * @see java.sql.ResultSet#getTimestamp(String)
+	 */
+	Timestamp getTimestamp(String columnLabel) throws InvalidResultSetAccessException;
+
+	/**
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Timestamp object.
+	 * @param columnIndex the column index
 	 * @param cal the Calendar to use in constructing the Date
 	 * @return a Timestamp object representing the column value
-	 * @see java.sql.ResultSet#getTimestamp(java.lang.String, java.util.Calendar)
+	 * @see java.sql.ResultSet#getTimestamp(int, Calendar)
 	 */
-	Timestamp getTimestamp(String columnLabel, Calendar cal) throws InvalidResultSetAccessException;
+	Timestamp getTimestamp(int columnIndex, Calendar cal) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the value of the indicated column in the current row as
-	 * a Timestamp object.
+	 * Retrieve the value of the indicated column in the current row
+	 * as a Timestamp object.
 	 * @param columnLabel the column label
+	 * @param cal the Calendar to use in constructing the Date
 	 * @return a Timestamp object representing the column value
-	 * @see java.sql.ResultSet#getTimestamp(java.lang.String)
+	 * @see java.sql.ResultSet#getTimestamp(String, Calendar)
 	 */
-	Timestamp getTimestamp(String columnLabel) throws InvalidResultSetAccessException;
+	Timestamp getTimestamp(String columnLabel, Calendar cal) throws InvalidResultSetAccessException;
 
 
 	// RowSet navigation methods
 
 	/**
-	 * Moves the cursor to the given row number in the RowSet, just after the last row.
+	 * Move the cursor to the given row number in the row set,
+	 * just after the last row.
 	 * @param row the number of the row where the cursor should move
-	 * @return true if the cursor is on the RowSet, false otherwise
+	 * @return {@code true} if the cursor is on the row set,
+	 * {@code false} otherwise
 	 * @see java.sql.ResultSet#absolute(int)
 	 */
 	boolean absolute(int row) throws InvalidResultSetAccessException;
 
 	/**
-	 * Moves the cursor to the end of this RowSet.
+	 * Move the cursor to the end of this row set.
 	 * @see java.sql.ResultSet#afterLast()
 	 */
 	void afterLast() throws InvalidResultSetAccessException;
 
 	/**
-	 * Moves the cursor to the front of this RowSet, just before the first row.
+	 * Move the cursor to the front of this row set,
+	 * just before the first row.
 	 * @see java.sql.ResultSet#beforeFirst()
 	 */
 	void beforeFirst() throws InvalidResultSetAccessException;
 
 	/**
-	 * Moves the cursor to the first row of this RowSet.
-	 * @return true if the cursor is on a valid row, false otherwise
+	 * Move the cursor to the first row of this row set.
+	 * @return {@code true} if the cursor is on a valid row,
+	 * {@code false} otherwise
 	 * @see java.sql.ResultSet#first()
 	 */
 	boolean first() throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the current row number.
+	 * Retrieve the current row number.
 	 * @return the current row number
 	 * @see java.sql.ResultSet#getRow()
 	 */
 	int getRow() throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves whether the cursor is after the last row of this RowSet.
-	 * @return true if the cursor is after the last row, false otherwise
+	 * Retrieve whether the cursor is after the last row of this row set.
+	 * @return {@code true} if the cursor is after the last row,
+	 * {@code false} otherwise
 	 * @see java.sql.ResultSet#isAfterLast()
 	 */
 	boolean isAfterLast() throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves whether the cursor is after the first row of this RowSet.
-	 * @return true if the cursor is after the first row, false otherwise
+	 * Retrieve whether the cursor is before the first row of this row set.
+	 * @return {@code true} if the cursor is before the first row,
+	 * {@code false} otherwise
 	 * @see java.sql.ResultSet#isBeforeFirst()
 	 */
 	boolean isBeforeFirst() throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves whether the cursor is on the first row of this RowSet.
-	 * @return true if the cursor is after the first row, false otherwise
+	 * Retrieve whether the cursor is on the first row of this row set.
+	 * @return {@code true} if the cursor is after the first row,
+	 * {@code false} otherwise
 	 * @see java.sql.ResultSet#isFirst()
 	 */
 	boolean isFirst() throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves whether the cursor is on the last row of this RowSet.
-	 * @return true if the cursor is after the last row, false otherwise
+	 * Retrieve whether the cursor is on the last row of this row set.
+	 * @return {@code true} if the cursor is after the last row,
+	 * {@code false} otherwise
 	 * @see java.sql.ResultSet#isLast()
 	 */
 	boolean isLast() throws InvalidResultSetAccessException;
 
 	/**
-	 * Moves the cursor to the last row of this RowSet.
-	 * @return true if the cursor is on a valid row, false otherwise
+	 * Move the cursor to the last row of this row set.
+	 * @return {@code true} if the cursor is on a valid row,
+	 * {@code false} otherwise
 	 * @see java.sql.ResultSet#last()
 	 */
 	boolean last() throws InvalidResultSetAccessException;
 
 	/**
-	 * Moves the cursor to the next row.
-	 * @return true if the new row is valid, false if there are no more rows
+	 * Move the cursor to the next row.
+	 * @return {@code true} if the new row is valid,
+	 * {@code false} if there are no more rows
 	 * @see java.sql.ResultSet#next()
 	 */
 	boolean next() throws InvalidResultSetAccessException;
 
 	/**
-	 * Moves the cursor to the previous row.
-	 * @return true if the new row is valid, false if it is off the RowSet
+	 * Move the cursor to the previous row.
+	 * @return {@code true} if the new row is valid,
+	 * {@code false} if it is off the row set
 	 * @see java.sql.ResultSet#previous()
 	 */
 	boolean previous() throws InvalidResultSetAccessException;
 
 	/**
-	 * Moves the cursor a relative number f rows, either positive or negative.
-	 * @return true if the cursor is on a row, false otherwise
+	 * Move the cursor a relative number of rows,
+	 * either positive or negative.
+	 * @return {@code true} if the cursor is on a row,
+	 * {@code false} otherwise
 	 * @see java.sql.ResultSet#relative(int)
 	 */
 	boolean relative(int rows) throws InvalidResultSetAccessException;
 
 	/**
-	 * Reports whether the last column read had a value of SQL {@code NULL}.
-	 * Note that you must first call one of the getter methods and then call
-	 * the {@code wasNull} method.
-	 * @return true if the most recent coumn retrieved was SQL {@code NULL},
-	 * false otherwise
+	 * Report whether the last column read had a value of SQL {@code NULL}.
+	 * <p>Note that you must first call one of the getter methods
+	 * and then call the {@code wasNull()} method.
+	 * @return {@code true} if the most recent coumn retrieved was
+	 * SQL {@code NULL}, {@code false} otherwise
 	 * @see java.sql.ResultSet#wasNull()
 	 */
 	boolean wasNull() throws InvalidResultSetAccessException;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java
index b117177b38..9ec1c79554 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,25 +19,27 @@
 import org.springframework.jdbc.InvalidResultSetAccessException;
 
 /**
- * Meta data interface for Spring's SqlRowSet,
- * analogous to {@code javax.sql.ResultSetMetaData}
+ * Metadata interface for Spring's {@link SqlRowSet}, analogous to JDBC's
+ * {@link java.sql.ResultSetMetaData}.
  *
- * <p>The main difference to the standard JDBC RowSetMetaData is that an SQLException
- * is never thrown here. This allows a SqlRowSetMetaData to be used without having
- * to deal with checked exceptions. A SqlRowSetMetaData will throw Spring's
- * {@code org.springframework.jdbc.InvalidResultSetAccessException}
+ * <p>The main difference to the standard JDBC ResultSetMetaData is that a
+ * {@link java.sql.SQLException} is never thrown here. This allows
+ * SqlRowSetMetaData to be used without having to deal with checked exceptions.
+ * SqlRowSetMetaData will throw Spring's {@link InvalidResultSetAccessException}
  * instead (when appropriate).
  *
  * @author Thomas Risberg
+ * @author Juergen Hoeller
  * @since 1.2
- * @see SqlRowSet#getMetaData
+ * @see SqlRowSet#getMetaData()
  * @see java.sql.ResultSetMetaData
  * @see org.springframework.jdbc.InvalidResultSetAccessException
  */
 public interface SqlRowSetMetaData {
 
 	/**
-	 * Retrieves the catalog name of the table that served as the source for the specified column.
+	 * Retrieve the catalog name of the table that served as the source for the
+	 * specified column.
 	 * @param columnIndex the index of the column
 	 * @return the catalog name
 	 * @see java.sql.ResultSetMetaData#getCatalogName(int)
@@ -45,7 +47,7 @@ public interface SqlRowSetMetaData {
 	String getCatalogName(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the fully qualified class that the specified column will be mapped to.
+	 * Retrieve the fully qualified class that the specified column will be mapped to.
 	 * @param columnIndex the index of the column
 	 * @return the class name as a String
 	 * @see java.sql.ResultSetMetaData#getColumnClassName(int)
@@ -53,7 +55,7 @@ public interface SqlRowSetMetaData {
 	String getColumnClassName(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrives the number of columns in the RowSet.
+	 * Retrieve the number of columns in the RowSet.
 	 * @return the number of columns
 	 * @see java.sql.ResultSetMetaData#getColumnCount()
 	 */
@@ -66,7 +68,7 @@ public interface SqlRowSetMetaData {
 	String[] getColumnNames() throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the maximum width of the designated column.
+	 * Retrieve the maximum width of the designated column.
 	 * @param columnIndex the index of the column
 	 * @return the width of the column
 	 * @see java.sql.ResultSetMetaData#getColumnDisplaySize(int)
@@ -99,7 +101,7 @@ public interface SqlRowSetMetaData {
 	int getColumnType(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the DBMS-specific type name for the indicated column.
+	 * Retrieve the DBMS-specific type name for the indicated column.
 	 * @param columnIndex the index of the column
 	 * @return the type name
 	 * @see java.sql.ResultSetMetaData#getColumnTypeName(int)
@@ -107,7 +109,7 @@ public interface SqlRowSetMetaData {
 	String getColumnTypeName(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the precision for the indicated column.
+	 * Retrieve the precision for the indicated column.
 	 * @param columnIndex the index of the column
 	 * @return the precision
 	 * @see java.sql.ResultSetMetaData#getPrecision(int)
@@ -115,7 +117,7 @@ public interface SqlRowSetMetaData {
 	int getPrecision(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the scale of the indicated column.
+	 * Retrieve the scale of the indicated column.
 	 * @param columnIndex the index of the column
 	 * @return the scale
 	 * @see java.sql.ResultSetMetaData#getScale(int)
@@ -123,7 +125,8 @@ public interface SqlRowSetMetaData {
 	int getScale(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the schema name of the table that served as the source for the specified column.
+	 * Retrieve the schema name of the table that served as the source for the
+	 * specified column.
 	 * @param columnIndex the index of the column
 	 * @return the schema name
 	 * @see java.sql.ResultSetMetaData#getSchemaName(int)
@@ -131,7 +134,8 @@ public interface SqlRowSetMetaData {
 	String getSchemaName(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Retrieves the name of the table that served as the source for the specified column.
+	 * Retrieve the name of the table that served as the source for the
+	 * specified column.
 	 * @param columnIndex the index of the column
 	 * @return the name of the table
 	 * @see java.sql.ResultSetMetaData#getTableName(int)
@@ -139,7 +143,7 @@ public interface SqlRowSetMetaData {
 	String getTableName(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Indicates whether the case of the designated column is significant.
+	 * Indicate whether the case of the designated column is significant.
 	 * @param columnIndex the index of the column
 	 * @return true if the case sensitive, false otherwise
 	 * @see java.sql.ResultSetMetaData#isCaseSensitive(int)
@@ -147,7 +151,7 @@ public interface SqlRowSetMetaData {
 	boolean isCaseSensitive(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Indicates whether the designated column contains a currency value.
+	 * Indicate whether the designated column contains a currency value.
 	 * @param columnIndex the index of the column
 	 * @return true if the value is a currency value, false otherwise
 	 * @see java.sql.ResultSetMetaData#isCurrency(int)
@@ -155,7 +159,7 @@ public interface SqlRowSetMetaData {
 	boolean isCurrency(int columnIndex) throws InvalidResultSetAccessException;
 
 	/**
-	 * Indicates whether the designated column contains a signed number.
+	 * Indicate whether the designated column contains a signed number.
 	 * @param columnIndex the index of the column
 	 * @return true if the column contains a signed number, false otherwise
 	 * @see java.sql.ResultSetMetaData#isSigned(int)
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java
index 13f0363377..bbcf3d987c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,37 +51,51 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler {
 	//-------------------------------------------------------------------------
 
 	public String getXmlAsString(ResultSet rs, String columnName) throws SQLException {
-		return rs.getSQLXML(columnName).getString();
+		SQLXML xmlObject = rs.getSQLXML(columnName);
+		return (xmlObject != null ? xmlObject.getString() : null);
 	}
 
 	public String getXmlAsString(ResultSet rs, int columnIndex) throws SQLException {
-		return rs.getSQLXML(columnIndex).getString();
+		SQLXML xmlObject = rs.getSQLXML(columnIndex);
+		return (xmlObject != null ? xmlObject.getString() : null);
 	}
 
 	public InputStream getXmlAsBinaryStream(ResultSet rs, String columnName) throws SQLException {
-		return rs.getSQLXML(columnName).getBinaryStream();
+		SQLXML xmlObject = rs.getSQLXML(columnName);
+		return (xmlObject != null ? xmlObject.getBinaryStream() : null);
 	}
 
 	public InputStream getXmlAsBinaryStream(ResultSet rs, int columnIndex) throws SQLException {
-		return rs.getSQLXML(columnIndex).getBinaryStream();
+		SQLXML xmlObject = rs.getSQLXML(columnIndex);
+		return (xmlObject != null ? xmlObject.getBinaryStream() : null);
 	}
 
 	public Reader getXmlAsCharacterStream(ResultSet rs, String columnName) throws SQLException {
-		return rs.getSQLXML(columnName).getCharacterStream();
+		SQLXML xmlObject = rs.getSQLXML(columnName);
+		return (xmlObject != null ? xmlObject.getCharacterStream() : null);
 	}
 
 	public Reader getXmlAsCharacterStream(ResultSet rs, int columnIndex) throws SQLException {
-		return rs.getSQLXML(columnIndex).getCharacterStream();
+		SQLXML xmlObject = rs.getSQLXML(columnIndex);
+		return (xmlObject != null ? xmlObject.getCharacterStream() : null);
 	}
 
 	@SuppressWarnings("unchecked")
 	public Source getXmlAsSource(ResultSet rs, String columnName, Class sourceClass) throws SQLException {
-		return rs.getSQLXML(columnName).getSource(sourceClass != null ? sourceClass : DOMSource.class);
+		SQLXML xmlObject = rs.getSQLXML(columnName);
+		if (xmlObject == null) {
+			return null;
+		}
+		return xmlObject.getSource(sourceClass != null ? sourceClass : DOMSource.class);
 	}
 
 	@SuppressWarnings("unchecked")
 	public Source getXmlAsSource(ResultSet rs, int columnIndex, Class sourceClass) throws SQLException {
-		return rs.getSQLXML(columnIndex).getSource(sourceClass != null ? sourceClass : DOMSource.class);
+		SQLXML xmlObject = rs.getSQLXML(columnIndex);
+		if (xmlObject == null) {
+			return null;
+		}
+		return xmlObject.getSource(sourceClass != null ? sourceClass : DOMSource.class);
 	}
 
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java
index 2a702794ee..fa08d96d54 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.io.Reader;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import javax.xml.transform.Source;
 
 import org.w3c.dom.Document;
@@ -112,7 +111,7 @@ public interface SqlXmlHandler {
 	 * database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnName the column name to use
-	 * @return the content as character stream
+	 * @return the content as character stream, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getSQLXML
 	 * @see java.sql.SQLXML#getCharacterStream
@@ -126,7 +125,7 @@ public interface SqlXmlHandler {
 	 * database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnIndex the column index to use
-	 * @return the content as character stream
+	 * @return the content as character stream, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getSQLXML
 	 * @see java.sql.SQLXML#getCharacterStream
@@ -141,7 +140,7 @@ public interface SqlXmlHandler {
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnName the column name to use
 	 * @param sourceClass the implementation class to be used
-	 * @return the content as character stream
+	 * @return the content as character stream, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getSQLXML
 	 * @see java.sql.SQLXML#getSource
@@ -156,7 +155,7 @@ public interface SqlXmlHandler {
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnIndex the column index to use
 	 * @param sourceClass the implementation class to be used
-	 * @return the content as character stream
+	 * @return the content as character stream, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getSQLXML
 	 * @see java.sql.SQLXML#getSource
diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml b/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
index 8b06d1eb62..15329647e2 100644
--- a/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
+++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
@@ -235,7 +235,7 @@
 			<value>2601,2615,2626</value>
 		</property>
 		<property name="dataIntegrityViolationCodes">
-			<value>233,511,515,530,547,2615,2714</value>
+			<value>233,511,515,530,546,547,2615,2714</value>
 		</property>
 		<property name="transientDataAccessResourceCodes">
 			<value>921,1105</value>
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java
index 694c3c65fa..d9d6dd1567 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java
@@ -18,6 +18,7 @@
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
+import java.sql.ParameterMetaData;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -26,6 +27,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
 import static org.mockito.BDDMockito.*;
 
 /**
@@ -41,46 +43,129 @@ public void setUp() {
 		preparedStatement = mock(PreparedStatement.class);
 	}
 
-	@Test public void testSetParameterValueWithNullAndType() throws SQLException {
+	@Test
+	public void testSetParameterValueWithNullAndType() throws SQLException {
 		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, null, null);
 		verify(preparedStatement).setNull(1, Types.VARCHAR);
 	}
 
-	@Test public void testSetParameterValueWithNullAndTypeName() throws SQLException {
+	@Test
+	public void testSetParameterValueWithNullAndTypeName() throws SQLException {
 		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, "mytype", null);
 		verify(preparedStatement).setNull(1, Types.VARCHAR, "mytype");
 	}
 
-	@Test public void testSetParameterValueWithNullAndUnknownType() throws SQLException {
+	@Test
+	public void testSetParameterValueWithNullAndUnknownType() throws SQLException {
 		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
 		verify(preparedStatement).setNull(1, Types.NULL);
 	}
 
 	@Test
 	public void testSetParameterValueWithNullAndUnknownTypeOnInformix() throws SQLException {
+		StatementCreatorUtils.driversWithNoSupportForGetParameterType.clear();
 		Connection con = mock(Connection.class);
-		DatabaseMetaData metaData = mock(DatabaseMetaData.class);
+		DatabaseMetaData dbmd = mock(DatabaseMetaData.class);
 		given(preparedStatement.getConnection()).willReturn(con);
-		given(con.getMetaData()).willReturn(metaData);
-		given(metaData.getDatabaseProductName()).willReturn("Informix Dynamic Server");
-		given(metaData.getDriverName()).willReturn("Informix Driver");
+		given(con.getMetaData()).willReturn(dbmd);
+		given(dbmd.getDatabaseProductName()).willReturn("Informix Dynamic Server");
+		given(dbmd.getDriverName()).willReturn("Informix Driver");
 		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
-		verify(metaData).getDatabaseProductName();
-		verify(metaData).getDriverName();
+		verify(dbmd).getDatabaseProductName();
+		verify(dbmd).getDriverName();
 		verify(preparedStatement).setObject(1, null);
+		assertEquals(1, StatementCreatorUtils.driversWithNoSupportForGetParameterType.size());
 	}
 
-	@Test public void testSetParameterValueWithNullAndUnknownTypeOnDerbyEmbedded() throws SQLException {
+	@Test
+	public void testSetParameterValueWithNullAndUnknownTypeOnDerbyEmbedded() throws SQLException {
+		StatementCreatorUtils.driversWithNoSupportForGetParameterType.clear();
 		Connection con = mock(Connection.class);
-		DatabaseMetaData metaData = mock(DatabaseMetaData.class);
+		DatabaseMetaData dbmd = mock(DatabaseMetaData.class);
 		given(preparedStatement.getConnection()).willReturn(con);
-		given(con.getMetaData()).willReturn(metaData);
-		given(metaData.getDatabaseProductName()).willReturn("Apache Derby");
-		given(metaData.getDriverName()).willReturn("Apache Derby Embedded Driver");
+		given(con.getMetaData()).willReturn(dbmd);
+		given(dbmd.getDatabaseProductName()).willReturn("Apache Derby");
+		given(dbmd.getDriverName()).willReturn("Apache Derby Embedded Driver");
 		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
-		verify(metaData).getDatabaseProductName();
-		verify(metaData).getDriverName();
+		verify(dbmd).getDatabaseProductName();
+		verify(dbmd).getDriverName();
 		verify(preparedStatement).setNull(1, Types.VARCHAR);
+		assertEquals(1, StatementCreatorUtils.driversWithNoSupportForGetParameterType.size());
+	}
+
+	@Test
+	public void testSetParameterValueWithNullAndGetParameterTypeWorking() throws SQLException {
+		StatementCreatorUtils.driversWithNoSupportForGetParameterType.clear();
+		ParameterMetaData pmd = mock(ParameterMetaData.class);
+		given(preparedStatement.getParameterMetaData()).willReturn(pmd);
+		given(pmd.getParameterType(1)).willReturn(Types.SMALLINT);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
+		verify(pmd).getParameterType(1);
+		verify(preparedStatement, never()).getConnection();
+		verify(preparedStatement).setNull(1, Types.SMALLINT);
+		assertTrue(StatementCreatorUtils.driversWithNoSupportForGetParameterType.isEmpty());
+	}
+
+	@Test
+	public void testSetParameterValueWithNullAndGetParameterTypeWorkingButNotForOtherDriver() throws SQLException {
+		StatementCreatorUtils.driversWithNoSupportForGetParameterType.clear();
+		StatementCreatorUtils.driversWithNoSupportForGetParameterType.put("Oracle JDBC Driver", Boolean.TRUE);
+		Connection con = mock(Connection.class);
+		DatabaseMetaData dbmd = mock(DatabaseMetaData.class);
+		ParameterMetaData pmd = mock(ParameterMetaData.class);
+		given(preparedStatement.getConnection()).willReturn(con);
+		given(con.getMetaData()).willReturn(dbmd);
+		given(dbmd.getDriverName()).willReturn("Apache Derby Embedded Driver");
+		given(preparedStatement.getParameterMetaData()).willReturn(pmd);
+		given(pmd.getParameterType(1)).willReturn(Types.SMALLINT);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
+		verify(dbmd).getDriverName();
+		verify(pmd).getParameterType(1);
+		verify(preparedStatement).setNull(1, Types.SMALLINT);
+		assertEquals(1, StatementCreatorUtils.driversWithNoSupportForGetParameterType.size());
+	}
+
+	@Test
+	public void testSetParameterValueWithNullAndUnknownTypeAndGetParameterTypeNotWorking() throws SQLException {
+		StatementCreatorUtils.driversWithNoSupportForGetParameterType.clear();
+		Connection con = mock(Connection.class);
+		DatabaseMetaData dbmd = mock(DatabaseMetaData.class);
+		given(preparedStatement.getConnection()).willReturn(con);
+		given(con.getMetaData()).willReturn(dbmd);
+		given(dbmd.getDatabaseProductName()).willReturn("Apache Derby");
+		given(dbmd.getDriverName()).willReturn("Apache Derby Embedded Driver");
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
+		verify(dbmd).getDatabaseProductName();
+		verify(dbmd).getDriverName();
+		verify(preparedStatement).setNull(1, Types.VARCHAR);
+		assertEquals(1, StatementCreatorUtils.driversWithNoSupportForGetParameterType.size());
+
+		reset(preparedStatement, con, dbmd);
+		ParameterMetaData pmd = mock(ParameterMetaData.class);
+		given(preparedStatement.getConnection()).willReturn(con);
+		given(con.getMetaData()).willReturn(dbmd);
+		given(preparedStatement.getParameterMetaData()).willReturn(pmd);
+		given(pmd.getParameterType(1)).willThrow(new SQLException("unsupported"));
+		given(dbmd.getDatabaseProductName()).willReturn("Informix Dynamic Server");
+		given(dbmd.getDriverName()).willReturn("Informix Driver");
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
+		verify(pmd).getParameterType(1);
+		verify(dbmd).getDatabaseProductName();
+		verify(dbmd).getDriverName();
+		verify(preparedStatement).setObject(1, null);
+		assertEquals(2, StatementCreatorUtils.driversWithNoSupportForGetParameterType.size());
+
+		reset(preparedStatement, con, dbmd, pmd);
+		given(preparedStatement.getConnection()).willReturn(con);
+		given(con.getMetaData()).willReturn(dbmd);
+		given(dbmd.getDatabaseProductName()).willReturn("Informix Dynamic Server");
+		given(dbmd.getDriverName()).willReturn("Informix Driver");
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
+		verify(preparedStatement, never()).getParameterMetaData();
+		verify(dbmd).getDatabaseProductName();
+		verify(dbmd).getDriverName();
+		verify(preparedStatement).setObject(1, null);
+		assertEquals(2, StatementCreatorUtils.driversWithNoSupportForGetParameterType.size());
 	}
 
 	@Test
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java
index 73e9b46ff5..271caa9375 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java
@@ -173,11 +173,11 @@ public void testQueryForObjectWithParamMapAndRowMapper() throws Exception {
 		parms.addValue("id", 3);
 		Object o = template.queryForObject("SELECT AGE FROM CUSTMR WHERE ID = :id",
 				parms, new RowMapper<Object>() {
-					@Override
-					public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
-						return rs.getInt(1);
-					}
-				});
+			@Override
+			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
+				return rs.getInt(1);
+			}
+		});
 
 		assertTrue("Correct result type", o instanceof Integer);
 		verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID = ?");
@@ -225,7 +225,7 @@ public void testQueryForObjectWithParamMapAndList() throws Exception {
 		given(resultSet.getInt(1)).willReturn(22);
 
 		MapSqlParameterSource parms = new MapSqlParameterSource();
-		parms.addValue("ids", Arrays.asList(new Object[] { 3, 4 }));
+		parms.addValue("ids", Arrays.asList(3, 4));
 		Object o = template.queryForObject(sql, parms, Integer.class);
 
 		assertTrue("Correct result type", o instanceof Integer);
@@ -241,8 +241,8 @@ public void testQueryForObjectWithParamMapAndListOfExpressionLists() throws Exce
 
 		MapSqlParameterSource parms = new MapSqlParameterSource();
 		List<Object[]> l1 = new ArrayList<Object[]>();
-		l1.add(new Object[] { 3, "Rod" });
-		l1.add(new Object[] { 4, "Juergen" });
+		l1.add(new Object[] {3, "Rod"});
+		l1.add(new Object[] {4, "Juergen"});
 		parms.addValue("multiExpressionList", l1);
 		Object o = template.queryForObject(
 				"SELECT AGE FROM CUSTMR WHERE (ID, NAME) IN (:multiExpressionList)",
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
index 2360b80840..0b8ab5afcd 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Thomas Risberg
  * @author Juergen Hoeller
@@ -117,7 +118,7 @@ public void convertTypeMapToSqlParameterList() {
 	@Test(expected = InvalidDataAccessApiUsageException.class)
 	public void buildValueArrayWithMissingParameterValue() throws Exception {
 		String sql = "select count(0) from foo where id = :id";
-		NamedParameterUtils.buildValueArray(sql, new HashMap());
+		NamedParameterUtils.buildValueArray(sql, Collections.<String, Object>emptyMap());
 	}
 
 	@Test
@@ -168,7 +169,7 @@ public void parseSqlContainingComments() {
 
 		String sql4 = "/*+ HINT */ xxx /* comment :a ? */ :a yyyy :b :c :a zzzzz /* :xx XX*";
 		ParsedSql psql4 = NamedParameterUtils.parseSqlStatement(sql4);
-		Map parameters = Collections.singletonMap("a", "0");
+		Map<String, String> parameters = Collections.singletonMap("a", "0");
 		assertEquals("/*+ HINT */ xxx /* comment :a ? */ ? yyyy ? ? ? zzzzz /* :xx XX*",
 				NamedParameterUtils.substituteNamedParameters(psql4, new MapSqlParameterSource(parameters)));
 	}
@@ -235,7 +236,6 @@ public void parseSqlStatementWithEmptyBracketsOrBracketsInQuotes() throws Except
 		assertEquals(0, parsedSql2.getParameterNames().size());
 		String finalSql2 = NamedParameterUtils.substituteNamedParameters(parsedSql2, null);
 		assertEquals(expectedSql2, finalSql2);
-
 	}
 
 	/*
@@ -294,4 +294,5 @@ public void parseSqlStatementWithQuotesAndCommentAfter() {
 		assertEquals(1, psql2.getTotalParameterCount());
 		assertEquals("xxx", psql2.getParameterNames().get(0));
 	}
+
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java
index b43b689572..1d4311d44a 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.jdbc.object;
 
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -25,13 +24,11 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.sql.DataSource;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
@@ -43,13 +40,14 @@
 
 /**
  * @author Thomas Risberg
+ * @author Juergen Hoeller
  */
-public class GenericSqlQueryTests  {
+public class GenericSqlQueryTests {
 
 	private static final String SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED =
-		"select id, forename from custmr where id = ? and country = ?";
+			"select id, forename from custmr where id = ? and country = ?";
 
-	private BeanFactory beanFactory;
+	private DefaultListableBeanFactory beanFactory;
 
 	private Connection connection;
 
@@ -57,10 +55,11 @@ public class GenericSqlQueryTests  {
 
 	private ResultSet resultSet;
 
+
 	@Before
 	public void setUp() throws Exception {
 		this.beanFactory = new DefaultListableBeanFactory();
-		new XmlBeanDefinitionReader((BeanDefinitionRegistry) this.beanFactory).loadBeanDefinitions(
+		new XmlBeanDefinitionReader(this.beanFactory).loadBeanDefinitions(
 				new ClassPathResource("org/springframework/jdbc/object/GenericSqlQueryTests-context.xml"));
 		DataSource dataSource = mock(DataSource.class);
 		this.connection = mock(Connection.class);
@@ -72,18 +71,18 @@ public void setUp() throws Exception {
 	}
 
 	@Test
-	public void testPlaceHoldersCustomerQuery() throws SQLException {
-		SqlQuery query = (SqlQuery) beanFactory.getBean("queryWithPlaceHolders");
+	public void testCustomerQueryWithPlaceholders() throws SQLException {
+		SqlQuery<?> query = (SqlQuery<?>) beanFactory.getBean("queryWithPlaceholders");
 		doTestCustomerQuery(query, false);
 	}
 
 	@Test
-	public void testNamedParameterCustomerQuery() throws SQLException {
-		SqlQuery query = (SqlQuery) beanFactory.getBean("queryWithNamedParameters");
+	public void testCustomerQueryWithNamedParameters() throws SQLException {
+		SqlQuery<?> query = (SqlQuery<?>) beanFactory.getBean("queryWithNamedParameters");
 		doTestCustomerQuery(query, true);
 	}
 
-	private void doTestCustomerQuery(SqlQuery query, boolean namedParameters) throws SQLException {
+	private void doTestCustomerQuery(SqlQuery<?> query, boolean namedParameters) throws SQLException {
 		given(resultSet.next()).willReturn(true);
 		given(resultSet.getInt("id")).willReturn(1);
 		given(resultSet.getString("forename")).willReturn("rod");
@@ -91,15 +90,15 @@ private void doTestCustomerQuery(SqlQuery query, boolean namedParameters) throws
 		given(preparedStatement.executeQuery()).willReturn(resultSet);
 		given(connection.prepareStatement(SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED)).willReturn(preparedStatement);
 
-		List queryResults;
+		List<?> queryResults;
 		if (namedParameters) {
 			Map<String, Object> params = new HashMap<String, Object>(2);
-			params.put("id", new Integer(1));
+			params.put("id", 1);
 			params.put("country", "UK");
 			queryResults = query.executeByNamedParam(params);
 		}
 		else {
-			Object[] params = new Object[] {new Integer(1), "UK"};
+			Object[] params = new Object[] {1, "UK"};
 			queryResults = query.execute(params);
 		}
 		assertTrue("Customer was returned correctly", queryResults.size() == 1);
@@ -108,7 +107,7 @@ private void doTestCustomerQuery(SqlQuery query, boolean namedParameters) throws
 		assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod"));
 
 		verify(resultSet).close();
-		verify(preparedStatement).setObject(1, new Integer(1), Types.INTEGER);
+		verify(preparedStatement).setObject(1, 1, Types.INTEGER);
 		verify(preparedStatement).setString(2, "UK");
 		verify(preparedStatement).close();
 	}
diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml
index eda2e44809..e3711a096f 100644
--- a/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml
+++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/object/GenericSqlQueryTests-context.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<bean id="dataSource" class="org.springframework.jdbc.datasource.TestDataSourceWrapper"/>
 
-	<bean id="queryWithPlaceHolders" class="org.springframework.jdbc.object.GenericSqlQuery">
+	<bean id="queryWithPlaceholders" class="org.springframework.jdbc.object.GenericSqlQuery">
 		<property name="dataSource" ref="dataSource"/>
 		<property name="sql" value="select id, forename from custmr where id = ? and country = ?"/>
 		<property name="parameters">
@@ -15,7 +15,7 @@
 					<constructor-arg index="0" value="amount"/>
 					<constructor-arg index="1">
 						<util:constant static-field="java.sql.Types.INTEGER"/>
-					</constructor-arg> 
+					</constructor-arg>
 				</bean>
 				<bean class="org.springframework.jdbc.core.SqlParameter">
 					<constructor-arg index="0" value="custid"/>
@@ -47,7 +47,7 @@
 				</bean>
 			</list>
 		</property>
-    <property name="rowMapperClass" value="org.springframework.jdbc.object.CustomerMapper"/>
+        <property name="rowMapperClass" value="org.springframework.jdbc.object.CustomerMapper"/>
 	</bean>
 
 </beans>
\ No newline at end of file
diff --git a/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java b/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java
index b9531906a4..e55ba0d61e 100644
--- a/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public UncategorizedJmsException(String msg, Throwable cause) {
 	 * but can also be a JNDI NamingException or the like.
 	 */
 	public UncategorizedJmsException(Throwable cause) {
-		super("Uncategorized exception occured during JMS processing", cause);
+		super("Uncategorized exception occurred during JMS processing", cause);
 	}
 
 }
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/JcaListenerContainerParser.java b/spring-jms/src/main/java/org/springframework/jms/config/JcaListenerContainerParser.java
index 4c34748211..f3b1809951 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/JcaListenerContainerParser.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/JcaListenerContainerParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@ protected BeanDefinition parseContainer(Element listenerEle, Element containerEl
 
 		String prefetch = containerEle.getAttribute(PREFETCH_ATTRIBUTE);
 		if (StringUtils.hasText(prefetch)) {
-			configDef.getPropertyValues().add("prefetchSize", new Integer(prefetch));
+			configDef.getPropertyValues().add("prefetchSize", Integer.valueOf(prefetch));
 		}
 
 		String phase = containerEle.getAttribute(PHASE_ATTRIBUTE);
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java b/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java
index 05ecd8b5de..6b6017524a 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java
@@ -154,14 +154,14 @@ else if ("simple102".equals(containerType)) {
 		String prefetch = containerEle.getAttribute(PREFETCH_ATTRIBUTE);
 		if (StringUtils.hasText(prefetch)) {
 			if (containerType.startsWith("default")) {
-				containerDef.getPropertyValues().add("maxMessagesPerTask", new Integer(prefetch));
+				containerDef.getPropertyValues().add("maxMessagesPerTask", prefetch);
 			}
 		}
 
 		String receiveTimeout = containerEle.getAttribute(RECEIVE_TIMEOUT_ATTRIBUTE);
 		if (StringUtils.hasText(receiveTimeout)) {
 			if (containerType.startsWith("default")) {
-				containerDef.getPropertyValues().add("receiveTimeout", new Integer(receiveTimeout));
+				containerDef.getPropertyValues().add("receiveTimeout", receiveTimeout);
 			}
 		}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
index 367d8b804a..90dd3fd739 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,8 @@
  *
  * <p><b>NOTE: This ConnectionFactory decorator requires JMS 1.1 or higher.</b>
  * You may use it through the JMS 1.0.2 API; however, the target JMS driver
- * needs to be compliant with JMS 1.1.
+ * needs to be compliant with JMS 1.1. Note that there is no JMS 2.0 support
+ * in this version yet; please upgrade to Spring Framework 4.x for JMS 2.0.
  *
  * <p>When using the JMS 1.0.2 API, this ConnectionFactory will switch
  * into queue/topic mode according to the JMS API methods used at runtime:
@@ -242,7 +243,7 @@ protected Session getSession(Connection con, Integer mode) throws JMSException {
 	 * @return the wrapped Session
 	 */
 	protected Session getCachedSessionProxy(Session target, LinkedList<Session> sessionList) {
-		List<Class> classes = new ArrayList<Class>(3);
+		List<Class<?>> classes = new ArrayList<Class<?>>(3);
 		classes.add(SessionProxy.class);
 		if (target instanceof QueueSession) {
 			classes.add(QueueSession.class);
@@ -252,7 +253,7 @@ protected Session getCachedSessionProxy(Session target, LinkedList<Session> sess
 		}
 		return (Session) Proxy.newProxyInstance(
 				SessionProxy.class.getClassLoader(),
-				classes.toArray(new Class[classes.size()]),
+				classes.toArray(new Class<?>[classes.size()]),
 				new CachedSessionInvocationHandler(target, sessionList));
 	}
 
@@ -297,9 +298,15 @@ else if (methodName.equals("close")) {
 				if (active) {
 					synchronized (this.sessionList) {
 						if (this.sessionList.size() < getSessionCacheSize()) {
-							logicalClose((Session) proxy);
-							// Remain open in the session list.
-							return null;
+							try {
+								logicalClose((Session) proxy);
+								// Remain open in the session list.
+								return null;
+							}
+							catch (JMSException ex) {
+								logger.trace("Logical close of cached JMS Session failed - discarding it", ex);
+								// Proceed to physical close from here...
+							}
 						}
 					}
 				}
@@ -511,7 +518,7 @@ public ConsumerCacheKey(Destination destination, String selector, boolean noLoca
 		}
 
 		public boolean equals(Object other) {
-			if (other == this) {
+			if (this == other) {
 				return true;
 			}
 			ConsumerCacheKey otherKey = (ConsumerCacheKey) other;
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java
index e01bfec1f0..04d26aa1b5 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ public ConnectionFactory getTargetConnectionFactory() {
 	/**
 	 * Indicate whether Connections obtained from the target factory are supposed
 	 * to be stopped before closed ("true") or simply closed ("false").
-	 * The latter may be necessary for some connection pools that simply return
+	 * An extra stop call may be necessary for some connection pools that simply return
 	 * released connections to the pool, not stopping them while they sit in the pool.
 	 * <p>Default is "false", simply closing Connections.
 	 * @see ConnectionFactoryUtils#releaseConnection
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java
index 1438b7e777..98c4b60a5e 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.jms.connection;
 
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -30,8 +31,10 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.transaction.support.ResourceHolderSupport;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ReflectionUtils;
 
 /**
  * JMS resource holder, wrapping a JMS Connection and a JMS Session.
@@ -183,7 +186,36 @@ public void commitAll() throws JMSException {
 			catch (TransactionInProgressException ex) {
 				// Ignore -> can only happen in case of a JTA transaction.
 			}
-			// Let IllegalStateException through: It might point out an unexpectedly closed session.
+			catch (javax.jms.IllegalStateException ex) {
+				if (this.connectionFactory != null) {
+					try {
+						Method getDataSourceMethod = this.connectionFactory.getClass().getMethod("getDataSource");
+						Object ds = ReflectionUtils.invokeMethod(getDataSourceMethod, this.connectionFactory);
+						while (ds != null) {
+							if (TransactionSynchronizationManager.hasResource(ds)) {
+								// IllegalStateException from sharing the underlying JDBC Connection
+								// which typically gets committed first, e.g. with Oracle AQ --> ignore
+								return;
+							}
+							try {
+								// Check for decorated DataSource a la Spring's DelegatingDataSource
+								Method getTargetDataSourceMethod = ds.getClass().getMethod("getTargetDataSource");
+								ds = ReflectionUtils.invokeMethod(getTargetDataSourceMethod, ds);
+							}
+							catch (NoSuchMethodException nsme) {
+								ds = null;
+							}
+						}
+					}
+					catch (Throwable ex2) {
+						if (logger.isDebugEnabled()) {
+							logger.debug("No working getDataSource method found on ConnectionFactory: " + ex2);
+						}
+						// No working getDataSource method - cannot perform DataSource transaction check
+					}
+				}
+				throw ex;
+			}
 		}
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java
index 28a683c8f5..7d118e66e1 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -173,6 +173,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 		if (definition.getIsolationLevel() != TransactionDefinition.ISOLATION_DEFAULT) {
 			throw new InvalidIsolationLevelException("JMS does not support an isolation level concept");
 		}
+
 		JmsTransactionObject txObject = (JmsTransactionObject) transaction;
 		Connection con = null;
 		Session session = null;
@@ -188,10 +189,17 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 			if (timeout != TransactionDefinition.TIMEOUT_DEFAULT) {
 				txObject.getResourceHolder().setTimeoutInSeconds(timeout);
 			}
-			TransactionSynchronizationManager.bindResource(
-					getConnectionFactory(), txObject.getResourceHolder());
+			TransactionSynchronizationManager.bindResource(getConnectionFactory(), txObject.getResourceHolder());
 		}
-		catch (JMSException ex) {
+		catch (Throwable ex) {
+			if (session != null) {
+				try {
+					session.close();
+				}
+				catch (Throwable ex2) {
+					// ignore
+				}
+			}
 			if (con != null) {
 				try {
 					con.close();
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
index ed298a1c29..619e38f86e 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,9 +73,8 @@
  * @see org.springframework.jms.listener.SimpleMessageListenerContainer
  * @see org.springframework.jms.listener.DefaultMessageListenerContainer#setCacheLevel
  */
-public class SingleConnectionFactory
-		implements ConnectionFactory, QueueConnectionFactory, TopicConnectionFactory, ExceptionListener,
-		InitializingBean, DisposableBean {
+public class SingleConnectionFactory implements ConnectionFactory, QueueConnectionFactory,
+		TopicConnectionFactory, ExceptionListener, InitializingBean, DisposableBean {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
@@ -171,7 +170,7 @@ protected String getClientId() {
 
 	/**
 	 * Specify an JMS ExceptionListener implementation that should be
-	 * registered with with the single Connection created by this factory.
+	 * registered with the single Connection created by this factory.
 	 * @see #setReconnectOnException
 	 */
 	public void setExceptionListener(ExceptionListener exceptionListener) {
@@ -180,7 +179,7 @@ public void setExceptionListener(ExceptionListener exceptionListener) {
 
 	/**
 	 * Return the JMS ExceptionListener implementation that should be registered
-	 * with with the single Connection created by this factory, if any.
+	 * with the single Connection created by this factory, if any.
 	 */
 	protected ExceptionListener getExceptionListener() {
 		return this.exceptionListener;
@@ -307,6 +306,7 @@ public void onException(JMSException ex) {
 	 * The provider of this ConnectionFactory needs to care for proper shutdown.
 	 * <p>As this bean implements DisposableBean, a bean factory will
 	 * automatically invoke this on destruction of its cached singletons.
+	 * @see #resetConnection()
 	 */
 	public void destroy() {
 		resetConnection();
@@ -314,6 +314,7 @@ public void destroy() {
 
 	/**
 	 * Reset the underlying shared Connection, to be reinitialized on next access.
+	 * @see #closeConnection
 	 */
 	public void resetConnection() {
 		synchronized (this.connectionMonitor) {
@@ -384,7 +385,7 @@ protected Session getSession(Connection con, Integer mode) throws JMSException {
 
 	/**
 	 * Create a default Session for this ConnectionFactory,
-	 * adaptign to JMS 1.0.2 style queue/topic mode if necessary.
+	 * adapting to JMS 1.0.2 style queue/topic mode if necessary.
 	 * @param con the JMS Connection to operate on
 	 * @param mode the Session acknowledgement mode
 	 * ({@code Session.TRANSACTED} or one of the common modes)
@@ -443,7 +444,7 @@ protected void closeConnection(Connection con) {
 	 * @return the wrapped Connection
 	 */
 	protected Connection getSharedConnectionProxy(Connection target) {
-		List<Class> classes = new ArrayList<Class>(3);
+		List<Class<?>> classes = new ArrayList<Class<?>>(3);
 		classes.add(Connection.class);
 		if (target instanceof QueueConnection) {
 			classes.add(QueueConnection.class);
@@ -453,7 +454,7 @@ protected Connection getSharedConnectionProxy(Connection target) {
 		}
 		return (Connection) Proxy.newProxyInstance(
 				Connection.class.getClassLoader(),
-				classes.toArray(new Class[classes.size()]),
+				classes.toArray(new Class<?>[classes.size()]),
 				new SharedConnectionInvocationHandler(target));
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
index c2b7ca8a77..a269aa7bb0 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -350,8 +350,8 @@ public boolean isExplicitQosEnabled() {
 	/**
 	 * Set whether message delivery should be persistent or non-persistent,
 	 * specified as boolean value ("true" or "false"). This will set the delivery
-	 * mode accordingly, to either "PERSISTENT" (1) or "NON_PERSISTENT" (2).
-	 * <p>Default it "true" aka delivery mode "PERSISTENT".
+	 * mode accordingly, to either "PERSISTENT" (2) or "NON_PERSISTENT" (1).
+	 * <p>Default is "true" a.k.a. delivery mode "PERSISTENT".
 	 * @see #setDeliveryMode(int)
 	 * @see javax.jms.DeliveryMode#PERSISTENT
 	 * @see javax.jms.DeliveryMode#NON_PERSISTENT
@@ -362,7 +362,7 @@ public void setDeliveryPersistent(boolean deliveryPersistent) {
 
 	/**
 	 * Set the delivery mode to use when sending a message.
-	 * Default is the Message default: "PERSISTENT".
+	 * Default is the JMS Message default: "PERSISTENT".
 	 * <p>Since a default value may be defined administratively,
 	 * this is only used when "isExplicitQosEnabled" equals "true".
 	 * @param deliveryMode the delivery mode to use
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
index 87507c28b7..71c64fc3ff 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractJmsListeningContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@
  * @see #doShutdown()
  */
 public abstract class AbstractJmsListeningContainer extends JmsDestinationAccessor
-		implements SmartLifecycle, BeanNameAware, DisposableBean {
+		implements BeanNameAware, DisposableBean, SmartLifecycle {
 
 	private String clientId;
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
index 120660a985..3ee7716d1b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,19 +31,19 @@
 import org.springframework.util.ErrorHandler;
 
 /**
- * Abstract base class for message listener containers. Can either host
- * a standard JMS {@link javax.jms.MessageListener} or a Spring-specific
- * {@link SessionAwareMessageListener}.
+ * Abstract base class for Spring message listener container implementations.
+ * Can either host a standard JMS {@link javax.jms.MessageListener} or Spring's
+ * {@link SessionAwareMessageListener} for actual message processing.
  *
- * <p>Usually holds a single JMS {@link Connection} that all listeners are
- * supposed to be registered on, which is the standard JMS way of managing
- * listeners. Can alternatively also be used with a fresh Connection per
- * listener, for J2EE-style XA-aware JMS messaging. The actual registration
- * process is up to concrete subclasses.
+ * <p>Usually holds a single JMS {@link Connection} that all listeners are supposed
+ * to be registered on, which is the standard JMS way of managing listener sessions.
+ * Can alternatively also be used with a fresh Connection per listener, for Java EE
+ * style XA-aware JMS messaging. The actual registration process is up to concrete
+ * subclasses.
  *
- * <p><b>NOTE:</b> The default behavior of this message listener container
- * is to <b>never</b> propagate an exception thrown by a message listener up to
- * the JMS provider. Instead, it will log any such exception at the error level.
+ * <p><b>NOTE:</b> The default behavior of this message listener container is to
+ * <b>never</b> propagate an exception thrown by a message listener up to the JMS
+ * provider. Instead, it will log any such exception at the error level.
  * This means that from the perspective of the attendant JMS provider no such
  * listener will ever fail. However, if error handling is necessary, then
  * any implementation of the {@link ErrorHandler} strategy may be provided to
@@ -54,34 +54,50 @@
  * <p>The listener container offers the following message acknowledgment options:
  * <ul>
  * <li>"sessionAcknowledgeMode" set to "AUTO_ACKNOWLEDGE" (default):
- * Automatic message acknowledgment <i>before</i> listener execution;
- * no redelivery in case of exception thrown.
+ * This mode is container-dependent: For {@link DefaultMessageListenerContainer},
+ * it means automatic message acknowledgment <i>before</i> listener execution, with
+ * no redelivery in case of an exception and no redelivery in case of other listener
+ * execution interruptions either. For {@link SimpleMessageListenerContainer},
+ * it means automatic message acknowledgment <i>after</i> listener execution, with
+ * no redelivery in case of a user exception thrown but potential redelivery in case
+ * of the JVM dying during listener execution. In order to consistently arrange for
+ * redelivery with any container variant, consider "CLIENT_ACKNOWLEDGE" mode or -
+ * preferably - setting "sessionTransacted" to "true" instead.
+ * <li>"sessionAcknowledgeMode" set to "DUPS_OK_ACKNOWLEDGE":
+ * <i>Lazy</i> message acknowledgment during ({@link DefaultMessageListenerContainer})
+ * or shortly after ({@link SimpleMessageListenerContainer}) listener execution;
+ * no redelivery in case of a user exception thrown but potential redelivery in case
+ * of the JVM dying during listener execution. In order to consistently arrange for
+ * redelivery with any container variant, consider "CLIENT_ACKNOWLEDGE" mode or -
+ * preferably - setting "sessionTransacted" to "true" instead.
  * <li>"sessionAcknowledgeMode" set to "CLIENT_ACKNOWLEDGE":
  * Automatic message acknowledgment <i>after</i> successful listener execution;
- * no redelivery in case of exception thrown.
- * <li>"sessionAcknowledgeMode" set to "DUPS_OK_ACKNOWLEDGE":
- * <i>Lazy</i> message acknowledgment during or after listener execution;
- * <i>potential redelivery</i> in case of exception thrown.
+ * best-effort redelivery in case of a user exception thrown as well as in case
+ * of other listener execution interruptions (such as the JVM dying).
  * <li>"sessionTransacted" set to "true":
  * Transactional acknowledgment after successful listener execution;
- * <i>guaranteed redelivery</i> in case of exception thrown.
+ * <i>guaranteed redelivery</i> in case of a user exception thrown as well as
+ * in case of other listener execution interruptions (such as the JVM dying).
  * </ul>
- * The exact behavior might vary according to the concrete listener container
- * and JMS provider used.
  *
- * <p>There are two solutions to the duplicate processing problem:
+ * <p>There are two solutions to the duplicate message processing problem:
  * <ul>
  * <li>Either add <i>duplicate message detection</i> to your listener, in the
  * form of a business entity existence check or a protocol table check. This
  * usually just needs to be done in case of the JMSRedelivered flag being
- * set on the incoming message (else just process straightforwardly).
- * <li>Or wrap the <i>entire processing with an XA transaction</i>, covering the
- * reception of the message as well as the execution of the message listener.
- * This is only supported by {@link DefaultMessageListenerContainer}, through
- * specifying a "transactionManager" (typically a
+ * set on the incoming message (otherwise just process straightforwardly).
+ * Note that with "sessionTransacted" set to "true", duplicate messages will
+ * only appear in case of the JVM dying at the most unfortunate point possible
+ * (i.e. after your business logic executed but before the JMS part got committed),
+ * so duplicate message detection is just there to cover a corner case.
+ * <li>Or wrap your <i>entire processing with an XA transaction</i>, covering the
+ * reception of the JMS message as well as the execution of the business logic in
+ * your message listener (including database operations etc). This is only
+ * supported by {@link DefaultMessageListenerContainer}, through specifying
+ * an external "transactionManager" (typically a
  * {@link org.springframework.transaction.jta.JtaTransactionManager}, with
- * a corresponding XA-aware JMS {@link javax.jms.ConnectionFactory} passed in as
- * "connectionFactory").
+ * a corresponding XA-aware JMS {@link javax.jms.ConnectionFactory} passed in
+ * as "connectionFactory").
  * </ul>
  * Note that XA transaction coordination adds significant runtime overhead,
  * so it might be feasible to avoid it unless absolutely necessary.
@@ -97,7 +113,7 @@
  * <li>Alternatively, specify a
  * {@link org.springframework.transaction.jta.JtaTransactionManager} as
  * "transactionManager" for a fully XA-aware JMS provider - typically when
- * running on a J2EE server, but also for other environments with a JTA
+ * running on a Java EE server, but also for other environments with a JTA
  * transaction manager present. This will give full "exactly-once" guarantees
  * without custom duplicate message checks, at the price of additional
  * runtime processing overhead.
@@ -464,6 +480,7 @@ protected void doExecuteListener(Session session, Message message) throws JMSExc
 			rollbackIfNecessary(session);
 			throw new MessageRejectedWhileStoppingException();
 		}
+
 		try {
 			invokeListener(session, message);
 		}
@@ -493,6 +510,7 @@ protected void doExecuteListener(Session session, Message message) throws JMSExc
 	@SuppressWarnings("rawtypes")
 	protected void invokeListener(Session session, Message message) throws JMSException {
 		Object listener = getMessageListener();
+
 		if (listener instanceof SessionAwareMessageListener) {
 			doInvokeListener((SessionAwareMessageListener) listener, session, message);
 		}
@@ -588,9 +606,14 @@ else if (message != null && isClientAcknowledge(session)) {
 	 * @throws javax.jms.JMSException in case of a rollback error
 	 */
 	protected void rollbackIfNecessary(Session session) throws JMSException {
-		if (session.getTransacted() && isSessionLocallyTransacted(session)) {
-			// Transacted session created by this container -> rollback.
-			JmsUtils.rollbackIfNecessary(session);
+		if (session.getTransacted()) {
+			if (isSessionLocallyTransacted(session)) {
+				// Transacted session created by this container -> rollback.
+				JmsUtils.rollbackIfNecessary(session);
+			}
+		}
+		else if (isClientAcknowledge(session)) {
+			session.recover();
 		}
 	}
 
@@ -602,12 +625,17 @@ protected void rollbackIfNecessary(Session session) throws JMSException {
 	 */
 	protected void rollbackOnExceptionIfNecessary(Session session, Throwable ex) throws JMSException {
 		try {
-			if (session.getTransacted() && isSessionLocallyTransacted(session)) {
-				// Transacted session created by this container -> rollback.
-				if (logger.isDebugEnabled()) {
-					logger.debug("Initiating transaction rollback on application exception", ex);
+			if (session.getTransacted()) {
+				if (isSessionLocallyTransacted(session)) {
+					// Transacted session created by this container -> rollback.
+					if (logger.isDebugEnabled()) {
+						logger.debug("Initiating transaction rollback on application exception", ex);
+					}
+					JmsUtils.rollbackIfNecessary(session);
 				}
-				JmsUtils.rollbackIfNecessary(session);
+			}
+			else if (isClientAcknowledge(session)) {
+				session.recover();
 			}
 		}
 		catch (IllegalStateException ex2) {
@@ -692,7 +720,7 @@ protected void invokeErrorHandler(Throwable ex) {
 		if (this.errorHandler != null) {
 			this.errorHandler.handleError(ex);
 		}
-		else if (logger.isWarnEnabled()) {
+		else {
 			logger.warn("Execution of JMS message listener failed, and no ErrorHandler has been set.", ex);
 		}
 	}
@@ -704,7 +732,6 @@ else if (logger.isWarnEnabled()) {
 	 */
 	@SuppressWarnings("serial")
 	private static class MessageRejectedWhileStoppingException extends RuntimeException {
-
 	}
 
 }
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
index de0132dae1..103555490d 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -91,15 +91,24 @@
  * {@code Sessions} and/or the {@code TaskExecutor} does not pool threads (check
  * your configuration!). Note that dynamic scaling only really makes sense for a
  * queue in the first place; for a topic, you will typically stick with the default
- * number of 1 consumer, else you'd receive the same message multiple times on
+ * number of 1 consumer, otherwise you'd receive the same message multiple times on
  * the same node.
  *
+ * <p><b>Note: Don't use Spring's {@link org.springframework.jms.connection.CachingConnectionFactory}
+ * in combination with dynamic scaling.</b> Ideally, don't use it with a message
+ * listener container at all, since it is generally preferable to let the
+ * listener container itself handle appropriate caching within its lifecycle.
+ * Also, stopping and restarting a listener container will only work with an
+ * independent, locally cached Connection - not with an externally cached one.
+ *
  * <p><b>It is strongly recommended to either set {@link #setSessionTransacted
  * "sessionTransacted"} to "true" or specify an external {@link #setTransactionManager
  * "transactionManager"}.</b> See the {@link AbstractMessageListenerContainer}
- * javadoc for details on acknowledge modes and native transaction options,
- * as well as the {@link AbstractPollingMessageListenerContainer} javadoc
- * for details on configuring an external transaction manager.
+ * javadoc for details on acknowledge modes and native transaction options, as
+ * well as the {@link AbstractPollingMessageListenerContainer} javadoc for details
+ * on configuring an external transaction manager. Note that for the default
+ * "AUTO_ACKNOWLEDGE" mode, this container applies automatic message acknowledgment
+ * before listener execution, with no redelivery in case of an exception.
  *
  * @author Juergen Hoeller
  * @since 2.0
@@ -240,10 +249,8 @@ public void setCacheLevelName(String constantName) throws IllegalArgumentExcepti
 	 * transaction in case of a freshly obtained JMS {@code Connection} and {@code Session},
 	 * which is why this listener container by default does not cache any of those.
 	 * However, if you want to optimize for a specific server, consider switching
-	 * this setting to at least {@link #CACHE_CONNECTION} or {@link #CACHE_SESSION} even in
-	 * conjunction with an external transaction manager.
-	 * <p>Currently known servers that absolutely require {@link #CACHE_NONE} for XA
-	 * transaction processing: JBoss 4. For any others, consider raising the cache level.
+	 * this setting to at least {@link #CACHE_CONNECTION} or {@link #CACHE_SESSION}
+	 * even in conjunction with an external transaction manager.
 	 * @see #CACHE_NONE
 	 * @see #CACHE_CONNECTION
 	 * @see #CACHE_SESSION
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
index c3f0f22e59..83bcd774c6 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,11 @@
  * on the JMS provider: Not even the ServerSessionPool facility is required.
  *
  * <p>See the {@link AbstractMessageListenerContainer} javadoc for details
- * on acknowledge modes and transaction options.
+ * on acknowledge modes and transaction options. Note that this container
+ * exposes standard JMS behavior for the default "AUTO_ACKNOWLEDGE" mode:
+ * that is, automatic message acknowledgment after listener execution,
+ * with no redelivery in case of a user exception thrown but potential
+ * redelivery in case of the JVM dying during listener execution.
  *
  * <p>For a different style of MessageListener handling, through looped
  * {@code MessageConsumer.receive()} calls that also allow for
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java
index 0f11609876..def0c7a5ac 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 
 /**
  * Default implementation of the {@link JmsActivationSpecFactory} interface.
- * Supports the standard JMS properties as defined by the JMS 1.5 specification,
+ * Supports the standard JMS properties as defined by the JCA 1.5 specification,
  * as well as Spring's extended "maxConcurrency" and "prefetchSize" settings
  * through autodetection of well-known vendor-specific provider properties.
  *
@@ -72,7 +72,7 @@ public class DefaultJmsActivationSpecFactory extends StandardJmsActivationSpecFa
 	 * "ActiveMQActivationSpec" in the same package, or a class named
 	 * "ActivationSpecImpl" in the same package as the ResourceAdapter class.
 	 */
-	protected Class determineActivationSpecClass(ResourceAdapter adapter) {
+	protected Class<?> determineActivationSpecClass(ResourceAdapter adapter) {
 		String adapterClassName = adapter.getClass().getName();
 
 		if (adapterClassName.endsWith(RESOURCE_ADAPTER_SUFFIX)) {
@@ -156,7 +156,7 @@ else if (bw.isWritableProperty("maxMessages")) {
 				// JORAM
 				bw.setPropertyValue("maxMessages", Integer.toString(config.getPrefetchSize()));
 			}
-			else if(bw.isWritableProperty("maxBatchSize")){
+			else if (bw.isWritableProperty("maxBatchSize")){
 				// WebSphere
 				bw.setPropertyValue("maxBatchSize", Integer.toString(config.getPrefetchSize()));
 			}
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java
index 7263a4c993..58b3977466 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java
@@ -50,7 +50,7 @@
  */
 public class StandardJmsActivationSpecFactory implements JmsActivationSpecFactory {
 
-	private Class activationSpecClass;
+	private Class<?> activationSpecClass;
 
 	private Map<String, String> defaultProperties;
 
@@ -61,7 +61,7 @@ public class StandardJmsActivationSpecFactory implements JmsActivationSpecFactor
 	 * Specify the fully-qualified ActivationSpec class name for the target
 	 * provider (e.g. "org.apache.activemq.ra.ActiveMQActivationSpec").
 	 */
-	public void setActivationSpecClass(Class activationSpecClass) {
+	public void setActivationSpecClass(Class<?> activationSpecClass) {
 		this.activationSpecClass = activationSpecClass;
 	}
 
@@ -92,7 +92,7 @@ public void setDestinationResolver(DestinationResolver destinationResolver) {
 
 
 	public ActivationSpec createActivationSpec(ResourceAdapter adapter, JmsActivationSpecConfig config) {
-		Class activationSpecClassToUse = this.activationSpecClass;
+		Class<?> activationSpecClassToUse = this.activationSpecClass;
 		if (activationSpecClassToUse == null) {
 			activationSpecClassToUse = determineActivationSpecClass(adapter);
 			if (activationSpecClassToUse == null) {
@@ -117,7 +117,7 @@ public ActivationSpec createActivationSpec(ResourceAdapter adapter, JmsActivatio
 	 * if not determinable
 	 * @see #setActivationSpecClass
 	 */
-	protected Class determineActivationSpecClass(ResourceAdapter adapter) {
+	protected Class<?> determineActivationSpecClass(ResourceAdapter adapter) {
 		return null;
 	}
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java
index 80023bc3d0..f6333af8dc 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,7 +86,7 @@ public ConnectionFactory getConnectionFactory() {
 	 * <p>Setting this flag to "true" will use a short local JMS transaction
 	 * when running outside of a managed transaction, and a synchronized local
 	 * JMS transaction in case of a managed transaction (other than an XA
-	 * transaction) being present. The latter has the effect of a local JMS
+	 * transaction) being present. This has the effect of a local JMS
 	 * transaction being managed alongside the main transaction (which might
 	 * be a native JDBC transaction), with the JMS transaction committing
 	 * right after the main transaction.
@@ -109,7 +109,7 @@ public boolean isSessionTransacted() {
 	 * Set the JMS acknowledgement mode by the name of the corresponding constant
 	 * in the JMS {@link Session} interface, e.g. "CLIENT_ACKNOWLEDGE".
 	 * <p>If you want to use vendor-specific extensions to the acknowledgment mode,
-	 * use {@link #setSessionAcknowledgeModeName(String)} instead.
+	 * use {@link #setSessionAcknowledgeMode(int)} instead.
 	 * @param constantName the name of the {@link Session} acknowledge mode constant
 	 * @see javax.jms.Session#AUTO_ACKNOWLEDGE
 	 * @see javax.jms.Session#CLIENT_ACKNOWLEDGE
@@ -125,8 +125,8 @@ public void setSessionAcknowledgeModeName(String constantName) {
 	 * {@link Session} to send a message.
 	 * <p>Default is {@link Session#AUTO_ACKNOWLEDGE}.
 	 * <p>Vendor-specific extensions to the acknowledgment mode can be set here as well.
-	 * <p>Note that that inside an EJB the parameters to
-	 * create(Queue/Topic)Session(boolean transacted, int acknowledgeMode) method
+	 * <p>Note that that inside an EJB, the parameters to the
+	 * {@code create(Queue/Topic)Session(boolean transacted, int acknowledgeMode)} method
 	 * are not taken into account. Depending on the transaction context in the EJB,
 	 * the container makes its own decisions on these values. See section 17.3.5
 	 * of the EJB spec.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
index 880ae9c75c..c9c0cea6f3 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,21 +32,22 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
 /**
  * Message converter that uses the Jackson 2 library to convert messages to and from JSON.
- * Maps an object to a {@link javax.jms.BytesMessage}, or to a {@link javax.jms.TextMessage} if the
- * {@link #setTargetType targetType} is set to {@link org.springframework.jms.support.converter.MessageType#TEXT}.
- * Converts from a {@link javax.jms.TextMessage} or {@link javax.jms.BytesMessage} to an object.
+ * Maps an object to a {@link BytesMessage}, or to a {@link TextMessage} if the
+ * {@link #setTargetType targetType} is set to {@link MessageType#TEXT}.
+ * Converts from a {@link TextMessage} or {@link BytesMessage} to an object.
  *
  * @author Mark Pollack
  * @author Dave Syer
  * @author Juergen Hoeller
  * @since 3.1.4
  */
-public class MappingJackson2MessageConverter implements MessageConverter {
+public class MappingJackson2MessageConverter implements MessageConverter, BeanClassLoaderAware {
 
 	/**
 	 * The default encoding used for writing to text messages: UTF-8.
@@ -68,9 +69,11 @@ public class MappingJackson2MessageConverter implements MessageConverter {
 
 	private Map<Class<?>, String> classIdMappings = new HashMap<Class<?>, String>();
 
+	private ClassLoader beanClassLoader;
+
 
 	/**
-	 * Specify the {@link org.codehaus.jackson.map.ObjectMapper} to use instead of using the default.
+	 * Specify the {@link ObjectMapper} to use instead of using the default.
 	 */
 	public void setObjectMapper(ObjectMapper objectMapper) {
 		Assert.notNull(objectMapper, "ObjectMapper must not be null");
@@ -78,13 +81,13 @@ public void setObjectMapper(ObjectMapper objectMapper) {
 	}
 
 	/**
-	 * Specify whether {@link #toMessage(Object, javax.jms.Session)} should marshal to a
-	 * {@link javax.jms.BytesMessage} or a {@link javax.jms.TextMessage}.
-	 * <p>The default is {@link org.springframework.jms.support.converter.MessageType#BYTES}, i.e. this converter marshals to
-	 * a {@link javax.jms.BytesMessage}. Note that the default version of this converter
-	 * supports {@link org.springframework.jms.support.converter.MessageType#BYTES} and {@link org.springframework.jms.support.converter.MessageType#TEXT} only.
-	 * @see org.springframework.jms.support.converter.MessageType#BYTES
-	 * @see org.springframework.jms.support.converter.MessageType#TEXT
+	 * Specify whether {@link #toMessage(Object, Session)} should marshal to a
+	 * {@link BytesMessage} or a {@link TextMessage}.
+	 * <p>The default is {@link MessageType#BYTES}, i.e. this converter marshals to
+	 * a {@link BytesMessage}. Note that the default version of this converter
+	 * supports {@link MessageType#BYTES} and {@link MessageType#TEXT} only.
+	 * @see MessageType#BYTES
+	 * @see MessageType#TEXT
 	 */
 	public void setTargetType(MessageType targetType) {
 		Assert.notNull(targetType, "MessageType must not be null");
@@ -142,6 +145,10 @@ public void setTypeIdMappings(Map<String, Class<?>> typeIdMappings) {
 		}
 	}
 
+	public void setBeanClassLoader(ClassLoader classLoader) {
+		this.beanClassLoader = classLoader;
+	}
+
 
 	public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
 		Message message;
@@ -176,15 +183,14 @@ public Object fromMessage(Message message) throws JMSException, MessageConversio
 
 
 	/**
-	 * Map the given object to a {@link javax.jms.TextMessage}.
+	 * Map the given object to a {@link TextMessage}.
 	 * @param object the object to be mapped
 	 * @param session current JMS session
 	 * @param objectMapper the mapper to use
 	 * @return the resulting message
-	 * @throws javax.jms.JMSException if thrown by JMS methods
-	 * @throws java.io.IOException in case of I/O errors
-	 * @see javax.jms.Session#createBytesMessage
-	 * @see org.springframework.oxm.Marshaller#marshal(Object, javax.xml.transform.Result)
+	 * @throws JMSException if thrown by JMS methods
+	 * @throws IOException in case of I/O errors
+	 * @see Session#createBytesMessage
 	 */
 	protected TextMessage mapToTextMessage(Object object, Session session, ObjectMapper objectMapper)
 			throws JMSException, IOException {
@@ -195,20 +201,19 @@ protected TextMessage mapToTextMessage(Object object, Session session, ObjectMap
 	}
 
 	/**
-	 * Map the given object to a {@link javax.jms.BytesMessage}.
+	 * Map the given object to a {@link BytesMessage}.
 	 * @param object the object to be mapped
 	 * @param session current JMS session
 	 * @param objectMapper the mapper to use
 	 * @return the resulting message
-	 * @throws javax.jms.JMSException if thrown by JMS methods
-	 * @throws java.io.IOException in case of I/O errors
-	 * @see javax.jms.Session#createBytesMessage
-	 * @see org.springframework.oxm.Marshaller#marshal(Object, javax.xml.transform.Result)
+	 * @throws JMSException if thrown by JMS methods
+	 * @throws IOException in case of I/O errors
+	 * @see Session#createBytesMessage
 	 */
 	protected BytesMessage mapToBytesMessage(Object object, Session session, ObjectMapper objectMapper)
 			throws JMSException, IOException {
 
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
 		OutputStreamWriter writer = new OutputStreamWriter(bos, this.encoding);
 		objectMapper.writeValue(writer, object);
 
@@ -222,22 +227,22 @@ protected BytesMessage mapToBytesMessage(Object object, Session session, ObjectM
 
 	/**
 	 * Template method that allows for custom message mapping.
-	 * Invoked when {@link #setTargetType} is not {@link org.springframework.jms.support.converter.MessageType#TEXT} or
-	 * {@link org.springframework.jms.support.converter.MessageType#BYTES}.
+	 * Invoked when {@link #setTargetType} is not {@link MessageType#TEXT} or
+	 * {@link MessageType#BYTES}.
 	 * <p>The default implementation throws an {@link IllegalArgumentException}.
 	 * @param object the object to marshal
 	 * @param session the JMS Session
 	 * @param objectMapper the mapper to use
 	 * @param targetType the target message type (other than TEXT or BYTES)
 	 * @return the resulting message
-	 * @throws javax.jms.JMSException if thrown by JMS methods
-	 * @throws java.io.IOException in case of I/O errors
+	 * @throws JMSException if thrown by JMS methods
+	 * @throws IOException in case of I/O errors
 	 */
 	protected Message mapToMessage(Object object, Session session, ObjectMapper objectMapper, MessageType targetType)
 			throws JMSException, IOException {
 
 		throw new IllegalArgumentException("Unsupported message type [" + targetType +
-				"]. MappingJacksonMessageConverter by default only supports TextMessages and BytesMessages.");
+				"]. MappingJackson2MessageConverter by default only supports TextMessages and BytesMessages.");
 	}
 
 	/**
@@ -247,7 +252,7 @@ protected Message mapToMessage(Object object, Session session, ObjectMapper obje
 	 * into the configured type id message property.
 	 * @param object the payload object to set a type id for
 	 * @param message the JMS Message to set the type id on
-	 * @throws javax.jms.JMSException if thrown by JMS methods
+	 * @throws JMSException if thrown by JMS methods
 	 * @see #getJavaTypeForMessage(javax.jms.Message)
 	 * @see #setTypeIdPropertyName(String)
 	 * @see #setTypeIdMappings(java.util.Map)
@@ -283,8 +288,8 @@ else if (message instanceof BytesMessage) {
 	 * @param message the input message
 	 * @param targetJavaType the target type
 	 * @return the message converted to an object
-	 * @throws javax.jms.JMSException if thrown by JMS
-	 * @throws java.io.IOException in case of I/O errors
+	 * @throws JMSException if thrown by JMS
+	 * @throws IOException in case of I/O errors
 	 */
 	protected Object convertFromTextMessage(TextMessage message, JavaType targetJavaType)
 			throws JMSException, IOException {
@@ -298,8 +303,8 @@ protected Object convertFromTextMessage(TextMessage message, JavaType targetJava
 	 * @param message the input message
 	 * @param targetJavaType the target type
 	 * @return the message converted to an object
-	 * @throws javax.jms.JMSException if thrown by JMS
-	 * @throws java.io.IOException in case of I/O errors
+	 * @throws JMSException if thrown by JMS
+	 * @throws IOException in case of I/O errors
 	 */
 	protected Object convertFromBytesMessage(BytesMessage message, JavaType targetJavaType)
 			throws JMSException, IOException {
@@ -321,14 +326,14 @@ protected Object convertFromBytesMessage(BytesMessage message, JavaType targetJa
 
 	/**
 	 * Template method that allows for custom message mapping.
-	 * Invoked when {@link #setTargetType} is not {@link org.springframework.jms.support.converter.MessageType#TEXT} or
-	 * {@link org.springframework.jms.support.converter.MessageType#BYTES}.
+	 * Invoked when {@link #setTargetType} is not {@link MessageType#TEXT} or
+	 * {@link MessageType#BYTES}.
 	 * <p>The default implementation throws an {@link IllegalArgumentException}.
 	 * @param message the input message
 	 * @param targetJavaType the target type
 	 * @return the message converted to an object
-	 * @throws javax.jms.JMSException if thrown by JMS
-	 * @throws java.io.IOException in case of I/O errors
+	 * @throws JMSException if thrown by JMS
+	 * @throws IOException in case of I/O errors
 	 */
 	protected Object convertFromMessage(Message message, JavaType targetJavaType)
 			throws JMSException, IOException {
@@ -344,7 +349,7 @@ protected Object convertFromMessage(Message message, JavaType targetJavaType)
 	 * and consults the configured type id mapping. This can be overridden with
 	 * a different strategy, e.g. doing some heuristics based on message origin.
 	 * @param message the JMS Message to set the type id on
-	 * @throws javax.jms.JMSException if thrown by JMS methods
+	 * @throws JMSException if thrown by JMS methods
 	 * @see #setTypeIdOnMessage(Object, javax.jms.Message)
 	 * @see #setTypeIdPropertyName(String)
 	 * @see #setTypeIdMappings(java.util.Map)
@@ -354,13 +359,13 @@ protected JavaType getJavaTypeForMessage(Message message) throws JMSException {
 		if (typeId == null) {
 			throw new MessageConversionException("Could not find type id property [" + this.typeIdPropertyName + "]");
 		}
-		Class mappedClass = this.idClassMappings.get(typeId);
+		Class<?> mappedClass = this.idClassMappings.get(typeId);
 		if (mappedClass != null) {
 			return this.objectMapper.getTypeFactory().constructType(mappedClass);
 		}
 		try {
-			return this.objectMapper.getTypeFactory().constructType(
-					ClassUtils.forName(typeId, getClass().getClassLoader()));
+			Class<?> typeClass = ClassUtils.forName(typeId, this.beanClassLoader);
+			return this.objectMapper.getTypeFactory().constructType(typeClass);
 		}
 		catch (Throwable ex) {
 			throw new MessageConversionException("Failed to resolve type id [" + typeId + "]", ex);
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java
index 091e5fc4a3..759e5f0c37 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJacksonMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,18 +28,17 @@
 import javax.jms.Message;
 import javax.jms.Session;
 import javax.jms.TextMessage;
-import javax.xml.transform.Result;
 
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.type.TypeFactory;
 import org.codehaus.jackson.type.JavaType;
 
-import org.springframework.oxm.Marshaller;
+import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
 /**
- * Message converter that uses the Jackson library to convert messages to and from JSON.
+ * Message converter that uses Jackson 1.x to convert messages to and from JSON.
  * Maps an object to a {@link BytesMessage}, or to a {@link TextMessage} if the
  * {@link #setTargetType targetType} is set to {@link MessageType#TEXT}.
  * Converts from a {@link TextMessage} or {@link BytesMessage} to an object.
@@ -49,7 +48,7 @@
  * @author Juergen Hoeller
  * @since 3.1
  */
-public class MappingJacksonMessageConverter implements MessageConverter {
+public class MappingJacksonMessageConverter implements MessageConverter, BeanClassLoaderAware {
 
 	/**
 	 * The default encoding used for writing to text messages: UTF-8.
@@ -71,6 +70,8 @@ public class MappingJacksonMessageConverter implements MessageConverter {
 
 	private Map<Class<?>, String> classIdMappings = new HashMap<Class<?>, String>();
 
+	private ClassLoader beanClassLoader;
+
 
 	/**
 	 * Specify the {@link ObjectMapper} to use instead of using the default.
@@ -145,6 +146,10 @@ public void setTypeIdMappings(Map<String, Class<?>> typeIdMappings) {
 		}
 	}
 
+	public void setBeanClassLoader(ClassLoader classLoader) {
+		this.beanClassLoader = classLoader;
+	}
+
 
 	public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
 		Message message;
@@ -187,7 +192,6 @@ public Object fromMessage(Message message) throws JMSException, MessageConversio
 	 * @throws JMSException if thrown by JMS methods
 	 * @throws IOException in case of I/O errors
 	 * @see Session#createBytesMessage
-	 * @see Marshaller#marshal(Object, Result)
 	 */
 	protected TextMessage mapToTextMessage(Object object, Session session, ObjectMapper objectMapper)
 			throws JMSException, IOException {
@@ -206,12 +210,11 @@ protected TextMessage mapToTextMessage(Object object, Session session, ObjectMap
 	 * @throws JMSException if thrown by JMS methods
 	 * @throws IOException in case of I/O errors
 	 * @see Session#createBytesMessage
-	 * @see Marshaller#marshal(Object, Result)
 	 */
 	protected BytesMessage mapToBytesMessage(Object object, Session session, ObjectMapper objectMapper)
 			throws JMSException, IOException {
 
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
 		OutputStreamWriter writer = new OutputStreamWriter(bos, this.encoding);
 		objectMapper.writeValue(writer, object);
 
@@ -357,12 +360,13 @@ protected JavaType getJavaTypeForMessage(Message message) throws JMSException {
 		if (typeId == null) {
 			throw new MessageConversionException("Could not find type id property [" + this.typeIdPropertyName + "]");
 		}
-		Class mappedClass = this.idClassMappings.get(typeId);
+		Class<?> mappedClass = this.idClassMappings.get(typeId);
 		if (mappedClass != null) {
 			return TypeFactory.type(mappedClass);
 		}
 		try {
-			return TypeFactory.type(ClassUtils.forName(typeId, getClass().getClassLoader()));
+			Class<?> typeClass = ClassUtils.forName(typeId, this.beanClassLoader);
+			return TypeFactory.type(typeClass);
 		}
 		catch (Throwable ex) {
 			throw new MessageConversionException("Failed to resolve type id [" + typeId + "]", ex);
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
index 9378d21c47..963f2d9293 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -228,7 +228,7 @@ protected TextMessage marshalToTextMessage(Object object, Session session, Marsh
 	protected BytesMessage marshalToBytesMessage(Object object, Session session, Marshaller marshaller)
 			throws JMSException, IOException, XmlMappingException {
 
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
 		StreamResult streamResult = new StreamResult(bos);
 		marshaller.marshal(object, streamResult);
 		BytesMessage message = session.createBytesMessage();
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java
index 190d55cf5e..961d10abaf 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,6 +28,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
@@ -43,6 +45,7 @@ public class MappingJacksonMessageConverterTests {
 
 	private Session sessionMock;
 
+
 	@Before
 	public void setUp() throws Exception {
 		sessionMock = mock(Session.class);
@@ -51,22 +54,22 @@ public void setUp() throws Exception {
 		converter.setTypeIdPropertyName("__typeid__");
 	}
 
+
 	@Test
 	public void toBytesMessage() throws Exception {
 		BytesMessage bytesMessageMock = mock(BytesMessage.class);
-		Object toBeMarshalled = new Object();
+		Date toBeMarshalled = new Date();
 
 		given(sessionMock.createBytesMessage()).willReturn(bytesMessageMock);
 
 		converter.toMessage(toBeMarshalled, sessionMock);
 
 		verify(bytesMessageMock).setStringProperty("__encoding__", "UTF-8");
-		verify(bytesMessageMock).setStringProperty("__typeid__", Object.class.getName());
+		verify(bytesMessageMock).setStringProperty("__typeid__", Date.class.getName());
 		verify(bytesMessageMock).writeBytes(isA(byte[].class));
 	}
 
 	@Test
-	@SuppressWarnings("serial")
 	public void fromBytesMessage() throws Exception {
 		BytesMessage bytesMessageMock = mock(BytesMessage.class);
 		Map<String, String> unmarshalled = Collections.singletonMap("foo", "bar");
@@ -74,13 +77,11 @@ public void fromBytesMessage() throws Exception {
 		byte[] bytes = "{\"foo\":\"bar\"}".getBytes();
 		final ByteArrayInputStream byteStream = new ByteArrayInputStream(bytes);
 
-		given(bytesMessageMock.getStringProperty("__typeid__")).willReturn(
-				Object.class.getName());
+		given(bytesMessageMock.getStringProperty("__typeid__")).willReturn(Object.class.getName());
 		given(bytesMessageMock.propertyExists("__encoding__")).willReturn(false);
 		given(bytesMessageMock.getBodyLength()).willReturn(new Long(bytes.length));
 		given(bytesMessageMock.readBytes(any(byte[].class))).willAnswer(
 				new Answer<Integer>() {
-
 					@Override
 					public Integer answer(InvocationOnMock invocation) throws Throwable {
 						return byteStream.read((byte[]) invocation.getArguments()[0]);
@@ -95,13 +96,12 @@ public Integer answer(InvocationOnMock invocation) throws Throwable {
 	public void toTextMessageWithObject() throws Exception {
 		converter.setTargetType(MessageType.TEXT);
 		TextMessage textMessageMock = mock(TextMessage.class);
-		Object toBeMarshalled = new Object();
+		Date toBeMarshalled = new Date();
 
-		given(sessionMock.createTextMessage(isA(String.class))).willReturn(
-				textMessageMock);
+		given(sessionMock.createTextMessage(isA(String.class))).willReturn(textMessageMock);
 
 		converter.toMessage(toBeMarshalled, sessionMock);
-		verify(textMessageMock).setStringProperty("__typeid__", Object.class.getName());
+		verify(textMessageMock).setStringProperty("__typeid__", Date.class.getName());
 	}
 
 	@Test
@@ -110,11 +110,10 @@ public void toTextMessageWithMap() throws Exception {
 		TextMessage textMessageMock = mock(TextMessage.class);
 		Map<String, String> toBeMarshalled = new HashMap<String, String>();
 		toBeMarshalled.put("foo", "bar");
-		given(sessionMock.createTextMessage(isA(String.class))).willReturn(
-				textMessageMock);
 
-		converter.toMessage(toBeMarshalled, sessionMock);
+		given(sessionMock.createTextMessage(isA(String.class))).willReturn(textMessageMock);
 
+		converter.toMessage(toBeMarshalled, sessionMock);
 		verify(textMessageMock).setStringProperty("__typeid__", HashMap.class.getName());
 	}
 
@@ -124,8 +123,7 @@ public void fromTextMessageAsObject() throws Exception {
 		Map<String, String> unmarshalled = Collections.singletonMap("foo", "bar");
 
 		String text = "{\"foo\":\"bar\"}";
-		given(textMessageMock.getStringProperty("__typeid__")).willReturn(
-				Object.class.getName());
+		given(textMessageMock.getStringProperty("__typeid__")).willReturn(Object.class.getName());
 		given(textMessageMock.getText()).willReturn(text);
 
 		Object result = converter.fromMessage(textMessageMock);
@@ -138,11 +136,11 @@ public void fromTextMessageAsMap() throws Exception {
 		Map<String, String> unmarshalled = Collections.singletonMap("foo", "bar");
 
 		String text = "{\"foo\":\"bar\"}";
-		given(textMessageMock.getStringProperty("__typeid__")).willReturn(
-				HashMap.class.getName());
+		given(textMessageMock.getStringProperty("__typeid__")).willReturn(HashMap.class.getName());
 		given(textMessageMock.getText()).willReturn(text);
 
 		Object result = converter.fromMessage(textMessageMock);
 		assertEquals("Invalid result", result, unmarshalled);
 	}
+
 }
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java
index 5871bb8a87..f47c08411c 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,16 +81,19 @@
  * transaction. The DataSource that Hibernate uses needs to be JTA-enabled in
  * such a scenario (see container setup).
  *
- * <p>On JDBC 3.0, this transaction manager supports nested transactions via JDBC 3.0
- * Savepoints. The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"}
- * flag defaults to "false", though, as nested transactions will just apply to the
- * JDBC Connection, not to the Hibernate Session and its cached objects. You can
- * manually set the flag to "true" if you want to use nested transactions for
- * JDBC access code which participates in Hibernate transactions (provided that
+ * <p>This transaction manager supports nested transactions via JDBC 3.0 Savepoints.
+ * The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"} flag defaults
+ * to "false", though, as nested transactions will just apply to the JDBC Connection,
+ * not to the Hibernate Session and its cached entity objects and related context.
+ * You can manually set the flag to "true" if you want to use nested transactions
+ * for JDBC access code which participates in Hibernate transactions (provided that
  * your JDBC driver supports Savepoints). <i>Note that Hibernate itself does not
  * support nested transactions! Hence, do not expect Hibernate access code to
  * semantically participate in a nested transaction.</i>
  *
+ * <p><b>NOTE: Hibernate 4.2+ is strongly recommended for efficient transaction
+ * management with Spring, in particular for transactional Spring JDBC access.</b>
+ *
  * @author Juergen Hoeller
  * @since 3.1
  * @see #setSessionFactory
@@ -278,9 +281,7 @@ public void setEntityInterceptorBeanName(String entityInterceptorBeanName) {
 	 * Will get applied to any new Session created by this transaction manager.
 	 * <p>Such an interceptor can either be set at the SessionFactory level,
 	 * i.e. on LocalSessionFactoryBean, or at the Session level, i.e. on
-	 * HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
-	 * It's preferable to set it on LocalSessionFactoryBean or HibernateTransactionManager
-	 * to avoid repeated configuration and guarantee consistent behavior in transactions.
+	 * HibernateTransactionManager.
 	 * @see LocalSessionFactoryBean#setEntityInterceptor
 	 */
 	public void setEntityInterceptor(Interceptor entityInterceptor) {
@@ -436,7 +437,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 					throw new InvalidIsolationLevelException(
 							"HibernateTransactionManager is not allowed to support custom isolation levels: " +
 							"make sure that its 'prepareConnection' flag is on (the default) and that the " +
-							"Hibernate connection release mode is set to 'on_close' (SpringTransactionFactory's default).");
+							"Hibernate connection release mode is set to 'on_close' (the default for JDBC).");
 				}
 				if (logger.isDebugEnabled()) {
 					logger.debug("Not preparing JDBC Connection of Hibernate Session [" + session + "]");
@@ -451,7 +452,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 			if (!definition.isReadOnly() && !txObject.isNewSession()) {
 				// We need AUTO or COMMIT for a non-read-only transaction.
 				FlushMode flushMode = session.getFlushMode();
-				if (FlushMode.isManualFlushMode(session.getFlushMode())) {
+				if (FlushMode.isManualFlushMode(flushMode)) {
 					session.setFlushMode(FlushMode.AUTO);
 					txObject.getSessionHolder().setPreviousFlushMode(flushMode);
 				}
@@ -497,7 +498,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 			txObject.getSessionHolder().setSynchronizedWithTransaction(true);
 		}
 
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			if (txObject.isNewSession()) {
 				try {
 					if (session.getTransaction().isActive()) {
@@ -509,6 +510,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 				}
 				finally {
 					SessionFactoryUtils.closeSession(session);
+					txObject.setSessionHolder(null);
 				}
 			}
 			throw new CannotCreateTransactionException("Could not open Hibernate Session for transaction", ex);
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
index f281415008..b29682f3ba 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,10 +43,14 @@
  * Hibernate SessionFactory in a Spring application context; the SessionFactory can
  * then be passed to Hibernate-based data access objects via dependency injection.
  *
- * <p><b>NOTE:</b> This variant of LocalSessionFactoryBean requires Hibernate 4.0 or higher.
- * It is similar in role to the same-named class in the {@code orm.hibernate3} package.
- * However, in practice, it is closer to {@code AnnotationSessionFactoryBean} since
- * its core purpose is to bootstrap a {@code SessionFactory} from annotation scanning.
+ * <p><b>This variant of LocalSessionFactoryBean requires Hibernate 4.0 or higher.</b>
+ * Note that this version is not compatible with the (the quite refactored) Hibernate
+ * 4.3 yet; please upgrade to the Spring 4.0 line for full Hibernate 4.3 support.
+ * We recommend using this version with the latest Hibernate 4.1.x or 4.2.x releases.
+ *
+ * <p>This class is similar in role to the same-named class in the {@code orm.hibernate3}
+ * package. However, in practice, it is closer to {@code AnnotationSessionFactoryBean}
+ * since its core purpose is to bootstrap a {@code SessionFactory} from package scanning.
  *
  * <p><b>NOTE:</b> To set up Hibernate 4 for Spring-driven JTA transactions, make
  * sure to either specify the {@link #setJtaTransactionManager "jtaTransactionManager"}
@@ -126,7 +130,7 @@ public void setConfigLocation(Resource configLocation) {
 	 * resources are specified locally via this bean.
 	 * @see org.hibernate.cfg.Configuration#configure(java.net.URL)
 	 */
-	public void setConfigLocations(Resource[] configLocations) {
+	public void setConfigLocations(Resource... configLocations) {
 		this.configLocations = configLocations;
 	}
 
@@ -140,7 +144,7 @@ public void setConfigLocations(Resource[] configLocations) {
 	 * @see #setMappingLocations
 	 * @see org.hibernate.cfg.Configuration#addResource
 	 */
-	public void setMappingResources(String[] mappingResources) {
+	public void setMappingResources(String... mappingResources) {
 		this.mappingResources = mappingResources;
 	}
 
@@ -153,7 +157,7 @@ public void setMappingResources(String[] mappingResources) {
 	 * or to specify all mappings locally.
 	 * @see org.hibernate.cfg.Configuration#addInputStream
 	 */
-	public void setMappingLocations(Resource[] mappingLocations) {
+	public void setMappingLocations(Resource... mappingLocations) {
 		this.mappingLocations = mappingLocations;
 	}
 
@@ -166,7 +170,7 @@ public void setMappingLocations(Resource[] mappingLocations) {
 	 * or to specify all mappings locally.
 	 * @see org.hibernate.cfg.Configuration#addCacheableFile(java.io.File)
 	 */
-	public void setCacheableMappingLocations(Resource[] cacheableMappingLocations) {
+	public void setCacheableMappingLocations(Resource... cacheableMappingLocations) {
 		this.cacheableMappingLocations = cacheableMappingLocations;
 	}
 
@@ -177,7 +181,7 @@ public void setCacheableMappingLocations(Resource[] cacheableMappingLocations) {
 	 * or to specify all mappings locally.
 	 * @see org.hibernate.cfg.Configuration#addJar(java.io.File)
 	 */
-	public void setMappingJarLocations(Resource[] mappingJarLocations) {
+	public void setMappingJarLocations(Resource... mappingJarLocations) {
 		this.mappingJarLocations = mappingJarLocations;
 	}
 
@@ -188,7 +192,7 @@ public void setMappingJarLocations(Resource[] mappingJarLocations) {
 	 * or to specify all mappings locally.
 	 * @see org.hibernate.cfg.Configuration#addDirectory(java.io.File)
 	 */
-	public void setMappingDirectoryLocations(Resource[] mappingDirectoryLocations) {
+	public void setMappingDirectoryLocations(Resource... mappingDirectoryLocations) {
 		this.mappingDirectoryLocations = mappingDirectoryLocations;
 	}
 
@@ -237,7 +241,7 @@ public Properties getHibernateProperties() {
 	 * Specify annotated entity classes to register with this Hibernate SessionFactory.
 	 * @see org.hibernate.cfg.Configuration#addAnnotatedClass(Class)
 	 */
-	public void setAnnotatedClasses(Class<?>[] annotatedClasses) {
+	public void setAnnotatedClasses(Class<?>... annotatedClasses) {
 		this.annotatedClasses = annotatedClasses;
 	}
 
@@ -246,7 +250,7 @@ public void setAnnotatedClasses(Class<?>[] annotatedClasses) {
 	 * annotation metadata will be read.
 	 * @see org.hibernate.cfg.Configuration#addPackage(String)
 	 */
-	public void setAnnotatedPackages(String[] annotatedPackages) {
+	public void setAnnotatedPackages(String... annotatedPackages) {
 		this.annotatedPackages = annotatedPackages;
 	}
 
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java
index b0aac2d2bb..3122cd30ec 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,6 +54,11 @@
  * <p>This is designed for programmatic use, e.g. in {@code @Bean} factory methods.
  * Consider using {@link LocalSessionFactoryBean} for XML bean definition files.
  *
+ * <p><b>Requires Hibernate 4.0 or higher.</b> Note that this version is not
+ * compatible with the (the quite refactored) Hibernate 4.3 yet; please upgrade
+ * to the Spring 4.0 line for full Hibernate 4.3 support. We recommend using
+ * this version with the latest Hibernate 4.1.x or 4.2.x releases.
+ *
  * <p><b>NOTE:</b> To set up Hibernate 4 for Spring-driven JTA transactions, make
  * sure to either use the {@link #setJtaTransactionManager} method or to set the
  * "hibernate.transaction.factory_class" property to {@link CMTTransactionFactory}.
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionContext.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionContext.java
index 1a5c4bd678..da6387cd0e 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionContext.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,8 +70,8 @@ public Session currentSession() throws HibernateException {
 		else if (value instanceof SessionHolder) {
 			SessionHolder sessionHolder = (SessionHolder) value;
 			Session session = sessionHolder.getSession();
-			if (TransactionSynchronizationManager.isSynchronizationActive() &&
-					!sessionHolder.isSynchronizedWithTransaction()) {
+			if (!sessionHolder.isSynchronizedWithTransaction() &&
+					TransactionSynchronizationManager.isSynchronizationActive()) {
 				TransactionSynchronizationManager.registerSynchronization(
 						new SpringSessionSynchronization(sessionHolder, this.sessionFactory));
 				sessionHolder.setSynchronizedWithTransaction(true);
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/AsyncRequestInterceptor.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/AsyncRequestInterceptor.java
new file mode 100644
index 0000000000..30875ce321
--- /dev/null
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/AsyncRequestInterceptor.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.orm.hibernate4.support;
+
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hibernate.SessionFactory;
+import org.springframework.orm.hibernate4.SessionFactoryUtils;
+import org.springframework.orm.hibernate4.SessionHolder;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.context.request.async.CallableProcessingInterceptorAdapter;
+import org.springframework.web.context.request.async.DeferredResult;
+import org.springframework.web.context.request.async.DeferredResultProcessingInterceptor;
+
+import java.util.concurrent.Callable;
+
+/**
+ * An interceptor with asynchronous web requests used in OpenSessionInViewFilter and
+ * OpenSessionInViewInterceptor.
+ *
+ * Ensures the following:
+ * 1) The session is bound/unbound when "callable processing" is started
+ * 2) The session is closed if an async request times out
+ *
+ * @author Rossen Stoyanchev
+ * @since 3.2.5
+ */
+public class AsyncRequestInterceptor extends CallableProcessingInterceptorAdapter
+		implements DeferredResultProcessingInterceptor {
+
+	private static final Log logger = LogFactory.getLog(AsyncRequestInterceptor.class);
+
+	private final SessionFactory sessionFactory;
+
+	private final SessionHolder sessionHolder;
+
+	private volatile boolean timeoutInProgress;
+
+
+	public AsyncRequestInterceptor(SessionFactory sessionFactory, SessionHolder sessionHolder) {
+		this.sessionFactory = sessionFactory;
+		this.sessionHolder = sessionHolder;
+	}
+
+
+	@Override
+	public <T> void preProcess(NativeWebRequest request, Callable<T> task) {
+		bindSession();
+	}
+
+	public void bindSession() {
+		this.timeoutInProgress = false;
+		TransactionSynchronizationManager.bindResource(this.sessionFactory, this.sessionHolder);
+	}
+
+	@Override
+	public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) {
+		TransactionSynchronizationManager.unbindResource(this.sessionFactory);
+	}
+
+	@Override
+	public <T> Object handleTimeout(NativeWebRequest request, Callable<T> task) {
+		this.timeoutInProgress = true;
+		return RESULT_NONE; // give other interceptors a chance to handle the timeout
+	}
+
+	@Override
+	public <T> void afterCompletion(NativeWebRequest request, Callable<T> task) throws Exception {
+		closeAfterTimeout();
+	}
+
+	private void closeAfterTimeout() {
+		if (this.timeoutInProgress) {
+			logger.debug("Closing Hibernate Session after async request timeout");
+			SessionFactoryUtils.closeSession(sessionHolder.getSession());
+		}
+	}
+
+
+	// Implementation of DeferredResultProcessingInterceptor methods
+
+	public <T> void beforeConcurrentHandling(NativeWebRequest request, DeferredResult<T> deferredResult) {
+	}
+
+	public <T> void preProcess(NativeWebRequest request, DeferredResult<T> deferredResult) {
+	}
+
+	public <T> void postProcess(NativeWebRequest request, DeferredResult<T> deferredResult, Object result) {
+	}
+
+	@Override
+	public <T> boolean handleTimeout(NativeWebRequest request, DeferredResult<T> deferredResult) {
+		this.timeoutInProgress = true;
+		return true; // give other interceptors a chance to handle the timeout
+	}
+
+	@Override
+	public <T> void afterCompletion(NativeWebRequest request, DeferredResult<T> deferredResult) {
+		closeAfterTimeout();
+	}
+
+}
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewFilter.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewFilter.java
index 0045a5d3f8..d8a5a0b306 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewFilter.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
 package org.springframework.orm.hibernate4.support;
 
 import java.io.IOException;
-import java.util.concurrent.Callable;
-
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -28,13 +26,12 @@
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.orm.hibernate4.SessionFactoryUtils;
 import org.springframework.orm.hibernate4.SessionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.async.CallableProcessingInterceptorAdapter;
 import org.springframework.web.context.request.async.WebAsyncManager;
 import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -66,9 +63,7 @@
  *
  * <p>Looks up the SessionFactory in Spring's root web application context.
  * Supports a "sessionFactoryBeanName" filter init-param in {@code web.xml};
- * the default bean name is "sessionFactory". Looks up the SessionFactory on each
- * request, to avoid initialization order issues (when using ContextLoaderServlet,
- * the root application context will get initialized <i>after</i> this filter).
+ * the default bean name is "sessionFactory".
  *
  * @author Juergen Hoeller
  * @since 3.1
@@ -76,6 +71,7 @@
  * @see OpenSessionInViewInterceptor
  * @see org.springframework.orm.hibernate4.HibernateTransactionManager
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
+ * @see org.hibernate.SessionFactory#getCurrentSession()
  */
 public class OpenSessionInViewFilter extends OncePerRequestFilter {
 
@@ -143,8 +139,9 @@ protected void doFilterInternal(
 				SessionHolder sessionHolder = new SessionHolder(session);
 				TransactionSynchronizationManager.bindResource(sessionFactory, sessionHolder);
 
-				asyncManager.registerCallableInterceptor(key,
-						new SessionBindingCallableInterceptor(sessionFactory, sessionHolder));
+				AsyncRequestInterceptor interceptor = new AsyncRequestInterceptor(sessionFactory, sessionHolder);
+				asyncManager.registerCallableInterceptor(key, interceptor);
+				asyncManager.registerDeferredResultInterceptor(key, interceptor);
 			}
 		}
 
@@ -193,9 +190,8 @@ protected SessionFactory lookupSessionFactory() {
 
 	/**
 	 * Open a Session for the SessionFactory that this filter uses.
-	 * <p>The default implementation delegates to the
-	 * {@code SessionFactory.openSession} method and
-	 * sets the {@code Session}'s flush mode to "MANUAL".
+	 * <p>The default implementation delegates to the {@link SessionFactory#openSession}
+	 * method and sets the {@link Session}'s flush mode to "MANUAL".
 	 * @param sessionFactory the SessionFactory that this filter uses
 	 * @return the Session to use
 	 * @throws DataAccessResourceFailureException if the Session could not be created
@@ -216,37 +212,8 @@ private boolean applySessionBindingInterceptor(WebAsyncManager asyncManager, Str
 		if (asyncManager.getCallableInterceptor(key) == null) {
 			return false;
 		}
-		((SessionBindingCallableInterceptor) asyncManager.getCallableInterceptor(key)).initializeThread();
+		((AsyncRequestInterceptor) asyncManager.getCallableInterceptor(key)).bindSession();
 		return true;
 	}
 
-
-	/**
-	 * Bind and unbind the Hibernate {@code Session} to the current thread.
-	 */
-	private static class SessionBindingCallableInterceptor extends CallableProcessingInterceptorAdapter {
-
-		private final SessionFactory sessionFactory;
-
-		private final SessionHolder sessionHolder;
-
-		public SessionBindingCallableInterceptor(SessionFactory sessionFactory, SessionHolder sessionHolder) {
-			this.sessionFactory = sessionFactory;
-			this.sessionHolder = sessionHolder;
-		}
-
-		@Override
-		public <T> void preProcess(NativeWebRequest request, Callable<T> task) {
-			initializeThread();
-		}
-
-		@Override
-		public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) {
-			TransactionSynchronizationManager.unbindResource(this.sessionFactory);
-		}
-
-		private void initializeThread() {
-			TransactionSynchronizationManager.bindResource(this.sessionFactory, this.sessionHolder);
-		}
-	}
 }
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java
index 8994255e75..f12ff9dffe 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,13 @@
 
 package org.springframework.orm.hibernate4.support;
 
-import java.util.concurrent.Callable;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.orm.hibernate4.SessionFactoryUtils;
@@ -31,9 +30,7 @@
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.context.request.AsyncWebRequestInterceptor;
-import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.context.request.async.CallableProcessingInterceptorAdapter;
 import org.springframework.web.context.request.async.WebAsyncManager;
 import org.springframework.web.context.request.async.WebAsyncUtils;
 
@@ -65,6 +62,7 @@
  * @see OpenSessionInViewFilter
  * @see org.springframework.orm.hibernate4.HibernateTransactionManager
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
+ * @see org.hibernate.SessionFactory#getCurrentSession()
  */
 public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor {
 
@@ -81,22 +79,26 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 	private SessionFactory sessionFactory;
 
 
+	/**
+	 * Set the Hibernate SessionFactory that should be used to create Hibernate Sessions.
+	 */
 	public void setSessionFactory(SessionFactory sessionFactory) {
 		this.sessionFactory = sessionFactory;
 	}
 
+	/**
+	 * Return the Hibernate SessionFactory that should be used to create Hibernate Sessions.
+	 */
 	public SessionFactory getSessionFactory() {
 		return this.sessionFactory;
 	}
 
 
 	/**
-	 * Open a new Hibernate {@code Session} according to the settings of this
-	 * {@code HibernateAccessor} and bind it to the thread via the
+	 * Open a new Hibernate {@code Session} according and bind it to the thread via the
 	 * {@link org.springframework.transaction.support.TransactionSynchronizationManager}.
 	 */
 	public void preHandle(WebRequest request) throws DataAccessException {
-
 		String participateAttributeName = getParticipateAttributeName();
 
 		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
@@ -118,8 +120,10 @@ public void preHandle(WebRequest request) throws DataAccessException {
 			SessionHolder sessionHolder = new SessionHolder(session);
 			TransactionSynchronizationManager.bindResource(getSessionFactory(), sessionHolder);
 
-			asyncManager.registerCallableInterceptor(participateAttributeName,
-					new SessionBindingCallableInterceptor(sessionHolder));
+			AsyncRequestInterceptor asyncRequestInterceptor =
+					new AsyncRequestInterceptor(getSessionFactory(), sessionHolder);
+			asyncManager.registerCallableInterceptor(participateAttributeName, asyncRequestInterceptor);
+			asyncManager.registerDeferredResultInterceptor(participateAttributeName, asyncRequestInterceptor);
 		}
 	}
 
@@ -164,9 +168,8 @@ public void afterConcurrentHandlingStarted(WebRequest request) {
 
 	/**
 	 * Open a Session for the SessionFactory that this interceptor uses.
-	 * <p>The default implementation delegates to the
-	 * {@code SessionFactory.openSession} method and
-	 * sets the {@code Session}'s flush mode to "MANUAL".
+	 * <p>The default implementation delegates to the {@link SessionFactory#openSession}
+	 * method and sets the {@link Session}'s flush mode to "MANUAL".
 	 * @return the Session to use
 	 * @throws DataAccessResourceFailureException if the Session could not be created
 	 * @see org.hibernate.FlushMode#MANUAL
@@ -196,35 +199,8 @@ private boolean applySessionBindingInterceptor(WebAsyncManager asyncManager, Str
 		if (asyncManager.getCallableInterceptor(key) == null) {
 			return false;
 		}
-		((SessionBindingCallableInterceptor) asyncManager.getCallableInterceptor(key)).initializeThread();
+		((AsyncRequestInterceptor) asyncManager.getCallableInterceptor(key)).bindSession();
 		return true;
 	}
 
-
-	/**
-	 * Bind and unbind the Hibernate {@code Session} to the current thread.
-	 */
-	private class SessionBindingCallableInterceptor extends CallableProcessingInterceptorAdapter {
-
-		private final SessionHolder sessionHolder;
-
-		public SessionBindingCallableInterceptor(SessionHolder sessionHolder) {
-			this.sessionHolder = sessionHolder;
-		}
-
-		@Override
-		public <T> void preProcess(NativeWebRequest request, Callable<T> task) {
-			initializeThread();
-		}
-
-		@Override
-		public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) {
-			TransactionSynchronizationManager.unbindResource(getSessionFactory());
-		}
-
-		private void initializeThread() {
-			TransactionSynchronizationManager.bindResource(getSessionFactory(), this.sessionHolder);
-		}
-	}
-
 }
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java
index 54bc662c7d..6f71920505 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -73,8 +74,8 @@ public class FilterDefinitionFactoryBean implements FactoryBean<FilterDefinition
 	static {
 		// Hibernate 3.6 TypeResolver class available?
 		try {
-			Class<?> trClass = FilterDefinitionFactoryBean.class.getClassLoader().loadClass(
-					"org.hibernate.type.TypeResolver");
+			Class<?> trClass = ClassUtils.forName("org.hibernate.type.TypeResolver",
+					FilterDefinitionFactoryBean.class.getClassLoader());
 			heuristicTypeMethod = trClass.getMethod("heuristicType", String.class);
 			typeResolver = trClass.newInstance();
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java
index ddc08aed8b..bfb35be672 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -289,7 +289,7 @@ public void setFilterName(String filter) {
 	 * @see org.hibernate.Session#enableFilter(String)
 	 * @see LocalSessionFactoryBean#setFilterDefinitions
 	 */
-	public void setFilterNames(String[] filterNames) {
+	public void setFilterNames(String... filterNames) {
 		this.filterNames = filterNames;
 	}
 
@@ -464,8 +464,8 @@ protected synchronized SQLExceptionTranslator getDefaultJdbcExceptionTranslator(
 	protected void enableFilters(Session session) {
 		String[] filterNames = getFilterNames();
 		if (filterNames != null) {
-			for (int i = 0; i < filterNames.length; i++) {
-				session.enableFilter(filterNames[i]);
+			for (String filterName : filterNames) {
+				session.enableFilter(filterName);
 			}
 		}
 	}
@@ -479,8 +479,8 @@ protected void enableFilters(Session session) {
 	protected void disableFilters(Session session) {
 		String[] filterNames = getFilterNames();
 		if (filterNames != null) {
-			for (int i = 0; i < filterNames.length; i++) {
-				session.disableFilter(filterNames[i]);
+			for (String filterName : filterNames) {
+				session.disableFilter(filterName);
 			}
 		}
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java
index 79339de558..0d2e4ae414 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
  * Hibernate's own {@code SessionFactory.getCurrentSession()} method, to be
  * able to detect a thread-bound Session. Typically, the code will look like as follows:
  *
- * <pre>
+ * <pre class="code">
  * public void doSomeDataAccessAction() {
  *   Session session = this.sessionFactory.getCurrentSession();
  *   ...
@@ -63,6 +63,13 @@
  * configuration just adds value when fine-tuning Session settings like the flush mode
  * - or when relying on exception translation.
  *
+ * <p>This class is effectively deprecated, in favor of either HibernateTemplate usage
+ * or native Hibernate API usage within transactions, in combination with a general
+ * {@link org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor}.
+ * <b>Note: This class does not have an equivalent replacement in {@code orm.hibernate4}.
+ * It is officially deprecated in the Spring 4.0.x line, superseded by a streamlined
+ * OpenSessionInterceptor which also exists in 4.0.2's {@code orm.hibernate4} package.</b>
+ *
  * @author Juergen Hoeller
  * @since 1.2
  * @see org.hibernate.SessionFactory#getCurrentSession()
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java
index 3d142f2256..4292ba8ab7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,10 +90,13 @@ public interface HibernateOperations {
 	 * {@link List}.
 	 * <p>This is a convenience method for executing Hibernate find calls or
 	 * queries within an action.
-	 * @param action calback object that specifies the Hibernate action
+	 * @param action callback object that specifies the Hibernate action
 	 * @return a List result returned by the action, or {@code null}
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
+	 * @deprecated as of Spring 3.2.7, in favor of using a regular {@link #execute}
+	 * call with a generic List type declared
 	 */
+	@Deprecated
 	List executeFind(HibernateCallback<?> action) throws DataAccessException;
 
 
@@ -131,8 +134,7 @@ public interface HibernateOperations {
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 * @see org.hibernate.Session#get(Class, java.io.Serializable, org.hibernate.LockMode)
 	 */
-	<T> T get(Class<T> entityClass, Serializable id, LockMode lockMode)
-			throws DataAccessException;
+	<T> T get(Class<T> entityClass, Serializable id, LockMode lockMode) throws DataAccessException;
 
 	/**
 	 * Return the persistent instance of the given entity class
@@ -164,8 +166,7 @@ <T> T get(Class<T> entityClass, Serializable id, LockMode lockMode)
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 * @see org.hibernate.Session#get(Class, java.io.Serializable, org.hibernate.LockMode)
 	 */
-	Object get(String entityName, Serializable id, LockMode lockMode)
-			throws DataAccessException;
+	Object get(String entityName, Serializable id, LockMode lockMode) throws DataAccessException;
 
 	/**
 	 * Return the persistent instance of the given entity class
@@ -199,8 +200,7 @@ Object get(String entityName, Serializable id, LockMode lockMode)
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 * @see org.hibernate.Session#load(Class, java.io.Serializable)
 	 */
-	<T> T load(Class<T> entityClass, Serializable id, LockMode lockMode)
-			throws DataAccessException;
+	<T> T load(Class<T> entityClass, Serializable id, LockMode lockMode) throws DataAccessException;
 
 	/**
 	 * Return the persistent instance of the given entity class
@@ -234,8 +234,7 @@ <T> T load(Class<T> entityClass, Serializable id, LockMode lockMode)
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 * @see org.hibernate.Session#load(Class, java.io.Serializable)
 	 */
-	Object load(String entityName, Serializable id, LockMode lockMode)
-			throws DataAccessException;
+	Object load(String entityName, Serializable id, LockMode lockMode) throws DataAccessException;
 
 	/**
 	 * Return all persistent instances of the given entity class.
@@ -245,7 +244,7 @@ Object load(String entityName, Serializable id, LockMode lockMode)
 	 * @throws org.springframework.dao.DataAccessException if there is a Hibernate error
 	 * @see org.hibernate.Session#createCriteria
 	 */
-	<T>List<T> loadAll(Class<T> entityClass) throws DataAccessException;
+	<T> List<T> loadAll(Class<T> entityClass) throws DataAccessException;
 
 	/**
 	 * Load the persistent instance with the given identifier
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java
index 1edc733d3b..dc947b2cb6 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -132,7 +132,7 @@ public HibernateTemplate() {
 
 	/**
 	 * Create a new HibernateTemplate instance.
-	 * @param sessionFactory SessionFactory to create Sessions
+	 * @param sessionFactory the SessionFactory to create Sessions with
 	 */
 	public HibernateTemplate(SessionFactory sessionFactory) {
 		setSessionFactory(sessionFactory);
@@ -141,7 +141,7 @@ public HibernateTemplate(SessionFactory sessionFactory) {
 
 	/**
 	 * Create a new HibernateTemplate instance.
-	 * @param sessionFactory SessionFactory to create Sessions
+	 * @param sessionFactory the SessionFactory to create Sessions with
 	 * @param allowCreate if a non-transactional Session should be created when no
 	 * transactional Session can be found for the current thread
 	 */
@@ -339,6 +339,7 @@ public <T> T execute(HibernateCallback<T> action) throws DataAccessException {
 		return doExecute(action, false, false);
 	}
 
+	@Deprecated
 	public List executeFind(HibernateCallback<?> action) throws DataAccessException {
 		Object result = doExecute(action, false, false);
 		if (result != null && !(result instanceof List)) {
@@ -480,17 +481,17 @@ else if (SessionFactoryUtils.hasTransactionalSession(getSessionFactory())) {
 	 * @see #prepareCriteria
 	 */
 	protected Session createSessionProxy(Session session) {
-		Class[] sessionIfcs = null;
-		Class mainIfc = (session instanceof org.hibernate.classic.Session ?
+		Class<?>[] sessionIfcs;
+		Class<?> mainIfc = (session instanceof org.hibernate.classic.Session ?
 				org.hibernate.classic.Session.class : Session.class);
 		if (session instanceof EventSource) {
-			sessionIfcs = new Class[] {mainIfc, EventSource.class};
+			sessionIfcs = new Class<?>[] {mainIfc, EventSource.class};
 		}
 		else if (session instanceof SessionImplementor) {
-			sessionIfcs = new Class[] {mainIfc, SessionImplementor.class};
+			sessionIfcs = new Class<?>[] {mainIfc, SessionImplementor.class};
 		}
 		else {
-			sessionIfcs = new Class[] {mainIfc};
+			sessionIfcs = new Class<?>[] {mainIfc};
 		}
 		return (Session) Proxy.newProxyInstance(
 				session.getClass().getClassLoader(), sessionIfcs,
@@ -1000,7 +1001,7 @@ public List findByNamedQueryAndNamedParam(
 			final String queryName, final String[] paramNames, final Object[] values)
 			throws DataAccessException {
 
-		if (paramNames != null && values != null && paramNames.length != values.length) {
+		if (values != null && (paramNames == null || paramNames.length != values.length)) {
 			throw new IllegalArgumentException("Length of paramNames array must match length of values array");
 		}
 		return executeWithNativeSession(new HibernateCallback<List>() {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java
index abd06c801a..d25df391e8 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,12 +100,12 @@
  * special restrictions with EJB CMT and restrictive JTA subsystems: See
  * {@link org.springframework.transaction.jta.JtaTransactionManager}'s javadoc for details.
  *
- * <p>On JDBC 3.0, this transaction manager supports nested transactions via JDBC 3.0
- * Savepoints. The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"}
- * flag defaults to "false", though, as nested transactions will just apply to the
- * JDBC Connection, not to the Hibernate Session and its cached objects. You can
- * manually set the flag to "true" if you want to use nested transactions for
- * JDBC access code which participates in Hibernate transactions (provided that
+ * <p>This transaction manager supports nested transactions via JDBC 3.0 Savepoints.
+ * The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"} flag defaults
+ * to "false", though, as nested transactions will just apply to the JDBC Connection,
+ * not to the Hibernate Session and its cached entity objects and related context.
+ * You can manually set the flag to "true" if you want to use nested transactions
+ * for JDBC access code which participates in Hibernate transactions (provided that
  * your JDBC driver supports Savepoints). <i>Note that Hibernate itself does not
  * support nested transactions! Hence, do not expect Hibernate access code to
  * semantically participate in a nested transaction.</i>
@@ -580,7 +580,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 			txObject.getSessionHolder().setSynchronizedWithTransaction(true);
 		}
 
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			if (txObject.isNewSession()) {
 				try {
 					if (session.getTransaction().isActive()) {
@@ -592,6 +592,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 				}
 				finally {
 					SessionFactoryUtils.closeSession(session);
+					txObject.setSessionHolder(null);
 				}
 			}
 			throw new CannotCreateTransactionException("Could not open Hibernate Session for transaction", ex);
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java
index 9310853b6e..6c87f056ce 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -276,7 +276,7 @@ public void setConfigLocation(Resource configLocation) {
 	 * resources are specified locally via this bean.
 	 * @see org.hibernate.cfg.Configuration#configure(java.net.URL)
 	 */
-	public void setConfigLocations(Resource[] configLocations) {
+	public void setConfigLocations(Resource... configLocations) {
 		this.configLocations = configLocations;
 	}
 
@@ -290,7 +290,7 @@ public void setConfigLocations(Resource[] configLocations) {
 	 * @see #setMappingLocations
 	 * @see org.hibernate.cfg.Configuration#addResource
 	 */
-	public void setMappingResources(String[] mappingResources) {
+	public void setMappingResources(String... mappingResources) {
 		this.mappingResources = mappingResources;
 	}
 
@@ -303,7 +303,7 @@ public void setMappingResources(String[] mappingResources) {
 	 * or to specify all mappings locally.
 	 * @see org.hibernate.cfg.Configuration#addInputStream
 	 */
-	public void setMappingLocations(Resource[] mappingLocations) {
+	public void setMappingLocations(Resource... mappingLocations) {
 		this.mappingLocations = mappingLocations;
 	}
 
@@ -316,7 +316,7 @@ public void setMappingLocations(Resource[] mappingLocations) {
 	 * or to specify all mappings locally.
 	 * @see org.hibernate.cfg.Configuration#addCacheableFile(java.io.File)
 	 */
-	public void setCacheableMappingLocations(Resource[] cacheableMappingLocations) {
+	public void setCacheableMappingLocations(Resource... cacheableMappingLocations) {
 		this.cacheableMappingLocations = cacheableMappingLocations;
 	}
 
@@ -327,7 +327,7 @@ public void setCacheableMappingLocations(Resource[] cacheableMappingLocations) {
 	 * or to specify all mappings locally.
 	 * @see org.hibernate.cfg.Configuration#addJar(java.io.File)
 	 */
-	public void setMappingJarLocations(Resource[] mappingJarLocations) {
+	public void setMappingJarLocations(Resource... mappingJarLocations) {
 		this.mappingJarLocations = mappingJarLocations;
 	}
 
@@ -338,7 +338,7 @@ public void setMappingJarLocations(Resource[] mappingJarLocations) {
 	 * or to specify all mappings locally.
 	 * @see org.hibernate.cfg.Configuration#addDirectory(java.io.File)
 	 */
-	public void setMappingDirectoryLocations(Resource[] mappingDirectoryLocations) {
+	public void setMappingDirectoryLocations(Resource... mappingDirectoryLocations) {
 		this.mappingDirectoryLocations = mappingDirectoryLocations;
 	}
 
@@ -456,7 +456,7 @@ public void setNamingStrategy(NamingStrategy namingStrategy) {
 	 * @see TypeDefinitionBean
 	 * @see org.hibernate.cfg.Mappings#addTypeDef(String, String, java.util.Properties)
 	 */
-	public void setTypeDefinitions(TypeDefinitionBean[] typeDefinitions) {
+	public void setTypeDefinitions(TypeDefinitionBean... typeDefinitions) {
 		this.typeDefinitions = typeDefinitions;
 	}
 
@@ -470,7 +470,7 @@ public void setTypeDefinitions(TypeDefinitionBean[] typeDefinitions) {
 	 * @see FilterDefinitionFactoryBean
 	 * @see org.hibernate.cfg.Configuration#addFilterDefinition
 	 */
-	public void setFilterDefinitions(FilterDefinition[] filterDefinitions) {
+	public void setFilterDefinitions(FilterDefinition... filterDefinitions) {
 		this.filterDefinitions = filterDefinitions;
 	}
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java
index a6e13b673d..6e971b9c03 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -214,8 +214,7 @@ public static Session getSession(SessionFactory sessionFactory, boolean allowCre
 	 * <p>Supports setting a Session-level Hibernate entity interceptor that allows
 	 * to inspect and change property values before writing to and reading from the
 	 * database. Such an interceptor can also be set at the SessionFactory level
-	 * (i.e. on LocalSessionFactoryBean), on HibernateTransactionManager, or on
-	 * HibernateInterceptor/HibernateTemplate.
+	 * (i.e. on LocalSessionFactoryBean), on HibernateTransactionManager, etc.
 	 * @param sessionFactory Hibernate SessionFactory to create the session with
 	 * @param entityInterceptor Hibernate entity interceptor, or {@code null} if none
 	 * @param jdbcExceptionTranslator SQLExcepionTranslator to use for flushing the
@@ -224,7 +223,6 @@ public static Session getSession(SessionFactory sessionFactory, boolean allowCre
 	 * @return the Hibernate Session
 	 * @throws DataAccessResourceFailureException if the Session couldn't be created
 	 * @see LocalSessionFactoryBean#setEntityInterceptor
-	 * @see HibernateInterceptor#setEntityInterceptor
 	 * @see HibernateTemplate#setEntityInterceptor
 	 */
 	public static Session getSession(
@@ -371,8 +369,8 @@ private static Session doGetSession(
 	 * @throws DataAccessResourceFailureException if the Session couldn't be created
 	 */
 	private static Session getJtaSynchronizedSession(
-		SessionHolder sessionHolder, SessionFactory sessionFactory,
-		SQLExceptionTranslator jdbcExceptionTranslator) throws DataAccessResourceFailureException {
+			SessionHolder sessionHolder, SessionFactory sessionFactory,
+			SQLExceptionTranslator jdbcExceptionTranslator) throws DataAccessResourceFailureException {
 
 		// JTA synchronization is only possible with a javax.transaction.TransactionManager.
 		// We'll check the Hibernate SessionFactory: If a TransactionManagerLookup is specified
@@ -611,10 +609,12 @@ public static void applyTransactionTimeout(Query query, SessionFactory sessionFa
 	 */
 	public static void applyTransactionTimeout(Criteria criteria, SessionFactory sessionFactory) {
 		Assert.notNull(criteria, "No Criteria object specified");
-		SessionHolder sessionHolder =
-			(SessionHolder) TransactionSynchronizationManager.getResource(sessionFactory);
-		if (sessionHolder != null && sessionHolder.hasTimeout()) {
-			criteria.setTimeout(sessionHolder.getTimeToLiveInSeconds());
+		if (sessionFactory != null) {
+			SessionHolder sessionHolder =
+				(SessionHolder) TransactionSynchronizationManager.getResource(sessionFactory);
+			if (sessionHolder != null && sessionHolder.hasTimeout()) {
+				criteria.setTimeout(sessionHolder.getTimeToLiveInSeconds());
+			}
 		}
 	}
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java
index 72f5ee42ea..8366a5f2eb 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,10 +42,7 @@
 
 /**
  * Subclass of Spring's standard LocalSessionFactoryBean for Hibernate,
- * supporting JDK 1.5+ annotation metadata for mappings.
- *
- * <p>Note: This class requires Hibernate 3.2 or later, with the
- * Java Persistence API and the Hibernate Annotations add-on present.
+ * supporting annotation metadata for mappings.
  *
  * <p>Example for an AnnotationSessionFactoryBean bean definition:
  *
@@ -68,6 +65,9 @@
  *   &lt;property name="packagesToScan" value="test.package"/&gt;
  * &lt;/bean&gt;</pre>
  *
+ * <p>Note: This class requires Hibernate 3.2 or later, with the
+ * Java Persistence API and the Hibernate Annotations add-on present.
+ *
  * @author Juergen Hoeller
  * @since 1.2.2
  * @see #setDataSource
@@ -82,7 +82,7 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem
 	private static final String PACKAGE_INFO_SUFFIX = ".package-info";
 
 
-	private Class[] annotatedClasses;
+	private Class<?>[] annotatedClasses;
 
 	private String[] annotatedPackages;
 
@@ -113,19 +113,19 @@ public void setConfigurationClass(Class<?> configurationClass) {
 
 	/**
 	 * Specify annotated classes, for which mappings will be read from
-	 * class-level JDK 1.5+ annotation metadata.
+	 * class-level annotation metadata.
 	 * @see org.hibernate.cfg.AnnotationConfiguration#addAnnotatedClass(Class)
 	 */
-	public void setAnnotatedClasses(Class[] annotatedClasses) {
+	public void setAnnotatedClasses(Class<?>... annotatedClasses) {
 		this.annotatedClasses = annotatedClasses;
 	}
 
 	/**
 	 * Specify the names of annotated packages, for which package-level
-	 * JDK 1.5+ annotation metadata will be read.
+	 * annotation metadata will be read.
 	 * @see org.hibernate.cfg.AnnotationConfiguration#addPackage(String)
 	 */
-	public void setAnnotatedPackages(String[] annotatedPackages) {
+	public void setAnnotatedPackages(String... annotatedPackages) {
 		this.annotatedPackages = annotatedPackages;
 	}
 
@@ -136,7 +136,7 @@ public void setAnnotatedPackages(String[] annotatedPackages) {
 	 * classes in the classpath. This is analogous to Spring's component-scan feature
 	 * ({@link org.springframework.context.annotation.ClassPathBeanDefinitionScanner}).
 	 */
-	public void setPackagesToScan(String[] packagesToScan) {
+	public void setPackagesToScan(String... packagesToScan) {
 		this.packagesToScan = packagesToScan;
 	}
 
@@ -148,7 +148,7 @@ public void setPackagesToScan(String[] packagesToScan) {
 	 * Hibernate's special {@code @org.hibernate.annotations.Entity}.
 	 * @see #setPackagesToScan
 	 */
-	public void setEntityTypeFilters(TypeFilter[] entityTypeFilters) {
+	public void setEntityTypeFilters(TypeFilter... entityTypeFilters) {
 		this.entityTypeFilters = entityTypeFilters;
 	}
 
@@ -165,7 +165,7 @@ public void setResourceLoader(ResourceLoader resourceLoader) {
 	protected void postProcessMappings(Configuration config) throws HibernateException {
 		AnnotationConfiguration annConfig = (AnnotationConfiguration) config;
 		if (this.annotatedClasses != null) {
-			for (Class annotatedClass : this.annotatedClasses) {
+			for (Class<?> annotatedClass : this.annotatedClasses) {
 				annConfig.addAnnotatedClass(annotatedClass);
 			}
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AsyncRequestInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AsyncRequestInterceptor.java
new file mode 100644
index 0000000000..4e161d87df
--- /dev/null
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AsyncRequestInterceptor.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.orm.hibernate3.support;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hibernate.SessionFactory;
+import org.springframework.orm.hibernate3.SessionFactoryUtils;
+import org.springframework.orm.hibernate3.SessionHolder;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.context.request.async.CallableProcessingInterceptorAdapter;
+import org.springframework.web.context.request.async.DeferredResult;
+import org.springframework.web.context.request.async.DeferredResultProcessingInterceptor;
+
+import java.util.concurrent.Callable;
+
+/**
+ * An interceptor with asynchronous web requests used in OpenSessionInViewFilter and
+ * OpenSessionInViewInterceptor.
+ *
+ * Ensures the following:
+ * 1) The session is bound/unbound when "callable processing" is started
+ * 2) The session is closed if an async request times out
+ *
+ * @author Rossen Stoyanchev
+ * @since 3.2.5
+ */
+class AsyncRequestInterceptor extends CallableProcessingInterceptorAdapter
+		implements DeferredResultProcessingInterceptor {
+
+	private static final Log logger = LogFactory.getLog(AsyncRequestInterceptor.class);
+
+	private final SessionFactory sessionFactory;
+
+	private final SessionHolder sessionHolder;
+
+	private volatile boolean timeoutInProgress;
+
+
+	public AsyncRequestInterceptor(SessionFactory sessionFactory, SessionHolder sessionHolder) {
+		this.sessionFactory = sessionFactory;
+		this.sessionHolder = sessionHolder;
+	}
+
+	@Override
+	public <T> void preProcess(NativeWebRequest request, Callable<T> task) {
+		bindSession();
+	}
+
+	public void bindSession() {
+		this.timeoutInProgress = false;
+		TransactionSynchronizationManager.bindResource(this.sessionFactory, this.sessionHolder);
+	}
+
+	@Override
+	public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) {
+		TransactionSynchronizationManager.unbindResource(this.sessionFactory);
+	}
+
+	@Override
+	public <T> Object handleTimeout(NativeWebRequest request, Callable<T> task) {
+		this.timeoutInProgress = true;
+		return RESULT_NONE; // give other interceptors a chance to handle the timeout
+	}
+
+	@Override
+	public <T> void afterCompletion(NativeWebRequest request, Callable<T> task) throws Exception {
+		closeAfterTimeout();
+	}
+
+	private void closeAfterTimeout() {
+		if (this.timeoutInProgress) {
+			logger.debug("Closing Hibernate Session after async request timeout");
+			SessionFactoryUtils.closeSession(sessionHolder.getSession());
+		}
+	}
+
+	// Implementation of DeferredResultProcessingInterceptor methods
+
+	public <T> void beforeConcurrentHandling(NativeWebRequest request, DeferredResult<T> deferredResult) {}
+	public <T> void preProcess(NativeWebRequest request, DeferredResult<T> deferredResult) {}
+	public <T> void postProcess(NativeWebRequest request, DeferredResult<T> deferredResult, Object result) {}
+
+	@Override
+	public <T> boolean handleTimeout(NativeWebRequest request, DeferredResult<T> deferredResult) {
+		this.timeoutInProgress = true;
+		return true; // give other interceptors a chance to handle the timeout
+	}
+
+	@Override
+	public <T> void afterCompletion(NativeWebRequest request, DeferredResult<T> deferredResult) {
+		closeAfterTimeout();
+	}
+
+}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java
index e495fc8a9c..3b7fc1468d 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,11 @@
  * by default. A custom HibernateTemplate instance can be used through overriding
  * {@link #createHibernateTemplate}.
  *
+ * <p><b>NOTE: As of Hibernate 3.0.1, transactional Hibernate access code can
+ * also be coded in plain Hibernate style. Hence, for newly started projects,
+ * consider adopting the standard Hibernate3 style of coding data access objects
+ * instead, based on {@link org.hibernate.SessionFactory#getCurrentSession()}.</b>
+ *
  * @author Juergen Hoeller
  * @since 1.2
  * @see #setSessionFactory
@@ -105,8 +110,8 @@ public final void setHibernateTemplate(HibernateTemplate hibernateTemplate) {
 	 * You may introspect its configuration, but not modify the configuration
 	 * (other than from within an {@link #initDao} implementation).
 	 * Consider creating a custom HibernateTemplate instance via
-	 * {@code new HibernateTemplate(getSessionFactory())}, in which
-	 * case you're allowed to customize the settings on the resulting instance.
+	 * {@code new HibernateTemplate(getSessionFactory())}, in which case
+	 * you're allowed to customize the settings on the resulting instance.
 	 */
 	public final HibernateTemplate getHibernateTemplate() {
 	  return this.hibernateTemplate;
@@ -136,10 +141,10 @@ protected final void checkDaoConfig() {
 	 * @throws DataAccessResourceFailureException if the Session couldn't be created
 	 * @throws IllegalStateException if no thread-bound Session found and allowCreate=false
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession(SessionFactory, boolean)
+	 * @deprecated as of Spring 3.2.7, in favor of {@link HibernateTemplate} usage
 	 */
-	protected final Session getSession()
-		throws DataAccessResourceFailureException, IllegalStateException {
-
+	@Deprecated
+	protected final Session getSession() throws DataAccessResourceFailureException, IllegalStateException {
 		return getSession(this.hibernateTemplate.isAllowCreate());
 	}
 
@@ -161,9 +166,11 @@ protected final Session getSession()
 	 * @throws DataAccessResourceFailureException if the Session couldn't be created
 	 * @throws IllegalStateException if no thread-bound Session found and allowCreate=false
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession(SessionFactory, boolean)
+	 * @deprecated as of Spring 3.2.7, in favor of {@link HibernateTemplate} usage
 	 */
+	@Deprecated
 	protected final Session getSession(boolean allowCreate)
-		throws DataAccessResourceFailureException, IllegalStateException {
+			throws DataAccessResourceFailureException, IllegalStateException {
 
 		return (!allowCreate ?
 			SessionFactoryUtils.getSession(getSessionFactory(), false) :
@@ -185,7 +192,9 @@ protected final Session getSession(boolean allowCreate)
 	 * @param ex HibernateException that occurred
 	 * @return the corresponding DataAccessException instance
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#convertHibernateAccessException
+	 * @deprecated as of Spring 3.2.7, in favor of {@link HibernateTemplate} usage
 	 */
+	@Deprecated
 	protected final DataAccessException convertHibernateAccessException(HibernateException ex) {
 		return this.hibernateTemplate.convertHibernateAccessException(ex);
 	}
@@ -197,7 +206,9 @@ protected final DataAccessException convertHibernateAccessException(HibernateExc
 	 * {@link #getSession} and {@link #convertHibernateAccessException}.
 	 * @param session the Session to close
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#releaseSession
+	 * @deprecated as of Spring 3.2.7, in favor of {@link HibernateTemplate} usage
 	 */
+	@Deprecated
 	protected final void releaseSession(Session session) {
 		SessionFactoryUtils.releaseSession(session, getSessionFactory());
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java
index 7aab7c8910..73eb36c7cf 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
 package org.springframework.orm.hibernate3.support;
 
 import java.io.IOException;
-import java.util.concurrent.Callable;
-
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -27,14 +25,13 @@
 import org.hibernate.FlushMode;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.orm.hibernate3.SessionFactoryUtils;
 import org.springframework.orm.hibernate3.SessionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.async.CallableProcessingInterceptorAdapter;
 import org.springframework.web.context.request.async.WebAsyncManager;
 import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -81,9 +78,7 @@
  *
  * <p>Looks up the SessionFactory in Spring's root web application context.
  * Supports a "sessionFactoryBeanName" filter init-param in {@code web.xml};
- * the default bean name is "sessionFactory". Looks up the SessionFactory on each
- * request, to avoid initialization order issues (when using ContextLoaderServlet,
- * the root application context will get initialized <i>after</i> this filter).
+ * the default bean name is "sessionFactory".
  *
  * @author Juergen Hoeller
  * @since 1.2
@@ -95,6 +90,7 @@
  * @see org.springframework.orm.hibernate3.HibernateTransactionManager
  * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
+ * @see org.hibernate.SessionFactory#getCurrentSession()
  */
 public class OpenSessionInViewFilter extends OncePerRequestFilter {
 
@@ -169,7 +165,7 @@ protected FlushMode getFlushMode() {
 	}
 
 	/**
-	 * The default value is "false" so that the filter may re-bind the opened
+	 * Returns "false" so that the filter may re-bind the opened Hibernate
 	 * {@code Session} to each asynchronously dispatched thread and postpone
 	 * closing it until the very last asynchronous dispatch.
 	 */
@@ -212,8 +208,9 @@ protected void doFilterInternal(
 					SessionHolder sessionHolder = new SessionHolder(session);
 					TransactionSynchronizationManager.bindResource(sessionFactory, sessionHolder);
 
-					asyncManager.registerCallableInterceptor(key,
-							new SessionBindingCallableInterceptor(sessionFactory, sessionHolder));
+					AsyncRequestInterceptor interceptor = new AsyncRequestInterceptor(sessionFactory, sessionHolder);
+					asyncManager.registerCallableInterceptor(key, interceptor);
+					asyncManager.registerDeferredResultInterceptor(key, interceptor);
 				}
 			}
 		}
@@ -319,38 +316,8 @@ private boolean applySessionBindingInterceptor(WebAsyncManager asyncManager, Str
 		if (asyncManager.getCallableInterceptor(key) == null) {
 			return false;
 		}
-		((SessionBindingCallableInterceptor) asyncManager.getCallableInterceptor(key)).initializeThread();
+		((AsyncRequestInterceptor) asyncManager.getCallableInterceptor(key)).bindSession();
 		return true;
 	}
 
-
-	/**
-	 * Bind and unbind the Hibernate {@code Session} to the current thread.
-	 */
-	private static class SessionBindingCallableInterceptor extends CallableProcessingInterceptorAdapter {
-
-		private final SessionFactory sessionFactory;
-
-		private final SessionHolder sessionHolder;
-
-		public SessionBindingCallableInterceptor(SessionFactory sessionFactory, SessionHolder sessionHolder) {
-			this.sessionFactory = sessionFactory;
-			this.sessionHolder = sessionHolder;
-		}
-
-		@Override
-		public <T> void preProcess(NativeWebRequest request, Callable<T> task) {
-			initializeThread();
-		}
-
-		@Override
-		public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) {
-			TransactionSynchronizationManager.unbindResource(this.sessionFactory);
-		}
-
-		private void initializeThread() {
-			TransactionSynchronizationManager.bindResource(this.sessionFactory, this.sessionHolder);
-		}
-	}
-
 }
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java
index 692db0ba20..540d1ea2cc 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,9 @@
 
 package org.springframework.orm.hibernate3.support;
 
-import java.util.concurrent.Callable;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
+
 import org.springframework.dao.DataAccessException;
 import org.springframework.orm.hibernate3.HibernateAccessor;
 import org.springframework.orm.hibernate3.SessionFactoryUtils;
@@ -27,9 +26,7 @@
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.context.request.AsyncWebRequestInterceptor;
-import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.context.request.async.CallableProcessingInterceptorAdapter;
 import org.springframework.web.context.request.async.WebAsyncManager;
 import org.springframework.web.context.request.async.WebAsyncUtils;
 
@@ -93,6 +90,7 @@
  * @see org.springframework.orm.hibernate3.HibernateTransactionManager
  * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
+ * @see org.hibernate.SessionFactory#getCurrentSession()
  */
 public class OpenSessionInViewInterceptor extends HibernateAccessor implements AsyncWebRequestInterceptor {
 
@@ -145,10 +143,9 @@ protected boolean isSingleSession() {
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession
 	 */
 	public void preHandle(WebRequest request) throws DataAccessException {
-
-		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
 		String participateAttributeName = getParticipateAttributeName();
 
+		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
 		if (asyncManager.hasConcurrentResult()) {
 			if (applySessionBindingInterceptor(asyncManager, participateAttributeName)) {
 				return;
@@ -172,8 +169,10 @@ public void preHandle(WebRequest request) throws DataAccessException {
 				SessionHolder sessionHolder = new SessionHolder(session);
 				TransactionSynchronizationManager.bindResource(getSessionFactory(), sessionHolder);
 
-				asyncManager.registerCallableInterceptor(participateAttributeName,
-						new SessionBindingCallableInterceptor(sessionHolder));
+				AsyncRequestInterceptor asyncRequestInterceptor =
+						new AsyncRequestInterceptor(getSessionFactory(), sessionHolder);
+				asyncManager.registerCallableInterceptor(participateAttributeName, asyncRequestInterceptor);
+				asyncManager.registerDeferredResultInterceptor(participateAttributeName, asyncRequestInterceptor);
 			}
 			else {
 				// deferred close mode
@@ -268,34 +267,8 @@ private boolean applySessionBindingInterceptor(WebAsyncManager asyncManager, Str
 		if (asyncManager.getCallableInterceptor(key) == null) {
 			return false;
 		}
-		((SessionBindingCallableInterceptor) asyncManager.getCallableInterceptor(key)).initializeThread();
+		((AsyncRequestInterceptor) asyncManager.getCallableInterceptor(key)).bindSession();
 		return true;
 	}
 
-
-	/**
-	 * Bind and unbind the Hibernate {@code Session} to the current thread.
-	 */
-	private class SessionBindingCallableInterceptor extends CallableProcessingInterceptorAdapter {
-
-		private final SessionHolder sessionHolder;
-
-		public SessionBindingCallableInterceptor(SessionHolder sessionHolder) {
-			this.sessionHolder = sessionHolder;
-		}
-
-		@Override
-		public <T> void preProcess(NativeWebRequest request, Callable<T> task) {
-			initializeThread();
-		}
-
-		@Override
-		public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) {
-			TransactionSynchronizationManager.unbindResource(getSessionFactory());
-		}
-
-		private void initializeThread() {
-			TransactionSynchronizationManager.bindResource(getSessionFactory(), this.sessionHolder);
-		}
-	}
 }
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/DefaultJdoDialect.java b/spring-orm/src/main/java/org/springframework/orm/jdo/DefaultJdoDialect.java
index 9d058158b9..791f88b329 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/DefaultJdoDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/DefaultJdoDialect.java
@@ -16,7 +16,6 @@
 
 package org.springframework.orm.jdo;
 
-import java.lang.reflect.Method;
 import java.sql.Connection;
 import java.sql.SQLException;
 import javax.jdo.Constants;
@@ -35,8 +34,6 @@
 import org.springframework.jdbc.support.SQLExceptionTranslator;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionException;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * Default implementation of the {@link JdoDialect} interface.
@@ -69,10 +66,6 @@
  */
 public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTranslator {
 
-	// JDO 3.0 setTimeoutMillis method available?
-	private static final Method setTimeoutMillisMethod =
-			ClassUtils.getMethodIfAvailable(Query.class, "setTimeoutMillis", Integer.class);
-
 	protected final Log logger = LogFactory.getLog(getClass());
 
 	private SQLExceptionTranslator jdbcExceptionTranslator;
@@ -213,19 +206,9 @@ public void releaseJdbcConnection(ConnectionHandle conHandle, PersistenceManager
 	}
 
 	/**
-	 * This implementation applies a JDO 3.0 query timeout, if available. Otherwise,
-	 * it sets the JPA 2.0 query hints "javax.persistence.lock.timeout" and
-	 * "javax.persistence.query.timeout", assuming that JDO providers are often
-	 * JPA providers as well.
+	 * This implementation does nothing.
 	 */
 	public void applyQueryTimeout(Query query, int remainingTimeInSeconds) throws JDOException {
-		if (setTimeoutMillisMethod != null) {
-			ReflectionUtils.invokeMethod(setTimeoutMillisMethod, query, remainingTimeInSeconds);
-		}
-		else {
-			query.addExtension("javax.persistence.lock.timeout", remainingTimeInSeconds);
-			query.addExtension("javax.persistence.query.timeout", remainingTimeInSeconds);
-		}
 	}
 
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java
index 412a12087a..b363434152 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,12 +40,12 @@
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
- * {@link org.springframework.transaction.PlatformTransactionManager} implementation
- * for a single JDO {@link javax.jdo.PersistenceManagerFactory}. Binds a JDO
- * PersistenceManager from the specified factory to the thread, potentially allowing
- * for one thread-bound PersistenceManager per factory.
- * {@link PersistenceManagerFactoryUtils} and {@link JdoTemplate} are aware of
- * thread-bound persistence managers and participate in such transactions automatically.
+ * {@link org.springframework.transaction.PlatformTransactionManager} implementation for a
+ * single JDO {@link javax.jdo.PersistenceManagerFactory}. Binds a JDO PersistenceManager
+ * from the specified factory to the thread, potentially allowing for one thread-bound
+ * PersistenceManager per factory. {@link PersistenceManagerFactoryUtils} and
+ * {@link org.springframework.orm.jdo.support.SpringPersistenceManagerProxyBean} are aware
+ * of thread-bound persistence managers and participate in such transactions automatically.
  * Using either of those (or going through a {@link TransactionAwarePersistenceManagerFactoryProxy}
  * is required for JDO access code supporting this transaction management mechanism.
  *
@@ -73,10 +73,10 @@
  * that acts as "connectionFactory" of the PersistenceManagerFactory, so you usually
  * don't need to explicitly specify the "dataSource" property.
  *
- * <p>On JDBC 3.0, this transaction manager supports nested transactions via JDBC 3.0
- * Savepoints. The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"}
- * flag defaults to "false", though, as nested transactions will just apply to the
- * JDBC Connection, not to the JDO PersistenceManager and its cached objects.
+ * <p>This transaction manager supports nested transactions via JDBC 3.0 Savepoints.
+ * The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"} flag defaults
+ * to "false", though, as nested transactions will just apply to the JDBC Connection,
+ * not to the JDO PersistenceManager and its cached entity objects and related context.
  * You can manually set the flag to "true" if you want to use nested transactions
  * for JDBC access code which participates in JDO transactions (provided that your
  * JDBC driver supports Savepoints). <i>Note that JDO itself does not support
@@ -91,7 +91,6 @@
  * @see LocalPersistenceManagerFactoryBean
  * @see PersistenceManagerFactoryUtils#getPersistenceManager
  * @see PersistenceManagerFactoryUtils#releasePersistenceManager
- * @see JdoTemplate
  * @see TransactionAwarePersistenceManagerFactoryProxy
  * @see org.springframework.jdbc.datasource.DataSourceUtils#getConnection
  * @see org.springframework.jdbc.datasource.DataSourceUtils#releaseConnection
@@ -155,7 +154,7 @@ public PersistenceManagerFactory getPersistenceManagerFactory() {
    * The DataSource should match the one used by the JDO PersistenceManagerFactory:
 	 * for example, you could specify the same JNDI DataSource for both.
 	 * <p>If the PersistenceManagerFactory uses a DataSource as connection factory,
-	 * the DataSource will be autodetected: You can still explictly specify the
+	 * the DataSource will be autodetected: You can still explicitly specify the
 	 * DataSource, but you don't need to in this case.
 	 * <p>A transactional JDBC Connection for this DataSource will be provided to
 	 * application code accessing this DataSource directly via DataSourceUtils
@@ -340,15 +339,16 @@ public int getTimeout() {
 						conHolder.setTimeoutInSeconds(timeoutToUse);
 					}
 					if (logger.isDebugEnabled()) {
-						logger.debug("Exposing JDO transaction as JDBC transaction [" + conHolder.getConnectionHandle() + "]");
+						logger.debug("Exposing JDO transaction as JDBC transaction [" +
+								conHolder.getConnectionHandle() + "]");
 					}
 					TransactionSynchronizationManager.bindResource(getDataSource(), conHolder);
 					txObject.setConnectionHolder(conHolder);
 				}
 				else {
 					if (logger.isDebugEnabled()) {
-						logger.debug("Not exposing JDO transaction [" + pm + "] as JDBC transaction because JdoDialect [" +
-								getJdoDialect() + "] does not support JDBC Connection retrieval");
+						logger.debug("Not exposing JDO transaction [" + pm + "] as JDBC transaction because " +
+								"JdoDialect [" + getJdoDialect() + "] does not support JDBC Connection retrieval");
 					}
 				}
 			}
@@ -365,7 +365,7 @@ public int getTimeout() {
 			closePersistenceManagerAfterFailedBegin(txObject);
 			throw ex;
 		}
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			closePersistenceManagerAfterFailedBegin(txObject);
 			throw new CannotCreateTransactionException("Could not open JDO PersistenceManager for transaction", ex);
 		}
@@ -390,6 +390,7 @@ protected void closePersistenceManagerAfterFailedBegin(JdoTransactionObject txOb
 			finally {
 				PersistenceManagerFactoryUtils.releasePersistenceManager(pm, getPersistenceManagerFactory());
 			}
+			txObject.setPersistenceManagerHolder(null, false);
 		}
 	}
 
@@ -418,7 +419,7 @@ protected void doResume(Object transaction, Object suspendedResources) {
 	}
 
 	/**
-	 * This implementation returns "true": a JDO2 commit will properly handle
+	 * This implementation returns "true": a JDO commit will properly handle
 	 * transactions that have been marked rollback-only at a global level.
 	 */
 	@Override
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.java
index 6612c08c45..4c0fa14a16 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.orm.jdo.support;
 
 import java.io.IOException;
-
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
 import javax.servlet.FilterChain;
@@ -46,9 +45,7 @@
  *
  * <p>Looks up the PersistenceManagerFactory in Spring's root web application context.
  * Supports a "persistenceManagerFactoryBeanName" filter init-param in {@code web.xml};
- * the default bean name is "persistenceManagerFactory". Looks up the PersistenceManagerFactory
- * on each request, to avoid initialization order issues (when using ContextLoaderServlet,
- * the root application context will get initialized <i>after</i> this filter).
+ * the default bean name is "persistenceManagerFactory".
  *
  * @author Juergen Hoeller
  * @since 1.1
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
index 63df63e531..0c072ac582 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.io.Serializable;
 import java.sql.SQLException;
-
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceException;
@@ -64,9 +63,9 @@ public Object beginTransaction(EntityManager entityManager, TransactionDefinitio
 			throws PersistenceException, SQLException, TransactionException {
 
 		if (definition.getIsolationLevel() != TransactionDefinition.ISOLATION_DEFAULT) {
-			throw new InvalidIsolationLevelException(
-					"Standard JPA does not support custom isolation levels - " +
-					"use a special JpaDialect for your JPA implementation");
+			throw new InvalidIsolationLevelException(getClass().getSimpleName() +
+					" does not support custom isolation levels due to limitations in standard JPA. " +
+					"Specific arrangements may be implemented in custom JpaDialect variants.");
 		}
 		entityManager.getTransaction().begin();
 		return null;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
index 259c6e3756..e5a99e347c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,8 +55,8 @@
  * {@link org.springframework.transaction.PlatformTransactionManager} implementation
  * for a single JPA {@link javax.persistence.EntityManagerFactory}. Binds a JPA
  * EntityManager from the specified factory to the thread, potentially allowing for
- * one thread-bound EntityManager per factory. {@link SharedEntityManagerCreator}
- * and {@link JpaTemplate} are aware of thread-bound entity managers and participate
+ * one thread-bound EntityManager per factory. {@link SharedEntityManagerCreator} and
+ * {@code @PersistenceContext} are aware of thread-bound entity managers and participate
  * in such transactions automatically. Using either is required for JPA access code
  * supporting this transaction management mechanism.
  *
@@ -85,10 +85,10 @@
  * used as known connection factory of the EntityManagerFactory, so you usually
  * don't need to explicitly specify the "dataSource" property.
  *
- * <p>On JDBC 3.0, this transaction manager supports nested transactions via JDBC 3.0
- * Savepoints. The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"}
- * flag defaults to "false", though, as nested transactions will just apply to the
- * JDBC Connection, not to the JPA EntityManager and its cached objects.
+ * <p>This transaction manager supports nested transactions via JDBC 3.0 Savepoints.
+ * The {@link #setNestedTransactionAllowed} "nestedTransactionAllowed"} flag defaults
+ * to "false", though, as nested transactions will just apply to the JDBC Connection,
+ * not to the JPA EntityManager and its cached entity objects and related context.
  * You can manually set the flag to "true" if you want to use nested transactions
  * for JDBC access code which participates in JPA transactions (provided that your
  * JDBC driver supports Savepoints). <i>Note that JPA itself does not support
@@ -100,7 +100,6 @@
  * @see #setEntityManagerFactory
  * @see #setDataSource
  * @see LocalEntityManagerFactoryBean
- * @see JpaTemplate#execute
  * @see org.springframework.orm.jpa.support.SharedEntityManagerBean
  * @see org.springframework.jdbc.datasource.DataSourceUtils#getConnection
  * @see org.springframework.jdbc.datasource.DataSourceUtils#releaseConnection
@@ -217,7 +216,7 @@ public Map<String, Object> getJpaPropertyMap() {
 	 * The DataSource should match the one used by the JPA EntityManagerFactory:
 	 * for example, you could specify the same JNDI DataSource for both.
 	 * <p>If the EntityManagerFactory uses a known DataSource as connection factory,
-	 * the DataSource will be autodetected: You can still explictly specify the
+	 * the DataSource will be autodetected: You can still explicitly specify the
 	 * DataSource, but you don't need to in this case.
 	 * <p>A transactional JDBC Connection for this DataSource will be provided to
 	 * application code accessing this DataSource directly via DataSourceUtils
@@ -259,7 +258,7 @@ public DataSource getDataSource() {
 	 * Set the JPA dialect to use for this transaction manager.
 	 * Used for vendor-specific transaction management and JDBC connection exposure.
 	 * <p>If the EntityManagerFactory uses a known JpaDialect, it will be autodetected:
-	 * You can still explictly specify the DataSource, but you don't need to in this case.
+	 * You can still explicitly specify the DataSource, but you don't need to in this case.
 	 * <p>The dialect object can be used to retrieve the underlying JDBC connection
 	 * and thus allows for exposing JPA transactions as JDBC transactions.
 	 * @see EntityManagerFactoryInfo#getJpaDialect()
@@ -329,8 +328,8 @@ protected Object doGetTransaction() {
 				TransactionSynchronizationManager.getResource(getEntityManagerFactory());
 		if (emHolder != null) {
 			if (logger.isDebugEnabled()) {
-				logger.debug("Found thread-bound EntityManager [" +
-						emHolder.getEntityManager() + "] for JPA transaction");
+				logger.debug("Found thread-bound EntityManager [" + emHolder.getEntityManager() +
+						"] for JPA transaction");
 			}
 			txObject.setEntityManagerHolder(emHolder, false);
 		}
@@ -398,15 +397,16 @@ public int getTimeout() {
 						conHolder.setTimeoutInSeconds(timeoutToUse);
 					}
 					if (logger.isDebugEnabled()) {
-						logger.debug("Exposing JPA transaction as JDBC transaction [" + conHolder.getConnectionHandle() + "]");
+						logger.debug("Exposing JPA transaction as JDBC transaction [" +
+								conHolder.getConnectionHandle() + "]");
 					}
 					TransactionSynchronizationManager.bindResource(getDataSource(), conHolder);
 					txObject.setConnectionHolder(conHolder);
 				}
 				else {
 					if (logger.isDebugEnabled()) {
-						logger.debug("Not exposing JPA transaction [" + em + "] as JDBC transaction because JpaDialect [" +
-								getJpaDialect() + "] does not support JDBC Connection retrieval");
+						logger.debug("Not exposing JPA transaction [" + em + "] as JDBC transaction because " +
+								"JpaDialect [" + getJpaDialect() + "] does not support JDBC Connection retrieval");
 					}
 				}
 			}
@@ -423,7 +423,7 @@ public int getTimeout() {
 			closeEntityManagerAfterFailedBegin(txObject);
 			throw ex;
 		}
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			closeEntityManagerAfterFailedBegin(txObject);
 			throw new CannotCreateTransactionException("Could not open JPA EntityManager for transaction", ex);
 		}
@@ -465,6 +465,7 @@ protected void closeEntityManagerAfterFailedBegin(JpaTransactionObject txObject)
 			finally {
 				EntityManagerFactoryUtils.closeEntityManager(em);
 			}
+			txObject.setEntityManagerHolder(null, false);
 		}
 	}
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
index 7cef875f28..5af22e5bbf 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,11 +78,10 @@
  * @see org.springframework.orm.jpa.support.SharedEntityManagerBean
  * @see javax.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory
  */
+@SuppressWarnings("serial")
 public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean
 		implements ResourceLoaderAware, LoadTimeWeaverAware {
 
-	private static final long serialVersionUID = 1L;
-
 	private PersistenceUnitManager persistenceUnitManager;
 
 	private final DefaultPersistenceUnitManager internalPersistenceUnitManager =
@@ -129,6 +128,7 @@ public void setPersistenceXmlLocation(String persistenceXmlLocation) {
 	 * Uses the specified persistence unit name as the name of the default
 	 * persistence unit, if applicable.
 	 * <p><b>NOTE: Only applied if no external PersistenceUnitManager specified.</b>
+	 * @see DefaultPersistenceUnitManager#setDefaultPersistenceUnitName
 	 */
 	@Override
 	public void setPersistenceUnitName(String persistenceUnitName) {
@@ -148,6 +148,7 @@ public void setPersistenceUnitName(String persistenceUnitName) {
 	 * @param packagesToScan one or more base packages to search, analogous to
 	 * Spring's component-scan configuration for regular Spring components
 	 * @see #setPersistenceUnitManager
+	 * @see DefaultPersistenceUnitManager#setPackagesToScan
 	 */
 	public void setPackagesToScan(String... packagesToScan) {
 		this.internalPersistenceUnitManager.setPackagesToScan(packagesToScan);
@@ -163,6 +164,7 @@ public void setPackagesToScan(String... packagesToScan) {
 	 * so that they can be loaded through {@code ClassLoader.getResource}.
 	 * <p><b>NOTE: Only applied if no external PersistenceUnitManager specified.</b>
 	 * @see #setPersistenceUnitManager
+	 * @see DefaultPersistenceUnitManager#setMappingResources
 	 */
 	public void setMappingResources(String... mappingResources) {
 		this.internalPersistenceUnitManager.setMappingResources(mappingResources);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
index 0913d234f0..f0bf7d59d7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,6 @@
  * @since 2.0
  * @see #setJpaProperties
  * @see #setJpaVendorAdapter
- * @see JpaTemplate#setEntityManagerFactory
  * @see JpaTransactionManager#setEntityManagerFactory
  * @see LocalContainerEntityManagerFactoryBean
  * @see org.springframework.jndi.JndiObjectFactoryBean
@@ -65,10 +64,9 @@
  * @see javax.persistence.Persistence#createEntityManagerFactory
  * @see javax.persistence.spi.PersistenceProvider#createEntityManagerFactory
  */
+@SuppressWarnings("serial")
 public class LocalEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean {
 
-	private static final long serialVersionUID = 1L;
-
 	/**
 	 * Initialize the EntityManagerFactory for the given configuration.
 	 * @throws javax.persistence.PersistenceException in case of JPA initialization errors
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
index 233ae1fbf5..b07b68a1fb 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,9 @@
 import javax.persistence.spi.PersistenceUnitInfo;
 import javax.sql.DataSource;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.context.weaving.LoadTimeWeaverAware;
@@ -103,6 +106,8 @@ public class DefaultPersistenceUnitManager
 			new AnnotationTypeFilter(Embeddable.class, false),
 			new AnnotationTypeFilter(MappedSuperclass.class, false)};
 
+	protected final Log logger = LogFactory.getLog(getClass());
+
 	private String[] persistenceXmlLocations = new String[] {DEFAULT_PERSISTENCE_XML_LOCATION};
 
 	private String defaultPersistenceUnitRootLocation = ORIGINAL_DEFAULT_PERSISTENCE_UNIT_ROOT_LOCATION;
@@ -305,9 +310,11 @@ public PersistenceUnitPostProcessor[] getPersistenceUnitPostProcessors() {
 	/**
 	 * Specify the Spring LoadTimeWeaver to use for class instrumentation according
 	 * to the JPA class transformer contract.
-	 * <p>It is not required to specify a LoadTimeWeaver: Most providers will be
-	 * able to provide a subset of their functionality without class instrumentation
-	 * as well, or operate with their VM agent specified on JVM startup.
+	 * <p>It is not required to specify a LoadTimeWeaver: Most providers will be able
+	 * to provide a subset of their functionality without class instrumentation as well,
+	 * or operate with their own VM agent specified on JVM startup. Furthermore,
+	 * DefaultPersistenceUnitManager falls back to an InstrumentationLoadTimeWeaver
+	 * if Spring's agent-based instrumentation is available at runtime.
 	 * <p>In terms of Spring-provided weaving options, the most important ones are
 	 * InstrumentationLoadTimeWeaver, which requires a Spring-specific (but very general)
 	 * VM agent specified on JVM startup, and ReflectiveLoadTimeWeaver, which interacts
@@ -315,12 +322,11 @@ public PersistenceUnitPostProcessor[] getPersistenceUnitPostProcessors() {
 	 * on it (for example, interacting with Spring's TomcatInstrumentableClassLoader).
 	 * <p><b>NOTE:</b> As of Spring 2.5, the context's default LoadTimeWeaver (defined
 	 * as bean with name "loadTimeWeaver") will be picked up automatically, if available,
-	 * removing the need for LoadTimeWeaver configuration on each affected target bean.</b>
+	 * removing the need for LoadTimeWeaver configuration on each affected target bean.
 	 * Consider using the {@code context:load-time-weaver} XML tag for creating
 	 * such a shared LoadTimeWeaver (autodetecting the environment by default).
 	 * @see org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver
 	 * @see org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver
-	 * @see org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader
 	 */
 	public void setLoadTimeWeaver(LoadTimeWeaver loadTimeWeaver) {
 		this.loadTimeWeaver = loadTimeWeaver;
@@ -358,6 +364,7 @@ public void afterPropertiesSet() {
 	public void preparePersistenceUnitInfos() {
 		this.persistenceUnitInfoNames.clear();
 		this.persistenceUnitInfos.clear();
+
 		List<SpringPersistenceUnitInfo> puis = readPersistenceUnitInfos();
 		for (SpringPersistenceUnitInfo pui : puis) {
 			if (pui.getPersistenceUnitRootUrl() == null) {
@@ -399,18 +406,29 @@ public void preparePersistenceUnitInfos() {
 	 */
 	private List<SpringPersistenceUnitInfo> readPersistenceUnitInfos() {
 		List<SpringPersistenceUnitInfo> infos = new LinkedList<SpringPersistenceUnitInfo>();
+		String defaultName = this.defaultPersistenceUnitName;
 		boolean buildDefaultUnit = (this.packagesToScan != null || this.mappingResources != null);
+		boolean foundDefaultUnit = false;
+
 		PersistenceUnitReader reader = new PersistenceUnitReader(this.resourcePatternResolver, this.dataSourceLookup);
 		SpringPersistenceUnitInfo[] readInfos = reader.readPersistenceUnitInfos(this.persistenceXmlLocations);
 		for (SpringPersistenceUnitInfo readInfo : readInfos) {
 			infos.add(readInfo);
-			if (this.defaultPersistenceUnitName != null &&
-					this.defaultPersistenceUnitName.equals(readInfo.getPersistenceUnitName())) {
-				buildDefaultUnit = false;
+			if (defaultName != null && defaultName.equals(readInfo.getPersistenceUnitName())) {
+				foundDefaultUnit = true;
 			}
 		}
+
 		if (buildDefaultUnit) {
-			infos.add(buildDefaultPersistenceUnitInfo());
+			if (foundDefaultUnit) {
+				if (logger.isInfoEnabled()) {
+					logger.info("Found explicit default unit with name '" + defaultName + "' in persistence.xml - " +
+							"overriding local default unit settings ('packagesToScan'/'mappingResources')");
+				}
+			}
+			else {
+				infos.add(buildDefaultPersistenceUnitInfo());
+			}
 		}
 		return infos;
 	}
@@ -447,7 +465,7 @@ private SpringPersistenceUnitInfo buildDefaultPersistenceUnitInfo() {
 					}
 				}
 				catch (IOException ex) {
-					throw new PersistenceException("Failed to scan classpath for unlisted classes", ex);
+					throw new PersistenceException("Failed to scan classpath for unlisted entity classes", ex);
 				}
 			}
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java
index 78f00a9f2e..358a695739 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -247,7 +247,7 @@ protected SpringPersistenceUnitInfo parsePersistenceUnitInfo(Element persistence
 			unitInfo.setTransactionType(PersistenceUnitTransactionType.valueOf(txType));
 		}
 
-		// data-source
+		// evaluate data sources
 		String jtaDataSource = DomUtils.getChildElementValueByTagName(persistenceUnit, JTA_DATA_SOURCE);
 		if (StringUtils.hasText(jtaDataSource)) {
 			unitInfo.setJtaDataSource(this.dataSourceLookup.getDataSource(jtaDataSource.trim()));
@@ -267,7 +267,8 @@ protected SpringPersistenceUnitInfo parsePersistenceUnitInfo(Element persistence
 		// exclude unlisted classes
 		Element excludeUnlistedClasses = DomUtils.getChildElementByTagName(persistenceUnit, EXCLUDE_UNLISTED_CLASSES);
 		if (excludeUnlistedClasses != null) {
-			unitInfo.setExcludeUnlistedClasses(true);
+			String excludeText = DomUtils.getTextValue(excludeUnlistedClasses);
+			unitInfo.setExcludeUnlistedClasses(!StringUtils.hasText(excludeText) || Boolean.valueOf(excludeText));
 		}
 
 		// set JPA 2.0 shared cache mode
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/AsyncRequestInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/AsyncRequestInterceptor.java
new file mode 100644
index 0000000000..eabd41ecb4
--- /dev/null
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/AsyncRequestInterceptor.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.orm.jpa.support;
+
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.orm.jpa.EntityManagerFactoryUtils;
+import org.springframework.orm.jpa.EntityManagerHolder;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.context.request.async.CallableProcessingInterceptorAdapter;
+import org.springframework.web.context.request.async.DeferredResult;
+import org.springframework.web.context.request.async.DeferredResultProcessingInterceptor;
+
+import javax.persistence.EntityManagerFactory;
+import java.util.concurrent.Callable;
+
+/**
+ * An interceptor with asynchronous web requests used in OpenSessionInViewFilter and
+ * OpenSessionInViewInterceptor.
+ *
+ * Ensures the following:
+ * 1) The session is bound/unbound when "callable processing" is started
+ * 2) The session is closed if an async request times out
+ *
+ * @author Rossen Stoyanchev
+ * @since 3.2.5
+ */
+public class AsyncRequestInterceptor extends CallableProcessingInterceptorAdapter
+		implements DeferredResultProcessingInterceptor {
+
+	private static final Log logger = LogFactory.getLog(AsyncRequestInterceptor.class);
+
+	private final EntityManagerFactory emFactory;
+
+	private final EntityManagerHolder emHolder;
+
+	private volatile boolean timeoutInProgress;
+
+
+	public AsyncRequestInterceptor(EntityManagerFactory emFactory, EntityManagerHolder emHolder) {
+		this.emFactory = emFactory;
+		this.emHolder = emHolder;
+	}
+
+
+	@Override
+	public <T> void preProcess(NativeWebRequest request, Callable<T> task) {
+		bindSession();
+	}
+
+	public void bindSession() {
+		this.timeoutInProgress = false;
+		TransactionSynchronizationManager.bindResource(this.emFactory, this.emHolder);
+	}
+
+	@Override
+	public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) {
+		TransactionSynchronizationManager.unbindResource(this.emFactory);
+	}
+
+	@Override
+	public <T> Object handleTimeout(NativeWebRequest request, Callable<T> task) {
+		this.timeoutInProgress = true;
+		return RESULT_NONE; // give other interceptors a chance to handle the timeout
+	}
+
+	@Override
+	public <T> void afterCompletion(NativeWebRequest request, Callable<T> task) throws Exception {
+		closeAfterTimeout();
+	}
+
+	private void closeAfterTimeout() {
+		if (this.timeoutInProgress) {
+			logger.debug("Closing JPA EntityManager after async request timeout");
+			EntityManagerFactoryUtils.closeEntityManager(emHolder.getEntityManager());
+		}
+	}
+
+
+	// Implementation of DeferredResultProcessingInterceptor methods
+
+	public <T> void beforeConcurrentHandling(NativeWebRequest request, DeferredResult<T> deferredResult) {
+	}
+
+	public <T> void preProcess(NativeWebRequest request, DeferredResult<T> deferredResult) {
+	}
+
+	public <T> void postProcess(NativeWebRequest request, DeferredResult<T> deferredResult, Object result) {
+	}
+
+	@Override
+	public <T> boolean handleTimeout(NativeWebRequest request, DeferredResult<T> deferredResult) {
+		this.timeoutInProgress = true;
+		return true; // give other interceptors a chance to handle the timeout
+	}
+
+	@Override
+	public <T> void afterCompletion(NativeWebRequest request, DeferredResult<T> deferredResult) {
+		closeAfterTimeout();
+	}
+
+}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java
index 7de9bf3429..673a685a18 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java
@@ -34,9 +34,7 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.async.CallableProcessingInterceptorAdapter;
-import org.springframework.web.context.request.async.WebAsyncManager;
-import org.springframework.web.context.request.async.WebAsyncUtils;
+import org.springframework.web.context.request.async.*;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
@@ -168,7 +166,9 @@ protected void doFilterInternal(
 					EntityManagerHolder emHolder = new EntityManagerHolder(em);
 					TransactionSynchronizationManager.bindResource(emf, emHolder);
 
-					asyncManager.registerCallableInterceptor(key, new EntityManagerBindingCallableInterceptor(emf, emHolder));
+					AsyncRequestInterceptor interceptor = new AsyncRequestInterceptor(emf, emHolder);
+					asyncManager.registerCallableInterceptor(key, interceptor);
+					asyncManager.registerDeferredResultInterceptor(key, interceptor);
 				}
 				catch (PersistenceException ex) {
 					throw new DataAccessResourceFailureException("Could not create JPA EntityManager", ex);
@@ -244,38 +244,8 @@ private boolean applyEntityManagerBindingInterceptor(WebAsyncManager asyncManage
 		if (asyncManager.getCallableInterceptor(key) == null) {
 			return false;
 		}
-		((EntityManagerBindingCallableInterceptor) asyncManager.getCallableInterceptor(key)).initializeThread();
+		((AsyncRequestInterceptor) asyncManager.getCallableInterceptor(key)).bindSession();
 		return true;
 	}
 
-	/**
-	 * Bind and unbind the {@code EntityManager} to the current thread.
-	 */
-	private static class EntityManagerBindingCallableInterceptor extends CallableProcessingInterceptorAdapter {
-
-		private final EntityManagerFactory emFactory;
-
-		private final EntityManagerHolder emHolder;
-
-
-		public EntityManagerBindingCallableInterceptor(EntityManagerFactory emFactory, EntityManagerHolder emHolder) {
-			this.emFactory = emFactory;
-			this.emHolder = emHolder;
-		}
-
-		@Override
-		public <T> void preProcess(NativeWebRequest request, Callable<T> task) {
-			initializeThread();
-		}
-
-		@Override
-		public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) {
-			TransactionSynchronizationManager.unbindResource(this.emFactory);
-		}
-
-		private void initializeThread() {
-			TransactionSynchronizationManager.bindResource(this.emFactory, this.emHolder);
-		}
-	}
-
 }
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java
index 8c9cf595ca..2ca81c61d3 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewInterceptor.java
@@ -97,8 +97,9 @@ public void preHandle(WebRequest request) throws DataAccessException {
 				EntityManagerHolder emHolder = new EntityManagerHolder(em);
 				TransactionSynchronizationManager.bindResource(getEntityManagerFactory(), emHolder);
 
-				asyncManager.registerCallableInterceptor(participateAttributeName,
-						new EntityManagerBindingCallableInterceptor(emHolder));
+				AsyncRequestInterceptor interceptor = new AsyncRequestInterceptor(getEntityManagerFactory(), emHolder);
+				asyncManager.registerCallableInterceptor(participateAttributeName, interceptor);
+				asyncManager.registerDeferredResultInterceptor(participateAttributeName, interceptor);
 			}
 			catch (PersistenceException ex) {
 				throw new DataAccessResourceFailureException("Could not create JPA EntityManager", ex);
@@ -155,36 +156,8 @@ private boolean applyCallableInterceptor(WebAsyncManager asyncManager, String ke
 		if (asyncManager.getCallableInterceptor(key) == null) {
 			return false;
 		}
-		((EntityManagerBindingCallableInterceptor) asyncManager.getCallableInterceptor(key)).initializeThread();
+		((AsyncRequestInterceptor) asyncManager.getCallableInterceptor(key)).bindSession();
 		return true;
 	}
 
-
-	/**
-	 * Bind and unbind the Hibernate {@code Session} to the current thread.
-	 */
-	private class EntityManagerBindingCallableInterceptor extends CallableProcessingInterceptorAdapter {
-
-		private final EntityManagerHolder emHolder;
-
-
-		public EntityManagerBindingCallableInterceptor(EntityManagerHolder emHolder) {
-			this.emHolder = emHolder;
-		}
-
-		@Override
-		public <T> void preProcess(NativeWebRequest request, Callable<T> task) {
-			initializeThread();
-		}
-
-		@Override
-		public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) {
-			TransactionSynchronizationManager.unbindResource(getEntityManagerFactory());
-		}
-
-		private void initializeThread() {
-			TransactionSynchronizationManager.bindResource(getEntityManagerFactory(), this.emHolder);
-		}
-	}
-
 }
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
index 39c437e8cd..4e25b2b4fc 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@
 import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessor;
 import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
 import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.core.BridgeMethodResolver;
 import org.springframework.core.Ordered;
 import org.springframework.core.PriorityOrdered;
 import org.springframework.jndi.JndiLocatorDelegate;
@@ -61,6 +62,7 @@
 import org.springframework.orm.jpa.SharedEntityManagerCreator;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * BeanPostProcessor that processes {@link javax.persistence.PersistenceUnit}
@@ -181,8 +183,8 @@ public class PersistenceAnnotationBeanPostProcessor
 
 	private transient ListableBeanFactory beanFactory;
 
-	private transient final Map<Class<?>, InjectionMetadata> injectionMetadataCache =
-			new ConcurrentHashMap<Class<?>, InjectionMetadata>(64);
+	private transient final Map<String, InjectionMetadata> injectionMetadataCache =
+			new ConcurrentHashMap<String, InjectionMetadata>(64);
 
 	private final Map<Object, EntityManager> extendedEntityManagersToClose =
 			new ConcurrentHashMap<Object, EntityManager>(16);
@@ -319,7 +321,7 @@ public void setBeanFactory(BeanFactory beanFactory) {
 
 	public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
 		if (beanType != null) {
-			InjectionMetadata metadata = findPersistenceMetadata(beanType);
+			InjectionMetadata metadata = findPersistenceMetadata(beanName, beanType, null);
 			metadata.checkConfigMembers(beanDefinition);
 		}
 	}
@@ -335,7 +337,7 @@ public boolean postProcessAfterInstantiation(Object bean, String beanName) throw
 	public PropertyValues postProcessPropertyValues(
 			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeansException {
 
-		InjectionMetadata metadata = findPersistenceMetadata(bean.getClass());
+		InjectionMetadata metadata = findPersistenceMetadata(beanName, bean.getClass(), pvs);
 		try {
 			metadata.inject(bean, beanName, pvs);
 		}
@@ -359,22 +361,27 @@ public void postProcessBeforeDestruction(Object bean, String beanName) throws Be
 	}
 
 
-	private InjectionMetadata findPersistenceMetadata(final Class<?> clazz) {
+	private InjectionMetadata findPersistenceMetadata(String beanName, final Class<?> clazz, PropertyValues pvs) {
+		// Fall back to class name as cache key, for backwards compatibility with custom callers.
+		String cacheKey = (StringUtils.hasLength(beanName) ? beanName : clazz.getName());
 		// Quick check on the concurrent map first, with minimal locking.
-		InjectionMetadata metadata = this.injectionMetadataCache.get(clazz);
-		if (metadata == null) {
+		InjectionMetadata metadata = this.injectionMetadataCache.get(cacheKey);
+		if (InjectionMetadata.needsRefresh(metadata, clazz)) {
 			synchronized (this.injectionMetadataCache) {
-				metadata = this.injectionMetadataCache.get(clazz);
-				if (metadata == null) {
+				metadata = this.injectionMetadataCache.get(cacheKey);
+				if (InjectionMetadata.needsRefresh(metadata, clazz)) {
+					if (metadata != null) {
+						metadata.clear(pvs);
+					}
+
 					LinkedList<InjectionMetadata.InjectedElement> elements = new LinkedList<InjectionMetadata.InjectedElement>();
 					Class<?> targetClass = clazz;
 
 					do {
 						LinkedList<InjectionMetadata.InjectedElement> currElements = new LinkedList<InjectionMetadata.InjectedElement>();
 						for (Field field : targetClass.getDeclaredFields()) {
-							PersistenceContext pc = field.getAnnotation(PersistenceContext.class);
-							PersistenceUnit pu = field.getAnnotation(PersistenceUnit.class);
-							if (pc != null || pu != null) {
+							if (field.isAnnotationPresent(PersistenceContext.class) ||
+									field.isAnnotationPresent(PersistenceUnit.class)) {
 								if (Modifier.isStatic(field.getModifiers())) {
 									throw new IllegalStateException("Persistence annotations are not supported on static fields");
 								}
@@ -382,17 +389,17 @@ private InjectionMetadata findPersistenceMetadata(final Class<?> clazz) {
 							}
 						}
 						for (Method method : targetClass.getDeclaredMethods()) {
-							PersistenceContext pc = method.getAnnotation(PersistenceContext.class);
-							PersistenceUnit pu = method.getAnnotation(PersistenceUnit.class);
-							if ((pc != null || pu != null) &&
-									method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
+							method = BridgeMethodResolver.findBridgedMethod(method);
+							if ((method.isAnnotationPresent(PersistenceContext.class) ||
+									method.isAnnotationPresent(PersistenceUnit.class)) &&
+									method.equals(BridgeMethodResolver.findBridgedMethod(ClassUtils.getMostSpecificMethod(method, clazz)))) {
 								if (Modifier.isStatic(method.getModifiers())) {
 									throw new IllegalStateException("Persistence annotations are not supported on static methods");
 								}
 								if (method.getParameterTypes().length != 1) {
 									throw new IllegalStateException("Persistence annotation requires a single-arg method: " + method);
 								}
-								PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);
+								PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method, clazz);
 								currElements.add(new PersistenceElement(method, pd));
 							}
 						}
@@ -402,7 +409,7 @@ private InjectionMetadata findPersistenceMetadata(final Class<?> clazz) {
 					while (targetClass != null && targetClass != Object.class);
 
 					metadata = new InjectionMetadata(clazz, elements);
-					this.injectionMetadataCache.put(clazz, metadata);
+					this.injectionMetadataCache.put(cacheKey, metadata);
 				}
 			}
 		}
@@ -688,8 +695,8 @@ private EntityManager resolveExtendedEntityManager(Object target, String request
 				// Inject a container-managed extended EntityManager.
 				em = ExtendedEntityManagerCreator.createContainerManagedEntityManager(emf, this.properties);
 			}
-			if (em instanceof EntityManagerProxy &&
-					beanFactory != null && !beanFactory.isPrototype(requestingBeanName)) {
+			if (em instanceof EntityManagerProxy && beanFactory != null &&
+					beanFactory.containsBean(requestingBeanName) && !beanFactory.isPrototype(requestingBeanName)) {
 				extendedEntityManagersToClose.put(target, ((EntityManagerProxy) em).getTargetEntityManager());
 			}
 			return em;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
index 1293b335d4..432d070280 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,12 +35,13 @@
 import org.springframework.orm.jpa.EntityManagerFactoryUtils;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionException;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
 /**
  * {@link org.springframework.orm.jpa.JpaDialect} implementation for
- * Hibernate EntityManager. Developed against Hibernate 3.3;
- * tested against 3.3, 3.5, 3.6 and 4.0 (with the latter including
+ * Hibernate EntityManager. Developed against Hibernate 3.3; tested
+ * against 3.3, 3.5, 3.6, 4.0, 4.1 and 4.2 (with the latter including
  * Hibernate EntityManager in the Hibernate core distribution).
  *
  * @author Costin Leau
@@ -147,7 +148,11 @@ private static class HibernateConnectionHandle implements ConnectionHandle {
 
 		private final Session session;
 
-		private static volatile Method connectionMethod;
+		// This will find a corresponding method on Hibernate 3.x but not on 4.x
+		private static final Method sessionConnectionMethod =
+				ClassUtils.getMethodIfAvailable(Session.class, "connection");
+
+		private static volatile Method connectionMethodToUse = sessionConnectionMethod;
 
 		public HibernateConnectionHandle(Session session) {
 			this.session = session;
@@ -155,19 +160,26 @@ public HibernateConnectionHandle(Session session) {
 
 		public Connection getConnection() {
 			try {
-				if (connectionMethod == null) {
-					// reflective lookup to bridge between Hibernate 3.x and 4.x
-					connectionMethod = this.session.getClass().getMethod("connection");
+				if (connectionMethodToUse == null) {
+					// Reflective lookup trying to find SessionImpl's connection() on Hibernate 4.x
+					connectionMethodToUse = this.session.getClass().getMethod("connection");
 				}
-				return (Connection) ReflectionUtils.invokeMethod(connectionMethod, this.session);
+				return (Connection) ReflectionUtils.invokeMethod(connectionMethodToUse, this.session);
 			}
 			catch (NoSuchMethodException ex) {
-				throw new IllegalStateException("Cannot find connection() method on Hibernate session", ex);
+				throw new IllegalStateException("Cannot find connection() method on Hibernate Session", ex);
 			}
 		}
 
 		public void releaseConnection(Connection con) {
-			JdbcUtils.closeConnection(con);
+			if (sessionConnectionMethod != null) {
+				// Need to explicitly call close() with Hibernate 3.x in order to allow
+				// for eager release of the underlying physical Connection if necessary.
+				// However, do not do this on Hibernate 4.2+ since it would return the
+				// physical Connection to the pool right away, making it unusable for
+				// further operations within the current transaction!
+				JdbcUtils.closeConnection(con);
+			}
 		}
 	}
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-1.0.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-1.0.xml
new file mode 100644
index 0000000000..6218437f28
--- /dev/null
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-1.0.xml
@@ -0,0 +1,20 @@
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+          http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+			 version="1.0">
+
+	<persistence-unit name="NoExcludeElement" />
+
+	<persistence-unit name="EmptyExcludeElement">
+		<exclude-unlisted-classes />
+	</persistence-unit>
+
+	<persistence-unit name="TrueExcludeElement">
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+	</persistence-unit>
+
+	<persistence-unit name="FalseExcludeElement">
+		<exclude-unlisted-classes>false</exclude-unlisted-classes>
+	</persistence-unit>
+</persistence>
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-2.0.xml b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-2.0.xml
new file mode 100644
index 0000000000..6127bb6946
--- /dev/null
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-2.0.xml
@@ -0,0 +1,20 @@
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+          http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+			 version="2.0">
+
+	<persistence-unit name="NoExcludeElement" />
+
+	<persistence-unit name="EmptyExcludeElement">
+		<exclude-unlisted-classes />
+	</persistence-unit>
+
+	<persistence-unit name="TrueExcludeElement">
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+	</persistence-unit>
+
+	<persistence-unit name="FalseExcludeElement">
+		<exclude-unlisted-classes>false</exclude-unlisted-classes>
+	</persistence-unit>
+</persistence>
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
index 496d9d641a..36a170aef7 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
@@ -43,6 +43,7 @@
  *
  * @author Costin Leau
  * @author Juergen Hoeller
+ * @author Nicholas Williams
  */
 public class PersistenceXmlParsingTests {
 
@@ -60,6 +61,8 @@ public void testMetaInfCase() throws Exception {
 		assertEquals(2, info[0].getJarFileUrls().size());
 		assertEquals(new ClassPathResource("order.jar").getURL(), info[0].getJarFileUrls().get(0));
 		assertEquals(new ClassPathResource("order-supplemental.jar").getURL(), info[0].getJarFileUrls().get(1));
+
+		assertFalse("Exclude unlisted should default false in 1.0.", info[0].excludeUnlistedClasses());
 	}
 
 	@Test
@@ -72,6 +75,8 @@ public void testExample1() throws Exception {
 		assertNotNull(info);
 		assertEquals(1, info.length);
 		assertEquals("OrderManagement", info[0].getPersistenceUnitName());
+
+		assertFalse("Exclude unlisted should default false in 1.0.", info[0].excludeUnlistedClasses());
 	}
 
 	@Test
@@ -89,6 +94,8 @@ public void testExample2() throws Exception {
 		assertEquals(1, info[0].getMappingFileNames().size());
 		assertEquals("mappings.xml", info[0].getMappingFileNames().get(0));
 		assertEquals(0, info[0].getProperties().keySet().size());
+
+		assertFalse("Exclude unlisted should default false in 1.0.", info[0].excludeUnlistedClasses());
 	}
 
 	@Test
@@ -109,6 +116,8 @@ public void testExample3() throws Exception {
 		assertEquals(0, info[0].getProperties().keySet().size());
 		assertNull(info[0].getJtaDataSource());
 		assertNull(info[0].getNonJtaDataSource());
+
+		assertFalse("Exclude unlisted should default false in 1.0.", info[0].excludeUnlistedClasses());
 	}
 
 	@Test
@@ -134,7 +143,7 @@ public void testExample4() throws Exception {
 		assertEquals("com.acme.Customer", info[0].getManagedClassNames().get(1));
 		assertEquals("com.acme.Item", info[0].getManagedClassNames().get(2));
 
-		assertTrue(info[0].excludeUnlistedClasses());
+		assertTrue("Exclude unlisted should be true when no value.", info[0].excludeUnlistedClasses());
 
 		assertSame(PersistenceUnitTransactionType.RESOURCE_LOCAL, info[0].getTransactionType());
 		assertEquals(0, info[0].getProperties().keySet().size());
@@ -163,6 +172,8 @@ public void testExample5() throws Exception {
 
 		assertEquals("com.acme.AcmePersistence", info[0].getPersistenceProviderClassName());
 		assertEquals(0, info[0].getProperties().keySet().size());
+
+		assertFalse("Exclude unlisted should default false in 1.0.", info[0].excludeUnlistedClasses());
 	}
 
 	@Test
@@ -206,6 +217,8 @@ public void testExampleComplex() throws Exception {
 
 		assertSame(ds, pu1.getJtaDataSource());
 
+		assertFalse("Exclude unlisted should default false in 1.0.", pu1.excludeUnlistedClasses());
+
 		PersistenceUnitInfo pu2 = info[1];
 
 		assertSame(PersistenceUnitTransactionType.JTA, pu2.getTransactionType());
@@ -222,6 +235,8 @@ public void testExampleComplex() throws Exception {
 
 		assertNull(pu2.getJtaDataSource());
 		assertEquals(ds, pu2.getNonJtaDataSource());
+
+		assertTrue("Exclude unlisted should be true when no value.", pu2.excludeUnlistedClasses());
 	}
 
 	@Test
@@ -233,6 +248,8 @@ public void testExample6() throws Exception {
 		assertEquals(1, info.length);
 		assertEquals("pu", info[0].getPersistenceUnitName());
 		assertEquals(0, info[0].getProperties().keySet().size());
+
+		assertFalse("Exclude unlisted should default false in 1.0.", info[0].excludeUnlistedClasses());
 	}
 
 	@Ignore  // not doing schema parsing anymore for JPA 2.0 compatibility
@@ -290,4 +307,66 @@ public void testPersistenceUnitRootUrlWithJar() throws Exception {
 		assertTrue("the archive location should have been returned", archive.getURL().sameFile(url));
 	}
 
+	@Test
+	public void testJpa1ExcludeUnlisted() throws Exception {
+		PersistenceUnitReader reader = new PersistenceUnitReader(
+				new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup());
+		String resource = "/org/springframework/orm/jpa/persistence-exclude-1.0.xml";
+		PersistenceUnitInfo[] info = reader.readPersistenceUnitInfos(resource);
+
+		assertNotNull(info);
+		assertEquals("The number of persistence units is incorrect.", 4, info.length);
+
+		PersistenceUnitInfo noExclude = info[0];
+		assertNotNull("noExclude should not be null.", noExclude);
+		assertEquals("noExclude name is not correct.", "NoExcludeElement", noExclude.getPersistenceUnitName());
+		assertFalse("Exclude unlisted should default false in 1.0.", noExclude.excludeUnlistedClasses());
+
+		PersistenceUnitInfo emptyExclude = info[1];
+		assertNotNull("emptyExclude should not be null.", emptyExclude);
+		assertEquals("emptyExclude name is not correct.", "EmptyExcludeElement", emptyExclude.getPersistenceUnitName());
+		assertTrue("emptyExclude should be true.", emptyExclude.excludeUnlistedClasses());
+
+		PersistenceUnitInfo trueExclude = info[2];
+		assertNotNull("trueExclude should not be null.", trueExclude);
+		assertEquals("trueExclude name is not correct.", "TrueExcludeElement", trueExclude.getPersistenceUnitName());
+		assertTrue("trueExclude should be true.", trueExclude.excludeUnlistedClasses());
+
+		PersistenceUnitInfo falseExclude = info[3];
+		assertNotNull("falseExclude should not be null.", falseExclude);
+		assertEquals("falseExclude name is not correct.", "FalseExcludeElement", falseExclude.getPersistenceUnitName());
+		assertFalse("falseExclude should be false.", falseExclude.excludeUnlistedClasses());
+	}
+
+	@Test
+	public void testJpa2ExcludeUnlisted() throws Exception {
+		PersistenceUnitReader reader = new PersistenceUnitReader(
+				new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup());
+		String resource = "/org/springframework/orm/jpa/persistence-exclude-2.0.xml";
+		PersistenceUnitInfo[] info = reader.readPersistenceUnitInfos(resource);
+
+		assertNotNull(info);
+		assertEquals("The number of persistence units is incorrect.", 4, info.length);
+
+		PersistenceUnitInfo noExclude = info[0];
+		assertNotNull("noExclude should not be null.", noExclude);
+		assertEquals("noExclude name is not correct.", "NoExcludeElement", noExclude.getPersistenceUnitName());
+		assertFalse("Exclude unlisted still defaults to false in 2.0.", noExclude.excludeUnlistedClasses());
+
+		PersistenceUnitInfo emptyExclude = info[1];
+		assertNotNull("emptyExclude should not be null.", emptyExclude);
+		assertEquals("emptyExclude name is not correct.", "EmptyExcludeElement", emptyExclude.getPersistenceUnitName());
+		assertTrue("emptyExclude should be true.", emptyExclude.excludeUnlistedClasses());
+
+		PersistenceUnitInfo trueExclude = info[2];
+		assertNotNull("trueExclude should not be null.", trueExclude);
+		assertEquals("trueExclude name is not correct.", "TrueExcludeElement", trueExclude.getPersistenceUnitName());
+		assertTrue("trueExclude should be true.", trueExclude.excludeUnlistedClasses());
+
+		PersistenceUnitInfo falseExclude = info[3];
+		assertNotNull("falseExclude should not be null.", falseExclude);
+		assertEquals("falseExclude name is not correct.", "FalseExcludeElement", falseExclude.getPersistenceUnitName());
+		assertFalse("falseExclude should be false.", falseExclude.excludeUnlistedClasses());
+	}
+
 }
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
index 9833c7146d..0bbc6e6eb5 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceContext;
@@ -34,6 +33,7 @@
 import org.hibernate.ejb.HibernateEntityManager;
 import org.junit.Ignore;
 import org.junit.Test;
+
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -140,6 +140,26 @@ public void testPublicSpecificExtendedPersistenceContextSetter() throws Exceptio
 		verify(mockEm2).flush();
 	}
 
+	@Test
+	public void testInjectionIntoExistingObjects() {
+		EntityManager mockEm = mock(EntityManager.class);
+		given(mockEmf.createEntityManager()).willReturn(mockEm);
+
+		GenericApplicationContext gac = new GenericApplicationContext();
+		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
+		gac.registerBeanDefinition("annotationProcessor",
+				new RootBeanDefinition(PersistenceAnnotationBeanPostProcessor.class));
+		gac.refresh();
+
+		DefaultPrivatePersistenceContextField existingBean1 = new DefaultPrivatePersistenceContextField();
+		gac.getAutowireCapableBeanFactory().autowireBean(existingBean1);
+		assertNotNull(existingBean1.em);
+
+		DefaultPublicPersistenceContextSetter existingBean2 = new DefaultPublicPersistenceContextSetter();
+		gac.getAutowireCapableBeanFactory().autowireBean(existingBean2);
+		assertNotNull(existingBean2.em);
+	}
+
 	@Test
 	public void testPublicExtendedPersistenceContextSetterWithSerialization() throws Exception {
 		DummyInvocationHandler ih = new DummyInvocationHandler();
@@ -524,7 +544,7 @@ public void testSinglePersistenceContextFromJndi() {
 	public void testFieldOfWrongTypeAnnotatedWithPersistenceUnit() {
 		PersistenceAnnotationBeanPostProcessor babpp = new PersistenceAnnotationBeanPostProcessor();
 		try {
-			babpp.postProcessPropertyValues(null, null, new FieldOfWrongTypeAnnotatedWithPersistenceUnit(), null);
+			babpp.postProcessPropertyValues(null, null, new FieldOfWrongTypeAnnotatedWithPersistenceUnit(), "bean");
 			fail("Can't inject this field");
 		}
 		catch (IllegalStateException ex) {
@@ -536,7 +556,7 @@ public void testFieldOfWrongTypeAnnotatedWithPersistenceUnit() {
 	public void testSetterOfWrongTypeAnnotatedWithPersistenceUnit() {
 		PersistenceAnnotationBeanPostProcessor babpp = new PersistenceAnnotationBeanPostProcessor();
 		try {
-			babpp.postProcessPropertyValues(null, null, new SetterOfWrongTypeAnnotatedWithPersistenceUnit(), null);
+			babpp.postProcessPropertyValues(null, null, new SetterOfWrongTypeAnnotatedWithPersistenceUnit(), "bean");
 			fail("Can't inject this setter");
 		}
 		catch (IllegalStateException ex) {
@@ -548,7 +568,7 @@ public void testSetterOfWrongTypeAnnotatedWithPersistenceUnit() {
 	public void testSetterWithNoArgs() {
 		PersistenceAnnotationBeanPostProcessor babpp = new PersistenceAnnotationBeanPostProcessor();
 		try {
-			babpp.postProcessPropertyValues(null, null, new SetterWithNoArgs(), null);
+			babpp.postProcessPropertyValues(null, null, new SetterWithNoArgs(), "bean");
 			fail("Can't inject this setter");
 		}
 		catch (IllegalStateException ex) {
@@ -593,7 +613,7 @@ public void testPropertiesForTransactionalEntityManager() {
 		PersistenceAnnotationBeanPostProcessor babpp = new MockPersistenceAnnotationBeanPostProcessor();
 		DefaultPrivatePersistenceContextFieldWithProperties transactionalField =
 				new DefaultPrivatePersistenceContextFieldWithProperties();
-		babpp.postProcessPropertyValues(null, null, transactionalField, null);
+		babpp.postProcessPropertyValues(null, null, transactionalField, "bean");
 
 		assertNotNull(transactionalField.em);
 		assertNotNull(transactionalField.em.getDelegate());
@@ -620,8 +640,8 @@ public void testPropertiesForSharedEntityManager1() {
 				new DefaultPrivatePersistenceContextFieldWithProperties();
 		DefaultPrivatePersistenceContextField transactionalField = new DefaultPrivatePersistenceContextField();
 
-		babpp.postProcessPropertyValues(null, null, transactionalFieldWithProperties, null);
-		babpp.postProcessPropertyValues(null, null, transactionalField, null);
+		babpp.postProcessPropertyValues(null, null, transactionalFieldWithProperties, "bean1");
+		babpp.postProcessPropertyValues(null, null, transactionalField, "bean2");
 
 		assertNotNull(transactionalFieldWithProperties.em);
 		assertNotNull(transactionalField.em);
@@ -653,8 +673,8 @@ public void testPropertiesForSharedEntityManager2() {
 				new DefaultPrivatePersistenceContextFieldWithProperties();
 		DefaultPrivatePersistenceContextField transactionalField = new DefaultPrivatePersistenceContextField();
 
-		babpp.postProcessPropertyValues(null, null, transactionalFieldWithProperties, null);
-		babpp.postProcessPropertyValues(null, null, transactionalField, null);
+		babpp.postProcessPropertyValues(null, null, transactionalFieldWithProperties, "bean1");
+		babpp.postProcessPropertyValues(null, null, transactionalField, "bean2");
 
 		assertNotNull(transactionalFieldWithProperties.em);
 		assertNotNull(transactionalField.em);
@@ -753,7 +773,7 @@ public EntityManager getEntityManager() {
 
 
 	@SuppressWarnings("serial")
-	public static class SpecificPublicPersistenceContextSetter extends DefaultPublicPersistenceContextSetter {
+	static class PublicPersistenceContextSetterOnNonPublicClass extends DefaultPublicPersistenceContextSetter {
 
 		@Override
 		@PersistenceContext(unitName="unit2", type = PersistenceContextType.EXTENDED)
@@ -763,6 +783,11 @@ public void setEntityManager(EntityManager em) {
 	}
 
 
+	@SuppressWarnings("serial")
+	public static class SpecificPublicPersistenceContextSetter extends PublicPersistenceContextSetterOnNonPublicClass {
+	}
+
+
 	public static class DefaultPrivatePersistenceUnitField {
 
 		@PersistenceUnit
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java
index c3bef0c283..319a726ade 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.orm.jpa.toplink;
 
+import org.junit.Ignore;
+
 import org.springframework.orm.jpa.AbstractContainerEntityManagerFactoryIntegrationTests;
 import org.springframework.orm.jpa.EntityManagerFactoryInfo;
 
@@ -26,6 +28,7 @@
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@Ignore
 public class TopLinkEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests {
 
 	@Override
diff --git a/spring-oxm/oxm.gradle b/spring-oxm/oxm.gradle
index 0b8aee62e9..3091e9a108 100644
--- a/spring-oxm/oxm.gradle
+++ b/spring-oxm/oxm.gradle
@@ -5,11 +5,11 @@ configurations {
 	jibx
 }
 dependencies {
-	castor "org.codehaus.castor:castor-anttasks:1.2"
+	castor "org.codehaus.castor:castor-anttasks:1.3.3"
 	castor "velocity:velocity:1.5"
-	xjc "com.sun.xml.bind:jaxb-xjc:2.1.7"
-	xmlbeans "org.apache.xmlbeans:xmlbeans:2.4.0"
-	jibx "org.jibx:jibx-bind:1.2.3"
+	xjc "com.sun.xml.bind:jaxb-xjc:2.1.17"
+	xmlbeans "org.apache.xmlbeans:xmlbeans:2.6.0"
+	jibx "org.jibx:jibx-bind:1.2.5"
 	jibx "bcel:bcel:5.1"
 }
 
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
index 131b782c87..489f9bbcc5 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -162,6 +162,11 @@ public void setEncoding(String encoding) {
 		this.encoding = encoding;
 	}
 
+	@Override
+	protected String getDefaultEncoding() {
+		return this.encoding;
+	}
+
 	/**
 	 * Set the locations of the Castor XML mapping files.
 	 */
@@ -170,30 +175,32 @@ public void setMappingLocation(Resource mappingLocation) {
 	}
 
 	/**
-	 * Set the locations of the Castor XML Mapping files.
+	 * Set the locations of the Castor XML mapping files.
 	 */
 	public void setMappingLocations(Resource[] mappingLocations) {
 		this.mappingLocations = mappingLocations;
 	}
 
 	/**
-	 * Set the Castor target class. Alternative means of configuring {@code CastorMarshaller} for unmarshalling
-	 * multiple classes include use of mapping files, and specifying packages with Castor descriptor classes.
+	 * Set the Castor target class.
+	 * @see #setTargetPackage
+	 * @see #setMappingLocation
 	 */
 	public void setTargetClass(Class targetClass) {
 		this.targetClasses = new Class[]{targetClass};
 	}
 
 	/**
-	 * Set the Castor target classes. Alternative means of configuring {@code CastorMarshaller} for unmarshalling
-	 * multiple classes include use of mapping files, and specifying packages with Castor descriptor classes.
+	 * Set the Castor target classes.
+	 * @see #setTargetPackages
+	 * @see #setMappingLocations
 	 */
 	public void setTargetClasses(Class[] targetClasses) {
 		this.targetClasses = targetClasses;
 	}
 
 	/**
-	 * Set the names of package with the Castor descriptor classes.
+	 * Set the name of a package with the Castor descriptor classes.
 	 */
 	public void setTargetPackage(String targetPackage) {
 		this.targetPackages = new String[] {targetPackage};
@@ -602,7 +609,7 @@ protected final Object unmarshalReader(Reader reader) throws XmlMappingException
 	}
 
 	@Override
-	protected final Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource)
+	protected Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource)
 			throws XmlMappingException, IOException {
 
 		UnmarshalHandler unmarshalHandler = createUnmarshaller().createHandler();
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java
index c6f97d2493..f3047013a6 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,16 +19,16 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 
 import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternUtils;
 import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
@@ -42,62 +42,58 @@
  * Helper class for {@link Jaxb2Marshaller} that scans given packages for classes marked with JAXB2 annotations.
  *
  * @author Arjen Poutsma
+ * @author Juergen Hoeller
  * @author David Harrigan
+ * @author Biju Kunjummen
+ * @since 3.1.1
  * @see #scanPackages()
  */
 class ClassPathJaxb2TypeScanner {
 
 	private static final String RESOURCE_PATTERN = "/**/*.class";
 
-	private final TypeFilter[] jaxb2TypeFilters =
-			new TypeFilter[]{new AnnotationTypeFilter(XmlRootElement.class, false),
-					new AnnotationTypeFilter(XmlType.class, false), new AnnotationTypeFilter(XmlSeeAlso.class, false),
-					new AnnotationTypeFilter(XmlEnum.class, false)};
+	private static final TypeFilter[] JAXB2_TYPE_FILTERS = new TypeFilter[] {
+			new AnnotationTypeFilter(XmlRootElement.class, false),
+			new AnnotationTypeFilter(XmlType.class, false),
+			new AnnotationTypeFilter(XmlSeeAlso.class, false),
+			new AnnotationTypeFilter(XmlEnum.class, false),
+			new AnnotationTypeFilter(XmlRegistry.class, false)};
 
-	private final String[] packagesToScan;
 
-	private ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
+	private final ResourcePatternResolver resourcePatternResolver;
 
-	private List<Class<?>> jaxb2Classes = new ArrayList<Class<?>>();
+	private final String[] packagesToScan;
 
-	/** Constructs a new {@code ClassPathJaxb2TypeScanner} for the given packages. */
-	ClassPathJaxb2TypeScanner(String[] packagesToScan) {
+
+	public ClassPathJaxb2TypeScanner(ClassLoader classLoader, String... packagesToScan) {
 		Assert.notEmpty(packagesToScan, "'packagesToScan' must not be empty");
+		this.resourcePatternResolver = new PathMatchingResourcePatternResolver(classLoader);
 		this.packagesToScan = packagesToScan;
 	}
 
-	void setResourceLoader(ResourceLoader resourceLoader) {
-		if (resourceLoader != null) {
-			this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader);
-		}
-	}
-
-	/** Returns the JAXB2 classes found in the specified packages. */
-	Class<?>[] getJaxb2Classes() {
-		return jaxb2Classes.toArray(new Class<?>[jaxb2Classes.size()]);
-	}
 
 	/**
-	 * Scans the packages for classes marked with JAXB2 annotations.
-	 *
+	 * Scan the packages for classes marked with JAXB2 annotations.
 	 * @throws UncategorizedMappingException in case of errors
 	 */
-	void scanPackages() throws UncategorizedMappingException {
+	public Class<?>[] scanPackages() throws UncategorizedMappingException {
 		try {
-			for (String packageToScan : packagesToScan) {
+			List<Class<?>> jaxb2Classes = new ArrayList<Class<?>>();
+			for (String packageToScan : this.packagesToScan) {
 				String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX +
 						ClassUtils.convertClassNameToResourcePath(packageToScan) + RESOURCE_PATTERN;
-				Resource[] resources = resourcePatternResolver.getResources(pattern);
-				MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resourcePatternResolver);
+				Resource[] resources = this.resourcePatternResolver.getResources(pattern);
+				MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(this.resourcePatternResolver);
 				for (Resource resource : resources) {
 					MetadataReader metadataReader = metadataReaderFactory.getMetadataReader(resource);
 					if (isJaxb2Class(metadataReader, metadataReaderFactory)) {
 						String className = metadataReader.getClassMetadata().getClassName();
-						Class<?> jaxb2AnnotatedClass = resourcePatternResolver.getClassLoader().loadClass(className);
+						Class<?> jaxb2AnnotatedClass = this.resourcePatternResolver.getClassLoader().loadClass(className);
 						jaxb2Classes.add(jaxb2AnnotatedClass);
 					}
 				}
 			}
+			return jaxb2Classes.toArray(new Class<?>[jaxb2Classes.size()]);
 		}
 		catch (IOException ex) {
 			throw new UncategorizedMappingException("Failed to scan classpath for unlisted classes", ex);
@@ -107,8 +103,8 @@ void scanPackages() throws UncategorizedMappingException {
 		}
 	}
 
-	private boolean isJaxb2Class(MetadataReader reader, MetadataReaderFactory factory) throws IOException {
-		for (TypeFilter filter : jaxb2TypeFilters) {
+	protected boolean isJaxb2Class(MetadataReader reader, MetadataReaderFactory factory) throws IOException {
+		for (TypeFilter filter : JAXB2_TYPE_FILTERS) {
 			if (filter.match(reader, factory)) {
 				return true;
 			}
@@ -116,5 +112,4 @@ private boolean isJaxb2Class(MetadataReader reader, MetadataReaderFactory factor
 		return false;
 	}
 
-
 }
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
index 8df021c7a6..ed3d1bf54d 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
@@ -61,13 +62,17 @@
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stax.StAXSource;
+import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.ls.LSResourceResolver;
+import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
@@ -75,11 +80,9 @@
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.JdkVersion;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
 import org.springframework.oxm.GenericMarshaller;
 import org.springframework.oxm.GenericUnmarshaller;
 import org.springframework.oxm.MarshallingFailureException;
@@ -99,7 +102,7 @@
 import org.springframework.util.xml.StaxUtils;
 
 /**
- * Implementation of the {@code Marshaller} interface for JAXB 2.0.
+ * Implementation of the {@code GenericMarshaller} interface for JAXB 2.0+.
  *
  * <p>The typical usage will be to set either the "contextPath" or the "classesToBeBound"
  * property on this bean, possibly customize the marshaller and unmarshaller by setting
@@ -107,6 +110,7 @@
  *
  * @author Arjen Poutsma
  * @author Juergen Hoeller
+ * @author Rossen Stoyanchev
  * @since 3.0
  * @see #setContextPath(String)
  * @see #setClassesToBeBound(Class[])
@@ -119,9 +123,8 @@
  * @see #setUnmarshallerListener(javax.xml.bind.Unmarshaller.Listener)
  * @see #setAdapters(XmlAdapter[])
  */
-public class Jaxb2Marshaller
-		implements MimeMarshaller, MimeUnmarshaller, GenericMarshaller, GenericUnmarshaller, BeanClassLoaderAware,
-		ResourceLoaderAware, InitializingBean {
+public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, GenericMarshaller, GenericUnmarshaller,
+		BeanClassLoaderAware, InitializingBean {
 
 	private static final String CID = "cid:";
 
@@ -167,18 +170,20 @@ public class Jaxb2Marshaller
 
 	private ClassLoader beanClassLoader;
 
-	private ResourceLoader resourceLoader;
-
 	private final Object jaxbContextMonitor = new Object();
 
 	private volatile JAXBContext jaxbContext;
 
 	private Schema schema;
 
+	private boolean supportDtd = false;
+
+	private boolean processExternalEntities = false;
+
 
 	/**
-	 * Set multiple JAXB context paths. The given array of context paths is converted to a
-	 * colon-delimited string, as supported by JAXB.
+	 * Set multiple JAXB context paths. The given array of context paths gets
+	 * converted to a colon-delimited string, as supported by JAXB.
 	 */
 	public void setContextPaths(String... contextPaths) {
 		Assert.notEmpty(contextPaths, "'contextPaths' must not be empty");
@@ -187,8 +192,8 @@ public void setContextPaths(String... contextPaths) {
 
 	/**
 	 * Set a JAXB context path.
-	 * <p>Setting this property, {@link #setClassesToBeBound "classesToBeBound"}, or
-	 * {@link #setPackagesToScan "packagesToScan"} is required.
+	 * <p>Setting either this property, {@link #setClassesToBeBound "classesToBeBound"}
+	 * or {@link #setPackagesToScan "packagesToScan"} is required.
 	 */
 	public void setContextPath(String contextPath) {
 		Assert.hasText(contextPath, "'contextPath' must not be null");
@@ -204,8 +209,8 @@ public String getContextPath() {
 
 	/**
 	 * Set the list of Java classes to be recognized by a newly created JAXBContext.
-	 * <p>Setting this property, {@link #setContextPath "contextPath"}, or
-	 * {@link #setPackagesToScan "packagesToScan"} is required.
+	 * <p>Setting either this property, {@link #setContextPath "contextPath"}
+	 * or {@link #setPackagesToScan "packagesToScan"} is required.
 	 */
 	public void setClassesToBeBound(Class<?>... classesToBeBound) {
 		Assert.notEmpty(classesToBeBound, "'classesToBeBound' must not be empty");
@@ -220,12 +225,13 @@ public Class<?>[] getClassesToBeBound() {
 	}
 
 	/**
-	 * Set the packages to search using Spring-based scanning for classes with JAXB2 annotations in the classpath.
-	 * <p>Setting this property, {@link #setContextPath "contextPath"}, or
-	 * {@link #setClassesToBeBound "classesToBeBound"} is required. This is analogous to Spring's component-scan feature
-	 * ({@link org.springframework.context.annotation.ClassPathBeanDefinitionScanner}).
+	 * Set the packages to search for classes with JAXB2 annotations in the classpath.
+	 * This is using a Spring-bases search and therefore analogous to Spring's component-scan
+	 * feature ({@link org.springframework.context.annotation.ClassPathBeanDefinitionScanner}).
+	 * <p>Setting either this property, {@link #setContextPath "contextPath"}
+	 * or {@link #setClassesToBeBound "classesToBeBound"} is required.
 	 */
-	public void setPackagesToScan(String[] packagesToScan) {
+	public void setPackagesToScan(String... packagesToScan) {
 		this.packagesToScan = packagesToScan;
 	}
 
@@ -294,7 +300,7 @@ public void setValidationEventHandler(ValidationEventHandler validationEventHand
 	 * Specify the {@code XmlAdapter}s to be registered with the JAXB {@code Marshaller}
 	 * and {@code Unmarshaller}
 	 */
-	public void setAdapters(XmlAdapter<?, ?>[] adapters) {
+	public void setAdapters(XmlAdapter<?, ?>... adapters) {
 		this.adapters = adapters;
 	}
 
@@ -308,7 +314,7 @@ public void setSchema(Resource schemaResource) {
 	/**
 	 * Set the schema resources to use for validation.
 	 */
-	public void setSchemas(Resource[] schemaResources) {
+	public void setSchemas(Resource... schemaResources) {
 		this.schemaResources = schemaResources;
 	}
 
@@ -386,16 +392,52 @@ public void setMappedClass(Class<?> mappedClass) {
 		this.mappedClass = mappedClass;
 	}
 
-	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.beanClassLoader = classLoader;
+	/**
+	 * Indicates whether DTD parsing should be supported.
+	 * <p>Default is {@code false} meaning that DTD is disabled.
+	 */
+	public void setSupportDtd(boolean supportDtd) {
+		this.supportDtd = supportDtd;
 	}
 
-	public void setResourceLoader(ResourceLoader resourceLoader) {
-		this.resourceLoader = resourceLoader;
+	/**
+	 * Whether DTD parsing is supported.
+	 */
+	public boolean isSupportDtd() {
+		return this.supportDtd;
 	}
 
+	/**
+	 * Indicates whether external XML entities are processed when unmarshalling.
+	 * <p>Default is {@code false}, meaning that external entities are not resolved.
+	 * Note that processing of external entities will only be enabled/disabled when the
+	 * {@code Source} passed to {@link #unmarshal(Source)} is a {@link SAXSource} or
+	 * {@link StreamSource}. It has no effect for {@link DOMSource} or {@link StAXSource}
+	 * instances.
+	 * <p><strong>Note:</strong> setting this option to {@code true} also
+	 * automatically sets {@link #setSupportDtd} to {@code true}.
+	 */
+	public void setProcessExternalEntities(boolean processExternalEntities) {
+		this.processExternalEntities = processExternalEntities;
+		if (processExternalEntities) {
+			setSupportDtd(true);
+		}
+	}
+
+	/**
+	 * Returns the configured value for whether XML external entities are allowed.
+	 */
+	public boolean isProcessExternalEntities() {
+		return this.processExternalEntities;
+	}
 
-	public final void afterPropertiesSet() throws Exception {
+	@Override
+	public void setBeanClassLoader(ClassLoader classLoader) {
+		this.beanClassLoader = classLoader;
+	}
+
+
+	public void afterPropertiesSet() throws Exception {
 		boolean hasContextPath = StringUtils.hasLength(this.contextPath);
 		boolean hasClassesToBeBound = !ObjectUtils.isEmpty(this.classesToBeBound);
 		boolean hasPackagesToScan = !ObjectUtils.isEmpty(this.packagesToScan);
@@ -487,10 +529,8 @@ private JAXBContext createJaxbContextFromPackages() throws JAXBException {
 			logger.info("Creating JAXBContext by scanning packages [" +
 					StringUtils.arrayToCommaDelimitedString(this.packagesToScan) + "]");
 		}
-		ClassPathJaxb2TypeScanner scanner = new ClassPathJaxb2TypeScanner(this.packagesToScan);
-		scanner.setResourceLoader(this.resourceLoader);
-		scanner.scanPackages();
-		Class<?>[] jaxb2Classes = scanner.getJaxb2Classes();
+		ClassPathJaxb2TypeScanner scanner = new ClassPathJaxb2TypeScanner(this.beanClassLoader, this.packagesToScan);
+		Class<?>[] jaxb2Classes = scanner.scanPackages();
 		if (logger.isDebugEnabled()) {
 			logger.debug("Found JAXB2 classes: [" + StringUtils.arrayToCommaDelimitedString(jaxb2Classes) + "]");
 		}
@@ -588,13 +628,13 @@ else if (!ObjectUtils.isEmpty(this.classesToBeBound)) {
 	 * Compare section 8.5.1 of the JAXB2 spec.
 	 */
 	private boolean isPrimitiveWrapper(Class<?> clazz) {
-		return Boolean.class.equals(clazz) ||
+		return (Boolean.class.equals(clazz) ||
 				Byte.class.equals(clazz) ||
 				Short.class.equals(clazz) ||
 				Integer.class.equals(clazz) ||
 				Long.class.equals(clazz) ||
 				Float.class.equals(clazz) ||
-				Double.class.equals(clazz);
+				Double.class.equals(clazz));
 	}
 
 	/**
@@ -602,7 +642,7 @@ private boolean isPrimitiveWrapper(Class<?> clazz) {
 	 * Compare section 8.5.2 of the JAXB2 spec.
 	 */
 	private boolean isStandardClass(Class<?> clazz) {
-		return String.class.equals(clazz) ||
+		return (String.class.equals(clazz) ||
 				BigInteger.class.isAssignableFrom(clazz) ||
 				BigDecimal.class.isAssignableFrom(clazz) ||
 				Calendar.class.isAssignableFrom(clazz) ||
@@ -615,7 +655,7 @@ private boolean isStandardClass(Class<?> clazz) {
 				DataHandler.class.equals(clazz) ||
 				// Source and subclasses should be supported according to the JAXB2 spec, but aren't in the RI
 				// Source.class.isAssignableFrom(clazz) ||
-				UUID.class.equals(clazz);
+				UUID.class.equals(clazz));
 
 	}
 
@@ -711,6 +751,8 @@ public Object unmarshal(Source source) throws XmlMappingException {
 	}
 
 	public Object unmarshal(Source source, MimeContainer mimeContainer) throws XmlMappingException {
+		source = processSource(source);
+
 		try {
 			Unmarshaller unmarshaller = createUnmarshaller();
 			if (this.mtomEnabled && mimeContainer != null) {
@@ -726,6 +768,14 @@ else if (this.mappedClass != null) {
 				return unmarshaller.unmarshal(source);
 			}
 		}
+		catch (NullPointerException ex) {
+			if (!isSupportDtd()) {
+				throw new UnmarshallingFailureException("NPE while unmarshalling. " +
+						"This can happen on JDK 1.6 due to the presence of DTD " +
+						"declarations, which are disabled.", ex);
+			}
+			throw ex;
+		}
 		catch (JAXBException ex) {
 			throw convertJaxbException(ex);
 		}
@@ -751,6 +801,50 @@ protected Object unmarshalStaxSource(Unmarshaller jaxbUnmarshaller, Source staxS
 		}
 	}
 
+	private Source processSource(Source source) {
+		if (StaxUtils.isStaxSource(source) || source instanceof DOMSource) {
+			return source;
+		}
+
+		XMLReader xmlReader = null;
+		InputSource inputSource = null;
+
+		if (source instanceof SAXSource) {
+			SAXSource saxSource = (SAXSource) source;
+			xmlReader = saxSource.getXMLReader();
+			inputSource = saxSource.getInputSource();
+		}
+		else if (source instanceof StreamSource) {
+			StreamSource streamSource = (StreamSource) source;
+			if (streamSource.getInputStream() != null) {
+				inputSource = new InputSource(streamSource.getInputStream());
+			}
+			else if (streamSource.getReader() != null) {
+				inputSource = new InputSource(streamSource.getReader());
+			}
+			else {
+				inputSource = new InputSource(streamSource.getSystemId());
+			}
+		}
+
+		try {
+			if (xmlReader == null) {
+				xmlReader = XMLReaderFactory.createXMLReader();
+			}
+			xmlReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+			String name = "http://xml.org/sax/features/external-general-entities";
+			xmlReader.setFeature(name, isProcessExternalEntities());
+			if (!isProcessExternalEntities()) {
+				xmlReader.setEntityResolver(NO_OP_ENTITY_RESOLVER);
+			}
+			return new SAXSource(xmlReader, inputSource);
+		}
+		catch (SAXException ex) {
+			logger.warn("Processing of external entities could not be disabled", ex);
+			return source;
+		}
+	}
+
 	/**
 	 * Return a newly created JAXB unmarshaller.
 	 * Note: JAXB unmarshallers are not necessarily thread-safe.
@@ -799,7 +893,7 @@ protected void initJaxbUnmarshaller(Unmarshaller unmarshaller) throws JAXBExcept
 	/**
 	 * Convert the given {@code JAXBException} to an appropriate exception from the
 	 * {@code org.springframework.oxm} hierarchy.
-	 * @param ex {@code JAXBException} that occured
+	 * @param ex {@code JAXBException} that occurred
 	 * @return the corresponding {@code XmlMappingException}
 	 */
 	protected XmlMappingException convertJaxbException(JAXBException ex) {
@@ -823,7 +917,7 @@ private static class Jaxb2AttachmentMarshaller extends AttachmentMarshaller {
 
 		private final MimeContainer mimeContainer;
 
-		private Jaxb2AttachmentMarshaller(MimeContainer mimeContainer) {
+		public Jaxb2AttachmentMarshaller(MimeContainer mimeContainer) {
 			this.mimeContainer = mimeContainer;
 		}
 
@@ -877,7 +971,7 @@ private static class Jaxb2AttachmentUnmarshaller extends AttachmentUnmarshaller
 
 		private final MimeContainer mimeContainer;
 
-		private Jaxb2AttachmentUnmarshaller(MimeContainer mimeContainer) {
+		public Jaxb2AttachmentUnmarshaller(MimeContainer mimeContainer) {
 			this.mimeContainer = mimeContainer;
 		}
 
@@ -927,7 +1021,7 @@ private static class ByteArrayDataSource implements DataSource {
 
 		private final int length;
 
-		private ByteArrayDataSource(String contentType, byte[] data, int offset, int length) {
+		public ByteArrayDataSource(String contentType, byte[] data, int offset, int length) {
 			this.contentType = contentType;
 			this.data = data;
 			this.offset = offset;
@@ -951,4 +1045,12 @@ public String getName() {
 		}
 	}
 
+
+	private static final EntityResolver NO_OP_ENTITY_RESOLVER = new EntityResolver() {
+		@Override
+		public InputSource resolveEntity(String publicId, String systemId) {
+			return new InputSource(new StringReader(""));
+		}
+	};
+
 }
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
index 2ded691c8b..cadfa24d04 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
@@ -84,6 +85,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe
 
 	private static final String DEFAULT_BINDING_NAME = "binding";
 
+
 	private Class<?> targetClass;
 
 	private String targetPackage;
@@ -106,13 +108,12 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe
 
 	private IBindingFactory bindingFactory;
 
-	private TransformerFactory transformerFactory = TransformerFactory.newInstance();
+	private final TransformerFactory transformerFactory = TransformerFactory.newInstance();
 
 
 	/**
 	 * Set the target class for this instance. Setting either this property or the
 	 * {@link #setTargetPackage(String) targetPackage} property is required.
-	 *
 	 * <p>If this property is set, {@link #setTargetPackage(String) targetPackage} is ignored.
 	 */
 	public void setTargetClass(Class<?> targetClass) {
@@ -122,12 +123,12 @@ public void setTargetClass(Class<?> targetClass) {
 	/**
 	 * Set the target package for this instance. Setting either this property or the
 	 * {@link #setTargetClass(Class) targetClass} property is required.
-	 *
 	 * <p>If {@link #setTargetClass(Class) targetClass} is set, this property is ignored.
 	 */
 	public void setTargetPackage(String targetPackage) {
 		this.targetPackage = targetPackage;
 	}
+
 	/**
 	 * Set the optional binding name for this instance.
 	 */
@@ -149,6 +150,11 @@ public void setEncoding(String encoding) {
 		this.encoding = encoding;
 	}
 
+	@Override
+	protected String getDefaultEncoding() {
+		return this.encoding;
+	}
+
 	/**
 	 * Set the document standalone flag for marshalling. By default, this flag is not present.
 	 */
@@ -157,10 +163,9 @@ public void setStandalone(Boolean standalone) {
 	}
 
 	/**
-	 * Sets the root element name for the DTD declaration written when marshalling. By default, this is
-	 * {@code null} (i.e. no DTD declaration is written). If set to a value, the system ID or public ID also need to
-	 * be set.
-	 *
+	 * Set the root element name for the DTD declaration written when marshalling.
+	 * By default, this is {@code null} (i.e. no DTD declaration is written).
+	 * <p>If set to a value, the system ID or public ID also need to be set.
 	 * @see #setDocTypeSystemId(String)
 	 * @see #setDocTypePublicId(String)
 	 */
@@ -169,10 +174,9 @@ public void setDocTypeRootElementName(String docTypeRootElementName) {
 	}
 
 	/**
-	 * Sets the system Id for the DTD declaration written when marshalling. By default, this is
-	 * {@code null}. Only used when the root element also has been set. Set either this property or
-	 * {@code docTypePublicId}, not both.
-	 *
+	 * Set the system id for the DTD declaration written when marshalling.
+	 * By default, this is {@code null}. Only used when the root element also has been set.
+	 * <p>Set either this property or {@code docTypePublicId}, not both.
 	 * @see #setDocTypeRootElementName(String)
 	 */
 	public void setDocTypeSystemId(String docTypeSystemId) {
@@ -180,10 +184,9 @@ public void setDocTypeSystemId(String docTypeSystemId) {
 	}
 
 	/**
-	 * Sets the public Id for the DTD declaration written when marshalling. By default, this is
-	 * {@code null}. Only used when the root element also has been set. Set either this property or
-	 * {@code docTypeSystemId}, not both.
-	 *
+	 * Set the public id for the DTD declaration written when marshalling.
+	 * By default, this is {@code null}. Only used when the root element also has been set.
+	 * <p>Set either this property or {@code docTypeSystemId}, not both.
 	 * @see #setDocTypeRootElementName(String)
 	 */
 	public void setDocTypePublicId(String docTypePublicId) {
@@ -191,15 +194,15 @@ public void setDocTypePublicId(String docTypePublicId) {
 	}
 
 	/**
-	 * Sets the internal subset Id for the DTD declaration written when marshalling. By default, this is
-	 * {@code null}. Only used when the root element also has been set.
-	 *
+	 * Set the internal subset Id for the DTD declaration written when marshalling.
+	 * By default, this is {@code null}. Only used when the root element also has been set.
 	 * @see #setDocTypeRootElementName(String)
 	 */
 	public void setDocTypeInternalSubset(String docTypeInternalSubset) {
 		this.docTypeInternalSubset = docTypeInternalSubset;
 	}
 
+
 	public void afterPropertiesSet() throws JiBXException {
 		if (this.targetClass != null) {
 			if (StringUtils.hasLength(this.bindingName)) {
@@ -214,22 +217,24 @@ public void afterPropertiesSet() throws JiBXException {
 				}
 				this.bindingFactory = BindingDirectory.getFactory(this.targetClass);
 			}
-		} else if (this.targetPackage != null) {
+		}
+		else if (this.targetPackage != null) {
 			if (!StringUtils.hasLength(bindingName)) {
 				bindingName = DEFAULT_BINDING_NAME;
 			}
 			if (logger.isInfoEnabled()) {
-				logger.info("Configured for target package [" + targetPackage	+ "] using binding [" + bindingName + "]");
+				logger.info("Configured for target package [" + this.targetPackage	+ "] using binding [" + this.bindingName + "]");
 			}
-			this.bindingFactory = BindingDirectory.getFactory(bindingName, targetPackage);
-		} else {
-			throw new IllegalArgumentException("either 'targetClass' or 'targetPackage' is required");
+			this.bindingFactory = BindingDirectory.getFactory(this.bindingName, this.targetPackage);
+		}
+		else {
+			throw new IllegalArgumentException("Either 'targetClass' or 'targetPackage' is required");
 		}
 	}
 
 
 	public boolean supports(Class<?> clazz) {
-		Assert.notNull(clazz, "'clazz' must not be null");
+		Assert.notNull(clazz, "Class must not be null");
 		if (this.targetClass != null) {
 			return this.targetClass.equals(clazz);
 		}
@@ -244,7 +249,7 @@ public boolean supports(Class<?> clazz) {
 	}
 
 
-	// Supported Marshalling
+	// Supported marshalling
 
 	@Override
 	protected void marshalOutputStream(Object graph, OutputStream outputStream)
@@ -271,8 +276,7 @@ protected void marshalWriter(Object graph, Writer writer) throws XmlMappingExcep
 		}
 	}
 
-	private void marshalDocument(IMarshallingContext marshallingContext, Object graph) throws IOException,
-			JiBXException {
+	private void marshalDocument(IMarshallingContext marshallingContext, Object graph) throws IOException, JiBXException {
 		if (StringUtils.hasLength(docTypeRootElementName)) {
 			IXMLWriter xmlWriter = marshallingContext.getXmlWriter();
 			xmlWriter.writeDocType(docTypeRootElementName, docTypeSystemId, docTypePublicId, docTypeInternalSubset);
@@ -280,20 +284,8 @@ private void marshalDocument(IMarshallingContext marshallingContext, Object grap
 		marshallingContext.marshalDocument(graph);
 	}
 
-	@Override
-	protected void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException {
-		try {
-			MarshallingContext marshallingContext = (MarshallingContext) createMarshallingContext();
-			IXMLWriter xmlWriter = new StAXWriter(marshallingContext.getNamespaces(), streamWriter);
-			marshallingContext.setXmlWriter(xmlWriter);
-			marshallingContext.marshalDocument(graph);
-		}
-		catch (JiBXException ex) {
-			throw convertJibxException(ex, false);
-		}
-	}
 
-	// Unsupported Marshalling
+	// Unsupported marshalling
 
 	@Override
 	protected void marshalDomNode(Object graph, Node node) throws XmlMappingException {
@@ -307,6 +299,25 @@ protected void marshalDomNode(Object graph, Node node) throws XmlMappingExceptio
 		}
 	}
 
+	@Override
+	protected void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) {
+		XMLStreamWriter streamWriter = StaxUtils.createEventStreamWriter(eventWriter);
+		marshalXmlStreamWriter(graph, streamWriter);
+	}
+
+	@Override
+	protected void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException {
+		try {
+			MarshallingContext marshallingContext = (MarshallingContext) createMarshallingContext();
+			IXMLWriter xmlWriter = new StAXWriter(marshallingContext.getNamespaces(), streamWriter);
+			marshallingContext.setXmlWriter(xmlWriter);
+			marshallingContext.marshalDocument(graph);
+		}
+		catch (JiBXException ex) {
+			throw convertJibxException(ex, false);
+		}
+	}
+
 	@Override
 	protected void marshalSaxHandlers(Object graph, ContentHandler contentHandler, LexicalHandler lexicalHandler)
 			throws XmlMappingException {
@@ -323,7 +334,7 @@ protected void marshalSaxHandlers(Object graph, ContentHandler contentHandler, L
 
 	private void transformAndMarshal(Object graph, Result result) throws IOException {
 		try {
-			ByteArrayOutputStream os = new ByteArrayOutputStream();
+			ByteArrayOutputStream os = new ByteArrayOutputStream(1024);
 			marshalOutputStream(graph, os);
 			ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
 			Transformer transformer = this.transformerFactory.newTransformer();
@@ -331,36 +342,32 @@ private void transformAndMarshal(Object graph, Result result) throws IOException
 		}
 		catch (TransformerException ex) {
 			throw new MarshallingFailureException(
-					"Could not transform to [" + ClassUtils.getShortName(result.getClass()) + "]");
+					"Could not transform to [" + ClassUtils.getShortName(result.getClass()) + "]", ex);
 		}
 
 	}
 
-	@Override
-	protected void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) {
-		XMLStreamWriter streamWriter = StaxUtils.createEventStreamWriter(eventWriter);
-		marshalXmlStreamWriter(graph, streamWriter);
-	}
-
 
 	// Unmarshalling
 
 	@Override
-	protected Object unmarshalInputStream(InputStream inputStream) throws XmlMappingException, IOException {
+	protected Object unmarshalXmlEventReader(XMLEventReader eventReader) {
 		try {
-			IUnmarshallingContext unmarshallingContext = createUnmarshallingContext();
-			return unmarshallingContext.unmarshalDocument(inputStream, encoding);
+			XMLStreamReader streamReader = StaxUtils.createEventStreamReader(eventReader);
+			return unmarshalXmlStreamReader(streamReader);
 		}
-		catch (JiBXException ex) {
-			throw convertJibxException(ex, false);
+		catch (XMLStreamException ex) {
+			return new UnmarshallingFailureException("JiBX unmarshalling exception", ex);
 		}
 	}
 
 	@Override
-	protected Object unmarshalReader(Reader reader) throws XmlMappingException, IOException {
+	protected Object unmarshalXmlStreamReader(XMLStreamReader streamReader) {
 		try {
-			IUnmarshallingContext unmarshallingContext = createUnmarshallingContext();
-			return unmarshallingContext.unmarshalDocument(reader);
+			UnmarshallingContext unmarshallingContext = (UnmarshallingContext) createUnmarshallingContext();
+			IXMLReader xmlReader = new StAXReaderWrapper(streamReader, null, true);
+			unmarshallingContext.setDocument(xmlReader);
+			return unmarshallingContext.unmarshalElement();
 		}
 		catch (JiBXException ex) {
 			throw convertJibxException(ex, false);
@@ -368,12 +375,10 @@ protected Object unmarshalReader(Reader reader) throws XmlMappingException, IOEx
 	}
 
 	@Override
-	protected Object unmarshalXmlStreamReader(XMLStreamReader streamReader) {
+	protected Object unmarshalInputStream(InputStream inputStream) throws XmlMappingException, IOException {
 		try {
-			UnmarshallingContext unmarshallingContext = (UnmarshallingContext) createUnmarshallingContext();
-			IXMLReader xmlReader = new StAXReaderWrapper(streamReader, null, true);
-			unmarshallingContext.setDocument(xmlReader);
-			return unmarshallingContext.unmarshalElement();
+			IUnmarshallingContext unmarshallingContext = createUnmarshallingContext();
+			return unmarshallingContext.unmarshalDocument(inputStream, encoding);
 		}
 		catch (JiBXException ex) {
 			throw convertJibxException(ex, false);
@@ -381,13 +386,13 @@ protected Object unmarshalXmlStreamReader(XMLStreamReader streamReader) {
 	}
 
 	@Override
-	protected Object unmarshalXmlEventReader(XMLEventReader eventReader) {
+	protected Object unmarshalReader(Reader reader) throws XmlMappingException, IOException {
 		try {
-			XMLStreamReader streamReader = StaxUtils.createEventStreamReader(eventReader);
-			return unmarshalXmlStreamReader(streamReader);
+			IUnmarshallingContext unmarshallingContext = createUnmarshallingContext();
+			return unmarshallingContext.unmarshalDocument(reader);
 		}
-		catch (XMLStreamException ex) {
-			return new UnmarshallingFailureException("JiBX unmarshalling exception", ex);
+		catch (JiBXException ex) {
+			throw convertJibxException(ex, false);
 		}
 	}
 
@@ -397,7 +402,7 @@ protected Object unmarshalXmlEventReader(XMLEventReader eventReader) {
 	@Override
 	protected Object unmarshalDomNode(Node node) throws XmlMappingException {
 		try {
-			return transformAndUnmarshal(new DOMSource(node));
+			return transformAndUnmarshal(new DOMSource(node), null);
 		}
 		catch (IOException ex) {
 			throw new UnmarshallingFailureException("JiBX unmarshalling exception", ex);
@@ -407,20 +412,24 @@ protected Object unmarshalDomNode(Node node) throws XmlMappingException {
 	@Override
 	protected Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource)
 			throws XmlMappingException, IOException {
-		return transformAndUnmarshal(new SAXSource(xmlReader, inputSource));
+
+		return transformAndUnmarshal(new SAXSource(xmlReader, inputSource), inputSource.getEncoding());
 	}
 
-	private Object transformAndUnmarshal(Source source) throws IOException {
+	private Object transformAndUnmarshal(Source source, String encoding) throws IOException {
 		try {
-			Transformer transformer = transformerFactory.newTransformer();
-			ByteArrayOutputStream os = new ByteArrayOutputStream();
+			Transformer transformer = this.transformerFactory.newTransformer();
+			if (encoding != null) {
+				transformer.setOutputProperty(OutputKeys.ENCODING, encoding);
+			}
+			ByteArrayOutputStream os = new ByteArrayOutputStream(1024);
 			transformer.transform(source, new StreamResult(os));
 			ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
 			return unmarshalInputStream(is);
 		}
 		catch (TransformerException ex) {
 			throw new MarshallingFailureException(
-					"Could not transform from [" + ClassUtils.getShortName(source.getClass()) + "]");
+					"Could not transform from [" + ClassUtils.getShortName(source.getClass()) + "]", ex);
 		}
 	}
 
@@ -450,7 +459,7 @@ protected IUnmarshallingContext createUnmarshallingContext() throws JiBXExceptio
 	 * {@code org.springframework.oxm} hierarchy.
 	 * <p>A boolean flag is used to indicate whether this exception occurs during marshalling or
 	 * unmarshalling, since JiBX itself does not make this distinction in its exception hierarchy.
-	 * @param ex {@code JiBXException} that occured
+	 * @param ex {@code JiBXException} that occurred
 	 * @param marshalling indicates whether the exception occurs during marshalling ({@code true}),
 	 * or unmarshalling ({@code false})
 	 * @return the corresponding {@code XmlMappingException}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
index cf584efa88..d06ff84080 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
+import java.io.StringReader;
 import java.io.Writer;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -40,8 +41,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.ContentHandler;
+import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
@@ -57,8 +60,8 @@
 
 /**
  * Abstract implementation of the {@code Marshaller} and {@code Unmarshaller} interface.
- * This implementation inspects the given {@code Source} or {@code Result}, and defers
- * further handling to overridable template methods.
+ * This implementation inspects the given {@code Source} or {@code Result}, and
+ * delegates further handling to overridable template methods.
  *
  * @author Arjen Poutsma
  * @author Juergen Hoeller
@@ -66,90 +69,79 @@
  */
 public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 
-	/** Logger available to subclasses. */
+	/** Logger available to subclasses */
 	protected final Log logger = LogFactory.getLog(getClass());
 
+	private boolean supportDtd = false;
+
+	private boolean processExternalEntities = false;
+
 	private DocumentBuilderFactory documentBuilderFactory;
 
 	private final Object documentBuilderFactoryMonitor = new Object();
 
 
 	/**
-	 * Marshals the object graph with the given root into the provided {@code javax.xml.transform.Result}.
-	 * <p>This implementation inspects the given result, and calls {@code marshalDomResult},
-	 * {@code marshalSaxResult}, or {@code marshalStreamResult}.
-	 * @param graph the root of the object graph to marshal
-	 * @param result the result to marshal to
-	 * @throws IOException if an I/O exception occurs
-	 * @throws XmlMappingException if the given object cannot be marshalled to the result
-	 * @throws IllegalArgumentException if {@code result} if neither a {@code DOMResult},
-	 * a {@code SAXResult}, nor a {@code StreamResult}
-	 * @see #marshalDomResult(Object, javax.xml.transform.dom.DOMResult)
-	 * @see #marshalSaxResult(Object, javax.xml.transform.sax.SAXResult)
-	 * @see #marshalStreamResult(Object, javax.xml.transform.stream.StreamResult)
+	 * Indicates whether DTD parsing should be supported.
+	 * <p>Default is {@code false} meaning that DTD is disabled.
 	 */
-	public final void marshal(Object graph, Result result) throws IOException, XmlMappingException {
-		if (result instanceof DOMResult) {
-			marshalDomResult(graph, (DOMResult) result);
-		}
-		else if (StaxUtils.isStaxResult(result)) {
-			marshalStaxResult(graph, result);
-		}
-		else if (result instanceof SAXResult) {
-			marshalSaxResult(graph, (SAXResult) result);
-		}
-		else if (result instanceof StreamResult) {
-			marshalStreamResult(graph, (StreamResult) result);
-		}
-		else {
-			throw new IllegalArgumentException("Unknown Result type: " + result.getClass());
-		}
+	public void setSupportDtd(boolean supportDtd) {
+		this.supportDtd = supportDtd;
 	}
 
 	/**
-	 * Unmarshals the given provided {@code javax.xml.transform.Source} into an object graph.
-	 * <p>This implementation inspects the given result, and calls {@code unmarshalDomSource},
-	 * {@code unmarshalSaxSource}, or {@code unmarshalStreamSource}.
-	 * @param source the source to marshal from
-	 * @return the object graph
-	 * @throws IOException if an I/O Exception occurs
-	 * @throws XmlMappingException if the given source cannot be mapped to an object
-	 * @throws IllegalArgumentException if {@code source} is neither a {@code DOMSource},
-	 * a {@code SAXSource}, nor a {@code StreamSource}
-	 * @see #unmarshalDomSource(javax.xml.transform.dom.DOMSource)
-	 * @see #unmarshalSaxSource(javax.xml.transform.sax.SAXSource)
-	 * @see #unmarshalStreamSource(javax.xml.transform.stream.StreamSource)
+	 * Whether DTD parsing is supported.
 	 */
-	public final Object unmarshal(Source source) throws IOException, XmlMappingException {
-		if (source instanceof DOMSource) {
-			return unmarshalDomSource((DOMSource) source);
-		}
-		else if (StaxUtils.isStaxSource(source)) {
-			return unmarshalStaxSource(source);
-		}
-		else if (source instanceof SAXSource) {
-			return unmarshalSaxSource((SAXSource) source);
-		}
-		else if (source instanceof StreamSource) {
-			return unmarshalStreamSource((StreamSource) source);
-		}
-		else {
-			throw new IllegalArgumentException("Unknown Source type: " + source.getClass());
+	public boolean isSupportDtd() {
+		return this.supportDtd;
+	}
+
+	/**
+	 * Indicates whether external XML entities are processed when unmarshalling.
+	 * <p>Default is {@code false}, meaning that external entities are not resolved.
+	 * Note that processing of external entities will only be enabled/disabled when the
+	 * {@code Source} passed to {@link #unmarshal(Source)} is a {@link SAXSource} or
+	 * {@link StreamSource}. It has no effect for {@link DOMSource} or {@link StAXSource}
+	 * instances.
+	 * <p><strong>Note:</strong> setting this option to {@code true} also
+	 * automatically sets {@link #setSupportDtd} to {@code true}.
+	 */
+	public void setProcessExternalEntities(boolean processExternalEntities) {
+		this.processExternalEntities = processExternalEntities;
+		if (processExternalEntities) {
+			setSupportDtd(true);
 		}
 	}
 
 	/**
-	 * Create a {@code DocumentBuilder} that this marshaller will use for creating
-	 * DOM documents when passed an empty {@code DOMSource}.
-	 * <p>Can be overridden in subclasses, adding further initialization of the builder.
-	 * @param factory the {@code DocumentBuilderFactory} that the DocumentBuilder should be created with
-	 * @return the {@code DocumentBuilder}
-	 * @throws ParserConfigurationException if thrown by JAXP methods
+	 * Returns the configured value for whether XML external entities are allowed.
+	 * @see #createXmlReader()
 	 */
-	protected DocumentBuilder createDocumentBuilder(DocumentBuilderFactory factory)
-			throws ParserConfigurationException {
+	public boolean isProcessExternalEntities() {
+		return this.processExternalEntities;
+	}
+
 
-		return factory.newDocumentBuilder();
+	/**
+	 * Build a new {@link Document} from this marshaller's {@link DocumentBuilderFactory},
+	 * as a placeholder for a DOM node.
+	 * @see #createDocumentBuilderFactory()
+	 * @see #createDocumentBuilder(DocumentBuilderFactory)
+	 */
+	protected Document buildDocument() {
+		try {
+			DocumentBuilder documentBuilder;
+			synchronized (this.documentBuilderFactoryMonitor) {
+				if (this.documentBuilderFactory == null) {
+					this.documentBuilderFactory = createDocumentBuilderFactory();
+				}
+				documentBuilder = createDocumentBuilder(this.documentBuilderFactory);
+			}
+			return documentBuilder.newDocument();
+		}
+		catch (ParserConfigurationException ex) {
+			throw new UnmarshallingFailureException("Could not create document placeholder: " + ex.getMessage(), ex);
+		}
 	}
 
 	/**
@@ -164,25 +156,92 @@ protected DocumentBuilderFactory createDocumentBuilderFactory() throws ParserCon
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		factory.setValidating(false);
 		factory.setNamespaceAware(true);
+		factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+		factory.setFeature("http://xml.org/sax/features/external-general-entities", isProcessExternalEntities());
 		return factory;
 	}
 
 	/**
-	 * Create a {@code XMLReader} that this marshaller will when passed an empty {@code SAXSource}.
+	 * Create a {@code DocumentBuilder} that this marshaller will use for creating
+	 * DOM documents when passed an empty {@code DOMSource}.
+	 * <p>Can be overridden in subclasses, adding further initialization of the builder.
+	 * @param factory the {@code DocumentBuilderFactory} that the DocumentBuilder should be created with
+	 * @return the {@code DocumentBuilder}
+	 * @throws ParserConfigurationException if thrown by JAXP methods
+	 */
+	protected DocumentBuilder createDocumentBuilder(DocumentBuilderFactory factory)
+			throws ParserConfigurationException {
+
+		DocumentBuilder documentBuilder = factory.newDocumentBuilder();
+		if (!isProcessExternalEntities()) {
+			documentBuilder.setEntityResolver(NO_OP_ENTITY_RESOLVER);
+		}
+		return documentBuilder;
+	}
+
+	/**
+	 * Create an {@code XMLReader} that this marshaller will when passed an empty {@code SAXSource}.
 	 * @return the XMLReader
 	 * @throws SAXException if thrown by JAXP methods
 	 */
 	protected XMLReader createXmlReader() throws SAXException {
-		return XMLReaderFactory.createXMLReader();
+		XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+		xmlReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+		xmlReader.setFeature("http://xml.org/sax/features/external-general-entities", isProcessExternalEntities());
+		if (!isProcessExternalEntities()) {
+			xmlReader.setEntityResolver(NO_OP_ENTITY_RESOLVER);
+		}
+		return xmlReader;
+	}
+
+	/**
+	 * Determine the default encoding to use for marshalling or unmarshalling from
+	 * a byte stream, or {@code null} if none.
+	 * <p>The default implementation returns {@code null}.
+	 */
+	protected String getDefaultEncoding() {
+		return null;
 	}
 
 
 	// Marshalling
 
+	/**
+	 * Marshals the object graph with the given root into the provided {@code javax.xml.transform.Result}.
+	 * <p>This implementation inspects the given result, and calls {@code marshalDomResult},
+	 * {@code marshalSaxResult}, or {@code marshalStreamResult}.
+	 * @param graph the root of the object graph to marshal
+	 * @param result the result to marshal to
+	 * @throws IOException if an I/O exception occurs
+	 * @throws XmlMappingException if the given object cannot be marshalled to the result
+	 * @throws IllegalArgumentException if {@code result} if neither a {@code DOMResult},
+	 * a {@code SAXResult}, nor a {@code StreamResult}
+	 * @see #marshalDomResult(Object, javax.xml.transform.dom.DOMResult)
+	 * @see #marshalSaxResult(Object, javax.xml.transform.sax.SAXResult)
+	 * @see #marshalStreamResult(Object, javax.xml.transform.stream.StreamResult)
+	 */
+	public final void marshal(Object graph, Result result) throws IOException, XmlMappingException {
+		if (result instanceof DOMResult) {
+			marshalDomResult(graph, (DOMResult) result);
+		}
+		else if (StaxUtils.isStaxResult(result)) {
+			marshalStaxResult(graph, result);
+		}
+		else if (result instanceof SAXResult) {
+			marshalSaxResult(graph, (SAXResult) result);
+		}
+		else if (result instanceof StreamResult) {
+			marshalStreamResult(graph, (StreamResult) result);
+		}
+		else {
+			throw new IllegalArgumentException("Unknown Result type: " + result.getClass());
+		}
+	}
+
 	/**
 	 * Template method for handling {@code DOMResult}s.
 	 * <p>This implementation delegates to {@code marshalDomNode}.
-	 * @param graph    the root of the object graph to marshal
+	 * @param graph the root of the object graph to marshal
 	 * @param domResult the {@code DOMResult}
 	 * @throws XmlMappingException if the given object cannot be marshalled to the result
 	 * @throws IllegalArgumentException if the {@code domResult} is empty
@@ -190,19 +249,7 @@ protected XMLReader createXmlReader() throws SAXException {
 	 */
 	protected void marshalDomResult(Object graph, DOMResult domResult) throws XmlMappingException {
 		if (domResult.getNode() == null) {
-			try {
-				synchronized (this.documentBuilderFactoryMonitor) {
-					if (this.documentBuilderFactory == null) {
-						this.documentBuilderFactory = createDocumentBuilderFactory();
-					}
-				}
-				DocumentBuilder documentBuilder = createDocumentBuilder(this.documentBuilderFactory);
-				domResult.setNode(documentBuilder.newDocument());
-			}
-			catch (ParserConfigurationException ex) {
-				throw new UnmarshallingFailureException(
-						"Could not create document placeholder for DOMResult: " + ex.getMessage(), ex);
-			}
+			domResult.setNode(buildDocument());
 		}
 		marshalDomNode(graph, domResult.getNode());
 	}
@@ -212,8 +259,8 @@ protected void marshalDomResult(Object graph, DOMResult domResult) throws XmlMap
 	 * <p>This implementation delegates to {@code marshalXMLSteamWriter} or
 	 * {@code marshalXMLEventConsumer}, depending on what is contained in the
 	 * {@code StaxResult}.
-	 * @param graph    the root of the object graph to marshal
-	 * @param staxResult a Spring {@link org.springframework.util.xml.StaxSource} or JAXP 1.4 {@link StAXSource}
+	 * @param graph the root of the object graph to marshal
+	 * @param staxResult a JAXP 1.4 {@link StAXSource}
 	 * @throws XmlMappingException if the given object cannot be marshalled to the result
 	 * @throws IllegalArgumentException if the {@code domResult} is empty
 	 * @see #marshalDomNode(Object, org.w3c.dom.Node)
@@ -237,7 +284,7 @@ protected void marshalStaxResult(Object graph, Result staxResult) throws XmlMapp
 	/**
 	 * Template method for handling {@code SAXResult}s.
 	 * <p>This implementation delegates to {@code marshalSaxHandlers}.
-	 * @param graph    the root of the object graph to marshal
+	 * @param graph the root of the object graph to marshal
 	 * @param saxResult the {@code SAXResult}
 	 * @throws XmlMappingException if the given object cannot be marshalled to the result
 	 * @see #marshalSaxHandlers(Object, org.xml.sax.ContentHandler, org.xml.sax.ext.LexicalHandler)
@@ -277,6 +324,38 @@ else if (streamResult.getWriter() != null) {
 
 	// Unmarshalling
 
+	/**
+	 * Unmarshals the given provided {@code javax.xml.transform.Source} into an object graph.
+	 * <p>This implementation inspects the given result, and calls {@code unmarshalDomSource},
+	 * {@code unmarshalSaxSource}, or {@code unmarshalStreamSource}.
+	 * @param source the source to marshal from
+	 * @return the object graph
+	 * @throws IOException if an I/O Exception occurs
+	 * @throws XmlMappingException if the given source cannot be mapped to an object
+	 * @throws IllegalArgumentException if {@code source} is neither a {@code DOMSource},
+	 * a {@code SAXSource}, nor a {@code StreamSource}
+	 * @see #unmarshalDomSource(javax.xml.transform.dom.DOMSource)
+	 * @see #unmarshalSaxSource(javax.xml.transform.sax.SAXSource)
+	 * @see #unmarshalStreamSource(javax.xml.transform.stream.StreamSource)
+	 */
+	public final Object unmarshal(Source source) throws IOException, XmlMappingException {
+		if (source instanceof DOMSource) {
+			return unmarshalDomSource((DOMSource) source);
+		}
+		else if (StaxUtils.isStaxSource(source)) {
+			return unmarshalStaxSource(source);
+		}
+		else if (source instanceof SAXSource) {
+			return unmarshalSaxSource((SAXSource) source);
+		}
+		else if (source instanceof StreamSource) {
+			return unmarshalStreamSource((StreamSource) source);
+		}
+		else {
+			throw new IllegalArgumentException("Unknown Source type: " + source.getClass());
+		}
+	}
+
 	/**
 	 * Template method for handling {@code DOMSource}s.
 	 * <p>This implementation delegates to {@code unmarshalDomNode}.
@@ -290,21 +369,19 @@ else if (streamResult.getWriter() != null) {
 	 */
 	protected Object unmarshalDomSource(DOMSource domSource) throws XmlMappingException {
 		if (domSource.getNode() == null) {
-			try {
-				synchronized (this.documentBuilderFactoryMonitor) {
-					if (this.documentBuilderFactory == null) {
-						this.documentBuilderFactory = createDocumentBuilderFactory();
-					}
-				}
-				DocumentBuilder documentBuilder = createDocumentBuilder(this.documentBuilderFactory);
-				domSource.setNode(documentBuilder.newDocument());
-			}
-			catch (ParserConfigurationException ex) {
-				throw new UnmarshallingFailureException(
-						"Could not create document placeholder for DOMSource: " + ex.getMessage(), ex);
+			domSource.setNode(buildDocument());
+		}
+		try {
+			return unmarshalDomNode(domSource.getNode());
+		}
+		catch (NullPointerException ex) {
+			if (!isSupportDtd()) {
+				throw new UnmarshallingFailureException("NPE while unmarshalling. " +
+						"This can happen on JDK 1.6 due to the presence of DTD " +
+						"declarations, which are disabled.", ex);
 			}
+			throw ex;
 		}
-		return unmarshalDomNode(domSource.getNode());
 	}
 
 	/**
@@ -352,12 +429,22 @@ protected Object unmarshalSaxSource(SAXSource saxSource) throws XmlMappingExcept
 		if (saxSource.getInputSource() == null) {
 			saxSource.setInputSource(new InputSource());
 		}
-		return unmarshalSaxReader(saxSource.getXMLReader(), saxSource.getInputSource());
+		try {
+			return unmarshalSaxReader(saxSource.getXMLReader(), saxSource.getInputSource());
+		}
+		catch (NullPointerException ex) {
+			if (!isSupportDtd()) {
+				throw new UnmarshallingFailureException("NPE while unmarshalling. " +
+						"This can happen on JDK 1.6 due to the presence of DTD " +
+						"declarations, which are disabled.");
+			}
+			throw ex;
+		}
 	}
 
 	/**
 	 * Template method for handling {@code StreamSource}s.
-	 * <p>This implementation defers to {@code unmarshalInputStream} or {@code unmarshalReader}.
+	 * <p>This implementation delegates to {@code unmarshalInputStream} or {@code unmarshalReader}.
 	 * @param streamSource the {@code StreamSource}
 	 * @return the object graph
 	 * @throws IOException if an I/O exception occurs
@@ -365,13 +452,25 @@ protected Object unmarshalSaxSource(SAXSource saxSource) throws XmlMappingExcept
 	 */
 	protected Object unmarshalStreamSource(StreamSource streamSource) throws XmlMappingException, IOException {
 		if (streamSource.getInputStream() != null) {
-			return unmarshalInputStream(streamSource.getInputStream());
+			if (isProcessExternalEntities() && isSupportDtd()) {
+				return unmarshalInputStream(streamSource.getInputStream());
+			}
+			else {
+				InputSource inputSource = new InputSource(streamSource.getInputStream());
+				inputSource.setEncoding(getDefaultEncoding());
+				return unmarshalSaxSource(new SAXSource(inputSource));
+			}
 		}
 		else if (streamSource.getReader() != null) {
-			return unmarshalReader(streamSource.getReader());
+			if (isProcessExternalEntities() && isSupportDtd()) {
+				return unmarshalReader(streamSource.getReader());
+			}
+			else {
+				return unmarshalSaxSource(new SAXSource(new InputSource(streamSource.getReader())));
+			}
 		}
 		else {
-			throw new IllegalArgumentException("StreamSource contains neither InputStream nor Reader");
+			return unmarshalSaxSource(new SAXSource(new InputSource(streamSource.getSystemId())));
 		}
 	}
 
@@ -394,7 +493,7 @@ protected abstract void marshalDomNode(Object graph, Node node)
 
 	/**
 	 * Abstract template method for marshalling the given object to a StAX {@code XMLEventWriter}.
-	 * @param graph    the root of the object graph to marshal
+	 * @param graph the root of the object graph to marshal
 	 * @param eventWriter the {@code XMLEventWriter} to write to
 	 * @throws XmlMappingException if the given object cannot be marshalled to the DOM node
 	 */
@@ -410,16 +509,6 @@ protected abstract void marshalXmlEventWriter(Object graph, XMLEventWriter event
 	protected abstract void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter)
 			throws XmlMappingException;
 
-	/**
-	 * Abstract template method for marshalling the given object graph to a {@code OutputStream}.
-	 * @param graph the root of the object graph to marshal
-	 * @param outputStream the {@code OutputStream} to write to
-	 * @throws XmlMappingException if the given object cannot be marshalled to the writer
-	 * @throws IOException if an I/O exception occurs
-	 */
-	protected abstract void marshalOutputStream(Object graph, OutputStream outputStream)
-			throws XmlMappingException, IOException;
-
 	/**
 	 * Abstract template method for marshalling the given object graph to a SAX {@code ContentHandler}.
 	 * @param graph the root of the object graph to marshal
@@ -431,6 +520,16 @@ protected abstract void marshalSaxHandlers(
 			Object graph, ContentHandler contentHandler, LexicalHandler lexicalHandler)
 			throws XmlMappingException;
 
+	/**
+	 * Abstract template method for marshalling the given object graph to a {@code OutputStream}.
+	 * @param graph the root of the object graph to marshal
+	 * @param outputStream the {@code OutputStream} to write to
+	 * @throws XmlMappingException if the given object cannot be marshalled to the writer
+	 * @throws IOException if an I/O exception occurs
+	 */
+	protected abstract void marshalOutputStream(Object graph, OutputStream outputStream)
+			throws XmlMappingException, IOException;
+
 	/**
 	 * Abstract template method for marshalling the given object graph to a {@code Writer}.
 	 * @param graph the root of the object graph to marshal
@@ -467,6 +566,18 @@ protected abstract Object unmarshalXmlEventReader(XMLEventReader eventReader)
 	protected abstract Object unmarshalXmlStreamReader(XMLStreamReader streamReader)
 			throws XmlMappingException;
 
+	/**
+	 * Abstract template method for unmarshalling using a given SAX {@code XMLReader}
+	 * and {@code InputSource}.
+	 * @param xmlReader the SAX {@code XMLReader} to parse with
+	 * @param inputSource the input source to parse from
+	 * @return the object graph
+	 * @throws XmlMappingException if the given reader and input source cannot be converted to an object
+	 * @throws IOException if an I/O exception occurs
+	 */
+	protected abstract Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource)
+			throws XmlMappingException, IOException;
+
 	/**
 	 * Abstract template method for unmarshalling from a given {@code InputStream}.
 	 * @param inputStream the {@code InputStreamStream} to read from
@@ -487,16 +598,12 @@ protected abstract Object unmarshalInputStream(InputStream inputStream)
 	protected abstract Object unmarshalReader(Reader reader)
 			throws XmlMappingException, IOException;
 
-	/**
-	 * Abstract template method for unmarshalling using a given SAX {@code XMLReader}
-	 * and {@code InputSource}.
-	 * @param xmlReader the SAX {@code XMLReader} to parse with
-	 * @param inputSource the input source to parse from
-	 * @return the object graph
-	 * @throws XmlMappingException if the given reader and input source cannot be converted to an object
-	 * @throws IOException if an I/O exception occurs
-	 */
-	protected abstract Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource)
-			throws XmlMappingException, IOException;
+
+	private static final EntityResolver NO_OP_ENTITY_RESOLVER = new EntityResolver() {
+		@Override
+		public InputSource resolveEntity(String publicId, String systemId) {
+			return new InputSource(new StringReader(""));
+		}
+	};
 
 }
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
index 991d262645..b75d229b48 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.Writer;
-import java.util.ArrayList;
-import java.util.List;
 import java.lang.ref.WeakReference;
 import java.nio.CharBuffer;
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLStreamReader;
@@ -123,7 +123,7 @@ public boolean supports(Class<?> clazz) {
 
 	@Override
 	protected final void marshalDomNode(Object graph, Node node) throws XmlMappingException {
-		Document document = node.getNodeType() == Node.DOCUMENT_NODE ? (Document) node : node.getOwnerDocument();
+		Document document = (node.getNodeType() == Node.DOCUMENT_NODE ? (Document) node : node.getOwnerDocument());
 		Node xmlBeansNode = ((XmlObject) graph).newDomNode(getXmlOptions());
 		NodeList xmlBeansChildNodes = xmlBeansNode.getChildNodes();
 		for (int i = 0; i < xmlBeansChildNodes.getLength(); i++) {
@@ -134,10 +134,15 @@ protected final void marshalDomNode(Object graph, Node node) throws XmlMappingEx
 	}
 
 	@Override
-	protected final void marshalOutputStream(Object graph, OutputStream outputStream)
-			throws XmlMappingException, IOException {
+	protected final void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) {
+		ContentHandler contentHandler = StaxUtils.createContentHandler(eventWriter);
+		marshalSaxHandlers(graph, contentHandler, null);
+	}
 
-		((XmlObject) graph).save(outputStream, getXmlOptions());
+	@Override
+	protected final void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException {
+		ContentHandler contentHandler = StaxUtils.createContentHandler(streamWriter);
+		marshalSaxHandlers(graph, contentHandler, null);
 	}
 
 	@Override
@@ -152,22 +157,18 @@ protected final void marshalSaxHandlers(Object graph, ContentHandler contentHand
 	}
 
 	@Override
-	protected final void marshalWriter(Object graph, Writer writer) throws XmlMappingException, IOException {
-		((XmlObject) graph).save(writer, getXmlOptions());
-	}
+	protected final void marshalOutputStream(Object graph, OutputStream outputStream)
+			throws XmlMappingException, IOException {
 
-	@Override
-	protected final void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) {
-		ContentHandler contentHandler = StaxUtils.createContentHandler(eventWriter);
-		marshalSaxHandlers(graph, contentHandler, null);
+		((XmlObject) graph).save(outputStream, getXmlOptions());
 	}
 
 	@Override
-	protected final void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException {
-		ContentHandler contentHandler = StaxUtils.createContentHandler(streamWriter);
-		marshalSaxHandlers(graph, contentHandler, null);
+	protected final void marshalWriter(Object graph, Writer writer) throws XmlMappingException, IOException {
+		((XmlObject) graph).save(writer, getXmlOptions());
 	}
 
+
 	@Override
 	protected final Object unmarshalDomNode(Node node) throws XmlMappingException {
 		try {
@@ -181,23 +182,20 @@ protected final Object unmarshalDomNode(Node node) throws XmlMappingException {
 	}
 
 	@Override
-	protected final Object unmarshalInputStream(InputStream inputStream) throws XmlMappingException, IOException {
+	protected final Object unmarshalXmlEventReader(XMLEventReader eventReader) throws XmlMappingException {
+		XMLReader reader = StaxUtils.createXMLReader(eventReader);
 		try {
-			InputStream nonClosingInputStream = new NonClosingInputStream(inputStream);
-			XmlObject object = XmlObject.Factory.parse(nonClosingInputStream, getXmlOptions());
-			validate(object);
-			return object;
+			return unmarshalSaxReader(reader, new InputSource());
 		}
-		catch (XmlException ex) {
+		catch (IOException ex) {
 			throw convertXmlBeansException(ex, false);
 		}
 	}
 
 	@Override
-	protected final Object unmarshalReader(Reader reader) throws XmlMappingException, IOException {
+	protected final Object unmarshalXmlStreamReader(XMLStreamReader streamReader) throws XmlMappingException {
 		try {
-			Reader nonClosingReader = new NonClosingReader(reader);
-			XmlObject object = XmlObject.Factory.parse(nonClosingReader, getXmlOptions());
+			XmlObject object = XmlObject.Factory.parse(streamReader, getXmlOptions());
 			validate(object);
 			return object;
 		}
@@ -209,15 +207,16 @@ protected final Object unmarshalReader(Reader reader) throws XmlMappingException
 	@Override
 	protected final Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource)
 			throws XmlMappingException, IOException {
+
 		XmlSaxHandler saxHandler = XmlObject.Factory.newXmlSaxHandler(getXmlOptions());
 		xmlReader.setContentHandler(saxHandler.getContentHandler());
 		try {
 			xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", saxHandler.getLexicalHandler());
 		}
-		catch (SAXNotRecognizedException e) {
+		catch (SAXNotRecognizedException ex) {
 			// ignore
 		}
-		catch (SAXNotSupportedException e) {
+		catch (SAXNotSupportedException ex) {
 			// ignore
 		}
 		try {
@@ -235,20 +234,23 @@ protected final Object unmarshalSaxReader(XMLReader xmlReader, InputSource input
 	}
 
 	@Override
-	protected final Object unmarshalXmlEventReader(XMLEventReader eventReader) throws XmlMappingException {
-		XMLReader reader = StaxUtils.createXMLReader(eventReader);
+	protected final Object unmarshalInputStream(InputStream inputStream) throws XmlMappingException, IOException {
 		try {
-			return unmarshalSaxReader(reader, new InputSource());
+			InputStream nonClosingInputStream = new NonClosingInputStream(inputStream);
+			XmlObject object = XmlObject.Factory.parse(nonClosingInputStream, getXmlOptions());
+			validate(object);
+			return object;
 		}
-		catch (IOException ex) {
+		catch (XmlException ex) {
 			throw convertXmlBeansException(ex, false);
 		}
 	}
 
 	@Override
-	protected final Object unmarshalXmlStreamReader(XMLStreamReader streamReader) throws XmlMappingException {
+	protected final Object unmarshalReader(Reader reader) throws XmlMappingException, IOException {
 		try {
-			XmlObject object = XmlObject.Factory.parse(streamReader, getXmlOptions());
+			Reader nonClosingReader = new NonClosingReader(reader);
+			XmlObject object = XmlObject.Factory.parse(nonClosingReader, getXmlOptions());
 			validate(object);
 			return object;
 		}
@@ -265,20 +267,27 @@ protected final Object unmarshalXmlStreamReader(XMLStreamReader streamReader) th
 	 */
 	protected void validate(XmlObject object) throws ValidationFailureException {
 		if (isValidating() && object != null) {
-			// create a temporary xmlOptions just for validation
-			XmlOptions validateOptions = getXmlOptions() != null ? getXmlOptions() : new XmlOptions();
-			List errorsList = new ArrayList();
+			XmlOptions validateOptions = getXmlOptions();
+			if (validateOptions == null) {
+				// Create temporary XmlOptions just for validation
+				validateOptions = new XmlOptions();
+			}
+			List<XmlError> errorsList = new ArrayList<XmlError>();
 			validateOptions.setErrorListener(errorsList);
 			if (!object.validate(validateOptions)) {
-				StringBuilder builder = new StringBuilder("Could not validate XmlObject :");
-				for (Object anErrorsList : errorsList) {
-					XmlError xmlError = (XmlError) anErrorsList;
-					if (xmlError instanceof XmlValidationError) {
-						builder.append(xmlError.toString());
+				StringBuilder sb = new StringBuilder("Failed to validate XmlObject: ");
+				boolean first = true;
+				for (XmlError error : errorsList) {
+					if (error instanceof XmlValidationError) {
+						if (!first) {
+							sb.append("; ");
+						}
+						sb.append(error.toString());
+						first = false;
 					}
 				}
 				throw new ValidationFailureException("XMLBeans validation failure",
-						new XmlException(builder.toString(), null, errorsList));
+						new XmlException(sb.toString(), null, errorsList));
 			}
 		}
 	}
@@ -295,7 +304,7 @@ protected void validate(XmlObject object) throws ValidationFailureException {
 	 */
 	protected XmlMappingException convertXmlBeansException(Exception ex, boolean marshalling) {
 		if (ex instanceof XMLStreamValidationException) {
-			return new ValidationFailureException("XmlBeans validation exception", ex);
+			return new ValidationFailureException("XMLBeans validation exception", ex);
 		}
 		else if (ex instanceof XmlException || ex instanceof SAXException) {
 			if (marshalling) {
@@ -311,14 +320,12 @@ else if (ex instanceof XmlException || ex instanceof SAXException) {
 		}
 	}
 
-	/**
-	 * See SPR-7034
-	 */
+
 	private static class NonClosingInputStream extends InputStream {
 
 		private final WeakReference<InputStream> in;
 
-		private NonClosingInputStream(InputStream in) {
+		public NonClosingInputStream(InputStream in) {
 			this.in = new WeakReference<InputStream>(in);
 		}
 
@@ -329,31 +336,31 @@ private InputStream getInputStream() {
 		@Override
 		public int read() throws IOException {
 			InputStream in = getInputStream();
-			return in != null ? in.read() : -1;
+			return (in != null ? in.read() : -1);
 		}
 
 		@Override
 		public int read(byte[] b) throws IOException {
 			InputStream in = getInputStream();
-			return in != null ? in.read(b) : -1;
+			return (in != null ? in.read(b) : -1);
 		}
 
 		@Override
 		public int read(byte[] b, int off, int len) throws IOException {
 			InputStream in = getInputStream();
-			return in != null ? in.read(b, off, len) : -1;
+			return (in != null ? in.read(b, off, len) : -1);
 		}
 
 		@Override
 		public long skip(long n) throws IOException {
 			InputStream in = getInputStream();
-			return in != null ? in.skip(n) : 0;
+			return (in != null ? in.skip(n) : 0);
 		}
 
 		@Override
 		public boolean markSupported() {
 			InputStream in = getInputStream();
-			return in != null && in.markSupported();
+			return (in != null && in.markSupported());
 		}
 
 		@Override
@@ -375,23 +382,24 @@ public void reset() throws IOException {
 		@Override
 		public int available() throws IOException {
 			InputStream in = getInputStream();
-			return in != null ? in.available() : 0;
+			return (in != null ? in.available() : 0);
 		}
 
 		@Override
 		public void close() throws IOException {
 			InputStream in = getInputStream();
-			if(in != null) {
-			  this.in.clear();
+			if (in != null) {
+				this.in.clear();
 			}
 		}
 	}
 
+
 	private static class NonClosingReader extends Reader {
 
 		private final WeakReference<Reader> reader;
 
-		private NonClosingReader(Reader reader) {
+		public NonClosingReader(Reader reader) {
 			this.reader = new WeakReference<Reader>(reader);
 		}
 
@@ -402,43 +410,43 @@ private Reader getReader() {
 		@Override
 		public int read(CharBuffer target) throws IOException {
 			Reader rdr = getReader();
-			return rdr != null ? rdr.read(target) : -1;
+			return (rdr != null ? rdr.read(target) : -1);
 		}
 
 		@Override
 		public int read() throws IOException {
 			Reader rdr = getReader();
-			return rdr != null ? rdr.read() : -1;
+			return (rdr != null ? rdr.read() : -1);
 		}
 
 		@Override
 		public int read(char[] cbuf) throws IOException {
 			Reader rdr = getReader();
-			return rdr != null ? rdr.read(cbuf) : -1;
+			return (rdr != null ? rdr.read(cbuf) : -1);
 		}
 
 		@Override
 		public int read(char[] cbuf, int off, int len) throws IOException {
 			Reader rdr = getReader();
-			return rdr != null ? rdr.read(cbuf, off, len) : -1;
+			return (rdr != null ? rdr.read(cbuf, off, len) : -1);
 		}
 
 		@Override
 		public long skip(long n) throws IOException {
 			Reader rdr = getReader();
-			return rdr != null ? rdr.skip(n) : 0;
+			return (rdr != null ? rdr.skip(n) : 0);
 		}
 
 		@Override
 		public boolean ready() throws IOException {
 			Reader rdr = getReader();
-			return rdr != null && rdr.ready();
+			return (rdr != null && rdr.ready());
 		}
 
 		@Override
 		public boolean markSupported() {
 			Reader rdr = getReader();
-			return rdr != null && rdr.markSupported();
+			return (rdr != null && rdr.markSupported());
 		}
 
 		@Override
@@ -464,7 +472,6 @@ public void close() throws IOException {
 				this.reader.clear();
 			}
 		}
-
 	}
 
 }
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java
new file mode 100644
index 0000000000..f8a8854ea3
--- /dev/null
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.oxm.xstream;
+
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+
+/**
+ * XStream {@link Converter} that supports all classes, but throws exceptions for
+ * (un)marshalling.
+ *
+ * <p>The main purpose of this class is to
+ * {@linkplain com.thoughtworks.xstream.XStream#registerConverter(com.thoughtworks.xstream.converters.Converter, int) register}
+ * this converter as a catch-all last converter with a
+ * {@linkplain com.thoughtworks.xstream.XStream#PRIORITY_NORMAL normal}
+ * or higher priority, in addition to converters that explicitly handle the domain
+ * classes that should be supported. As a result, default XStream converters with
+ * lower priorities and possible security vulnerabilities do not get invoked.
+ *
+ * <p>For instance:
+ * <pre class="code">
+ * XStreamMarshaller unmarshaller = new XStreamMarshaller();
+ * unmarshaller.getXStream().registerConverter(new MyDomainClassConverter(), XStream.PRIORITY_VERY_HIGH);
+ * unmarshaller.getXStream().registerConverter(new CatchAllConverter(), XStream.PRIORITY_NORMAL);
+ * MyDomainClass myObject = unmarshaller.unmarshal(source);
+ * </pre
+ *
+ * @author Arjen Poutsma
+ * @since 3.2.5
+ */
+public class CatchAllConverter implements Converter {
+
+	@Override
+	public boolean canConvert(Class type) {
+		return true;
+	}
+
+	@Override
+	public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
+		throw new UnsupportedOperationException("Marshalling not supported");
+	}
+
+	@Override
+	public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
+		throw new UnsupportedOperationException("Unmarshalling not supported");
+	}
+
+}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
index dd36d17b8b..3faab8dca0 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.stream.StreamSource;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.converters.ConversionException;
@@ -75,22 +76,29 @@
 /**
  * Implementation of the {@code Marshaller} interface for XStream.
  *
- * <p>By default, XStream does not require any further configuration,
- * though class aliases can be used to have more control over the behavior of XStream.
+ * <p>By default, XStream does not require any further configuration and can (un)marshal
+ * any class on the classpath. As such, it is <b>not recommended to use the
+ * {@code XStreamMarshaller} to unmarshal XML from external sources</b> (i.e. the Web),
+ * as this can result in <b>security vulnerabilities</b>. If you do use the
+ * {@code XStreamMarshaller} to unmarshal external XML, set the
+ * {@link #setSupportedClasses(Class[]) supportedClasses} and
+ * {@link #setConverters(ConverterMatcher[]) converters} properties (possibly using a
+ * {@link CatchAllConverter} as the last converter in the list) or override the
+ * {@link #customizeXStream(XStream)} method to make sure it only accepts the classes
+ * you want it to support.
  *
  * <p>Due to XStream's API, it is required to set the encoding used for writing to OutputStreams.
  * It defaults to {@code UTF-8}.
  *
  * <p><b>NOTE:</b> XStream is an XML serialization library, not a data binding library.
  * Therefore, it has limited namespace support. As such, it is rather unsuitable for
- * usage within Web services.
+ * usage within Web Services.
+ *
+ * <p>This marshaller is compatible with XStream 1.3 and 1.4.
  *
  * @author Peter Meijer
  * @author Arjen Poutsma
  * @since 3.0
- * @see #setAliases
- * @see #setConverters
- * @see #setEncoding
  */
 public class XStreamMarshaller extends AbstractMarshaller implements InitializingBean, BeanClassLoaderAware {
 
@@ -106,15 +114,19 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin
 
 	private String encoding = DEFAULT_ENCODING;
 
-	private Class[] supportedClasses;
+	private Class<?>[] supportedClasses;
 
-	private ClassLoader classLoader;
+	private ClassLoader beanClassLoader;
 
 
 	/**
-	 * Returns the XStream instance used by this marshaller.
+	 * Return the XStream instance used by this marshaller.
+	 * <p><b>NOTE:</b> While this method can be overridden in Spring 3.x,
+	 * it wasn't originally meant to be. As of Spring 4.0, it will be
+	 * marked as final, with all of XStream 1.4's configurable strategies
+	 * to be exposed on XStreamMarshaller itself.
 	 */
-	public final XStream getXStream() {
+	public XStream getXStream() {
 		return this.xstream;
 	}
 
@@ -125,7 +137,7 @@ public final XStream getXStream() {
 	 * @see XStream#NO_REFERENCES
 	 */
 	public void setMode(int mode) {
-		this.xstream.setMode(mode);
+		getXStream().setMode(mode);
 	}
 
 	/**
@@ -134,13 +146,13 @@ public void setMode(int mode) {
 	 * @see Converter
 	 * @see SingleValueConverter
 	 */
-	public void setConverters(ConverterMatcher[] converters) {
+	public void setConverters(ConverterMatcher... converters) {
 		for (int i = 0; i < converters.length; i++) {
 			if (converters[i] instanceof Converter) {
-				this.xstream.registerConverter((Converter) converters[i], i);
+				getXStream().registerConverter((Converter) converters[i], i);
 			}
 			else if (converters[i] instanceof SingleValueConverter) {
-				this.xstream.registerConverter((SingleValueConverter) converters[i], i);
+				getXStream().registerConverter((SingleValueConverter) converters[i], i);
 			}
 			else {
 				throw new IllegalArgumentException("Invalid ConverterMatcher [" + converters[i] + "]");
@@ -149,27 +161,27 @@ else if (converters[i] instanceof SingleValueConverter) {
 	}
 
 	/**
-	 * Sets an alias/type map, consisting of string aliases mapped to classes. Keys are aliases; values are either
-	 * {@code Class} instances, or String class names.
+	 * Set an alias/type map, consisting of String aliases mapped to classes.
+	 * <p>Keys are aliases; values are either Class objects or String class names.
 	 * @see XStream#alias(String, Class)
 	 */
 	public void setAliases(Map<String, ?> aliases) throws ClassNotFoundException {
 		Map<String, Class<?>> classMap = toClassMap(aliases);
 		for (Map.Entry<String, Class<?>> entry : classMap.entrySet()) {
-			this.xstream.alias(entry.getKey(), entry.getValue());
+			getXStream().alias(entry.getKey(), entry.getValue());
 		}
 	}
 
 	/**
-	 * Sets the aliases by type map, consisting of string aliases mapped to classes. Any class that is assignable to
-	 * this type will be aliased to the same name. Keys are aliases; values are either
-	 * {@code Class} instances, or String class names.
+	 * Set the aliases by type map, consisting of String aliases mapped to classes.
+	 * <p>Any class that is assignable to this type will be aliased to the same name.
+	 * Keys are aliases; values are either Class objects or String class names.
 	 * @see XStream#aliasType(String, Class)
 	 */
 	public void setAliasesByType(Map<String, ?> aliases) throws ClassNotFoundException {
 		Map<String, Class<?>> classMap = toClassMap(aliases);
 		for (Map.Entry<String, Class<?>> entry : classMap.entrySet()) {
-			this.xstream.aliasType(entry.getKey(), entry.getValue());
+			getXStream().aliasType(entry.getKey(), entry.getValue());
 		}
 	}
 
@@ -178,16 +190,16 @@ private Map<String, Class<?>> toClassMap(Map<String, ?> map) throws ClassNotFoun
 		for (Map.Entry<String, ?> entry : map.entrySet()) {
 			String key = entry.getKey();
 			Object value = entry.getValue();
-			Class type;
+			Class<?> type;
 			if (value instanceof Class) {
-				type = (Class) value;
+				type = (Class<?>) value;
 			}
 			else if (value instanceof String) {
-				String s = (String) value;
-				type = ClassUtils.forName(s, classLoader);
+				String className = (String) value;
+				type = ClassUtils.forName(className, this.beanClassLoader);
 			}
 			else {
-				throw new IllegalArgumentException("Unknown value [" + value + "], expected String or Class");
+				throw new IllegalArgumentException("Unknown value [" + value + "] - expected String or Class");
 			}
 			result.put(key, type);
 		}
@@ -195,7 +207,7 @@ else if (value instanceof String) {
 	}
 
 	/**
-	 * Set a field alias/type map, consiting of field names.
+	 * Set a field alias/type map, consisting of field names.
 	 * @see XStream#aliasField(String, Class, String)
 	 */
 	public void setFieldAliases(Map<String, String> aliases) throws ClassNotFoundException, NoSuchFieldException {
@@ -205,9 +217,9 @@ public void setFieldAliases(Map<String, String> aliases) throws ClassNotFoundExc
 			int idx = field.lastIndexOf('.');
 			if (idx != -1) {
 				String className = field.substring(0, idx);
-				Class clazz = ClassUtils.forName(className, classLoader);
+				Class<?> clazz = ClassUtils.forName(className, this.beanClassLoader);
 				String fieldName = field.substring(idx + 1);
-				this.xstream.aliasField(alias, clazz, fieldName);
+				getXStream().aliasField(alias, clazz, fieldName);
 			}
 			else {
 				throw new IllegalArgumentException("Field name [" + field + "] does not contain '.'");
@@ -219,9 +231,9 @@ public void setFieldAliases(Map<String, String> aliases) throws ClassNotFoundExc
 	 * Set types to use XML attributes for.
 	 * @see XStream#useAttributeFor(Class)
 	 */
-	public void setUseAttributeForTypes(Class[] types) {
-		for (Class type : types) {
-			this.xstream.useAttributeFor(type);
+	public void setUseAttributeForTypes(Class<?>... types) {
+		for (Class<?> type : types) {
+			getXStream().useAttributeFor(type);
 		}
 	}
 
@@ -237,36 +249,33 @@ public void setUseAttributeFor(Map<?, ?> attributes) {
 		for (Map.Entry<?, ?> entry : attributes.entrySet()) {
 			if (entry.getKey() instanceof String) {
 				if (entry.getValue() instanceof Class) {
-					this.xstream.useAttributeFor((String) entry.getKey(), (Class) entry.getValue());
+					getXStream().useAttributeFor((String) entry.getKey(), (Class) entry.getValue());
 				}
 				else {
 					throw new IllegalArgumentException(
-							"Invalid argument 'attributes'. 'useAttributesFor' property takes map of <String, Class>," +
-									" when using a map key of type String");
+							"'useAttributesFor' takes Map<String, Class> when using a map key of type String");
 				}
 			}
 			else if (entry.getKey() instanceof Class) {
 				Class<?> key = (Class<?>) entry.getKey();
 				if (entry.getValue() instanceof String) {
-					this.xstream.useAttributeFor(key, (String) entry.getValue());
+					getXStream().useAttributeFor(key, (String) entry.getValue());
 				}
 				else if (entry.getValue() instanceof List) {
-					List list = (List) entry.getValue();
-
-					for (Object o : list) {
-						if (o instanceof String) {
-							this.xstream.useAttributeFor(key, (String) o);
+					List listValue = (List) entry.getValue();
+					for (Object element : listValue) {
+						if (element instanceof String) {
+							getXStream().useAttributeFor(key, (String) element);
 						}
 					}
 				}
 				else {
-					throw new IllegalArgumentException("Invalid argument 'attributes'. " +
-							"'useAttributesFor' property takes either <Class, String> or <Class, List<String>> map," +
-							" when using a map key of type Class");
+					throw new IllegalArgumentException("'useAttributesFor' property takes either Map<Class, String> " +
+							"or Map<Class, List<String>> when using a map key of type Class");
 				}
 			}
 			else {
-				throw new IllegalArgumentException("Invalid argument 'attributes. " +
+				throw new IllegalArgumentException(
 						"'useAttributesFor' property takes either a map key of type String or Class");
 			}
 		}
@@ -275,13 +284,13 @@ else if (entry.getValue() instanceof List) {
 	/**
 	 * Specify implicit collection fields, as a Map consisting of {@code Class} instances
 	 * mapped to comma separated collection field names.
-	 *@see XStream#addImplicitCollection(Class, String)
+	 * @see XStream#addImplicitCollection(Class, String)
 	 */
 	public void setImplicitCollections(Map<Class<?>, String> implicitCollections) {
 		for (Map.Entry<Class<?>, String> entry : implicitCollections.entrySet()) {
 			String[] collectionFields = StringUtils.commaDelimitedListToStringArray(entry.getValue());
 			for (String collectionField : collectionFields) {
-				this.xstream.addImplicitCollection(entry.getKey(), collectionField);
+				getXStream().addImplicitCollection(entry.getKey(), collectionField);
 			}
 		}
 	}
@@ -295,37 +304,39 @@ public void setOmittedFields(Map<Class<?>, String> omittedFields) {
 		for (Map.Entry<Class<?>, String> entry : omittedFields.entrySet()) {
 			String[] fields = StringUtils.commaDelimitedListToStringArray(entry.getValue());
 			for (String field : fields) {
-				this.xstream.omitField(entry.getKey(), field);
+				getXStream().omitField(entry.getKey(), field);
 			}
 		}
 	}
 
 	/**
-	 * Set the classes for which mappings will be read from class-level JDK 1.5+ annotation metadata.
+	 * Set the classes for which mappings will be read from class-level annotation metadata.
 	 * @see XStream#processAnnotations(Class)
+	 * @deprecated in favor of {@link #setAnnotatedClasses} with varargs
 	 */
+	@Deprecated
 	public void setAnnotatedClass(Class<?> annotatedClass) {
 		Assert.notNull(annotatedClass, "'annotatedClass' must not be null");
-		this.xstream.processAnnotations(annotatedClass);
+		getXStream().processAnnotations(annotatedClass);
 	}
 
 	/**
-	 * Set annotated classes for which aliases will be read from class-level JDK 1.5+ annotation metadata.
+	 * Set annotated classes for which aliases will be read from class-level annotation metadata.
 	 * @see XStream#processAnnotations(Class[])
 	 */
-	public void setAnnotatedClasses(Class<?>[] annotatedClasses) {
+	public void setAnnotatedClasses(Class<?>... annotatedClasses) {
 		Assert.notEmpty(annotatedClasses, "'annotatedClasses' must not be empty");
-		this.xstream.processAnnotations(annotatedClasses);
+		getXStream().processAnnotations(annotatedClasses);
 	}
 
 	/**
-	 * Set the autodetection mode of XStream.
-	 * <p><strong>Note</strong> that auto-detection implies that the XStream is configured while
+	 * Activate XStream's autodetection mode.
+	 * <p><b>Note</b>: Autodetection implies that the XStream instance is being configured while
 	 * it is processing the XML streams, and thus introduces a potential concurrency problem.
 	 * @see XStream#autodetectAnnotations(boolean)
 	 */
 	public void setAutodetectAnnotations(boolean autodetectAnnotations) {
-		this.xstream.autodetectAnnotations(autodetectAnnotations);
+		getXStream().autodetectAnnotations(autodetectAnnotations);
 	}
 
 	/**
@@ -343,22 +354,28 @@ public void setEncoding(String encoding) {
 		this.encoding = encoding;
 	}
 
+	@Override
+	protected String getDefaultEncoding() {
+		return this.encoding;
+	}
+
 	/**
 	 * Set the classes supported by this marshaller.
 	 * <p>If this property is empty (the default), all classes are supported.
 	 * @see #supports(Class)
 	 */
-	public void setSupportedClasses(Class[] supportedClasses) {
+	public void setSupportedClasses(Class<?>... supportedClasses) {
 		this.supportedClasses = supportedClasses;
 	}
 
 	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.classLoader = classLoader;
+		this.beanClassLoader = classLoader;
+		getXStream().setClassLoader(classLoader);
 	}
 
 
 	public final void afterPropertiesSet() throws Exception {
-		customizeXStream(this.xstream);
+		customizeXStream(getXStream());
 	}
 
 	/**
@@ -370,12 +387,12 @@ protected void customizeXStream(XStream xstream) {
 	}
 
 
-	public boolean supports(Class clazz) {
+	public boolean supports(Class<?> clazz) {
 		if (ObjectUtils.isEmpty(this.supportedClasses)) {
 			return true;
 		}
 		else {
-			for (Class supportedClass : this.supportedClasses) {
+			for (Class<?> supportedClass : this.supportedClasses) {
 				if (supportedClass.isAssignableFrom(clazz)) {
 					return true;
 				}
@@ -453,7 +470,7 @@ protected void marshalWriter(Object graph, Writer writer) throws XmlMappingExcep
 	 */
 	private void marshal(Object graph, HierarchicalStreamWriter streamWriter) {
 		try {
-			this.xstream.marshal(graph, streamWriter);
+			getXStream().marshal(graph, streamWriter);
 		}
 		catch (Exception ex) {
 			throw convertXStreamException(ex, true);
@@ -471,6 +488,19 @@ private void marshal(Object graph, HierarchicalStreamWriter streamWriter) {
 
 	// Unmarshalling
 
+	@Override
+	protected Object unmarshalStreamSource(StreamSource streamSource) throws XmlMappingException, IOException {
+		if (streamSource.getInputStream() != null) {
+			return unmarshalInputStream(streamSource.getInputStream());
+		}
+		else if (streamSource.getReader() != null) {
+			return unmarshalReader(streamSource.getReader());
+		}
+		else {
+			throw new IllegalArgumentException("StreamSource contains neither InputStream nor Reader");
+		}
+	}
+
 	@Override
 	protected Object unmarshalDomNode(Node node) throws XmlMappingException {
 		HierarchicalStreamReader streamReader;
@@ -536,7 +566,7 @@ protected Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource
      */
     private Object unmarshal(HierarchicalStreamReader streamReader) {
         try {
-            return this.xstream.unmarshal(streamReader);
+            return getXStream().unmarshal(streamReader);
         }
         catch (Exception ex) {
             throw convertXStreamException(ex, false);
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
index 8178d70452..61ade3e367 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.stream.StreamResult;
 
@@ -28,21 +27,24 @@
 import org.custommonkey.xmlunit.SimpleNamespaceContext;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.custommonkey.xmlunit.XpathEngine;
-import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.InOrder;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.oxm.AbstractMarshallerTests;
-import org.springframework.oxm.Marshaller;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.oxm.AbstractMarshallerTests;
+import org.springframework.oxm.Marshaller;
+
+import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.BDDMockito.*;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
 
 /**
  * Tests the {@link CastorMarshaller} class.
@@ -77,6 +79,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
 	 */
 	private static final String XSI_EXPECTED_STRING = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
 			"<objects><castor-object xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+			" xmlns:java=\"http://java.sun.com\"" +
 			" xsi:type=\"java:org.springframework.oxm.castor.CastorObject\">" +
 			"<name>test</name><value>8</value></castor-object></objects>";
 
@@ -91,6 +94,7 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
 	 */
 	private static final String ROOT_WITH_XSI_EXPECTED_STRING = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
 			"<objects xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+			" xmlns:java=\"http://java.sun.com\"" +
 			" xsi:type=\"java:java.util.Arrays$ArrayList\">" +
 			"<castor-object xsi:type=\"java:org.springframework.oxm.castor.CastorObject\">" +
 			"<name>test</name><value>8</value></castor-object></objects>";
@@ -100,9 +104,11 @@ public class CastorMarshallerTests extends AbstractMarshallerTests {
 	 */
 	private static final String ROOT_WITHOUT_XSI_EXPECTED_STRING = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
 			"<objects><castor-object xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+			" xmlns:java=\"http://java.sun.com\"" +
 			" xsi:type=\"java:org.springframework.oxm.castor.CastorObject\">" +
 			"<name>test</name><value>8</value></castor-object></objects>";
 
+
 	@Override
 	protected Marshaller createMarshaller() throws Exception {
 		CastorMarshaller marshaller = new CastorMarshaller();
@@ -121,6 +127,7 @@ protected Object createFlights() {
 		return flights;
 	}
 
+
 	@Test
 	public void marshalSaxResult() throws Exception {
 		ContentHandler contentHandler = mock(ContentHandler.class);
@@ -129,9 +136,12 @@ public void marshalSaxResult() throws Exception {
 		InOrder ordered = inOrder(contentHandler);
 		ordered.verify(contentHandler).startDocument();
 		ordered.verify(contentHandler).startPrefixMapping("tns", "http://samples.springframework.org/flight");
-		ordered.verify(contentHandler).startElement(eq("http://samples.springframework.org/flight"), eq("flights"), eq("tns:flights"), isA(Attributes.class));
-		ordered.verify(contentHandler).startElement(eq("http://samples.springframework.org/flight"), eq("flight"), eq("tns:flight"), isA(Attributes.class));
-		ordered.verify(contentHandler).startElement(eq("http://samples.springframework.org/flight"), eq("number"), eq("tns:number"), isA(Attributes.class));
+		ordered.verify(contentHandler).startElement(eq("http://samples.springframework.org/flight"),
+				eq("flights"), eq("tns:flights"), isA(Attributes.class));
+		ordered.verify(contentHandler).startElement(eq("http://samples.springframework.org/flight"),
+				eq("flight"), eq("tns:flight"), isA(Attributes.class));
+		ordered.verify(contentHandler).startElement(eq("http://samples.springframework.org/flight"),
+				eq("number"), eq("tns:number"), isA(Attributes.class));
 		ordered.verify(contentHandler).characters(eq(new char[]{'4', '2'}), eq(0), eq(2));
 		ordered.verify(contentHandler).endElement("http://samples.springframework.org/flight", "number", "tns:number");
 		ordered.verify(contentHandler).endElement("http://samples.springframework.org/flight", "flight", "tns:flight");
@@ -142,8 +152,8 @@ public void marshalSaxResult() throws Exception {
 
 	@Test
 	public void supports() throws Exception {
-		Assert.assertTrue("CastorMarshaller does not support Flights", marshaller.supports(Flights.class));
-		Assert.assertTrue("CastorMarshaller does not support Flight", marshaller.supports(Flight.class));
+		assertTrue("CastorMarshaller does not support Flights", marshaller.supports(Flights.class));
+		assertTrue("CastorMarshaller does not support Flight", marshaller.supports(Flight.class));
 	}
 
 	@Test
@@ -163,7 +173,6 @@ public void testSuppressNamespacesFalse() throws Exception {
 	@Test
 	public void testSuppressXsiTypeTrue() throws Exception {
 		CastorObject castorObject = createCastorObject();
-
 		getCastorMarshaller().setSuppressXsiType(true);
 		getCastorMarshaller().setRootElement("objects");
 		String result = marshal(Arrays.asList(castorObject));
@@ -173,7 +182,6 @@ public void testSuppressXsiTypeTrue() throws Exception {
 	@Test
 	public void testSuppressXsiTypeFalse() throws Exception {
 		CastorObject castorObject = createCastorObject();
-
 		getCastorMarshaller().setSuppressXsiType(false);
 		getCastorMarshaller().setRootElement("objects");
 		String result = marshal(Arrays.asList(castorObject));
@@ -182,26 +190,23 @@ public void testSuppressXsiTypeFalse() throws Exception {
 
 	@Test
 	public void testMarshalAsDocumentTrue() throws Exception {
-
 		getCastorMarshaller().setMarshalAsDocument(true);
 		String result = marshalFlights();
 		assertXMLEqual("Marshaller wrote invalid result", DOCUMENT_EXPECTED_STRING, result);
-		Assert.assertTrue("Result doesn't contain xml declaration.",
+		assertTrue("Result doesn't contain xml declaration.",
 				result.contains("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
 	}
 
 	@Test
 	public void testMarshalAsDocumentFalse() throws Exception {
-
 		getCastorMarshaller().setMarshalAsDocument(true);
 		String result = marshalFlights();
 		assertXMLEqual("Marshaller wrote invalid result", EXPECTED_STRING, result);
-		Assert.assertFalse("Result contains xml declaration.", result.matches("<\\?\\s*xml"));
+		assertFalse("Result contains xml declaration.", result.matches("<\\?\\s*xml"));
 	}
 
 	@Test
 	public void testRootElement() throws Exception {
-
 		getCastorMarshaller().setRootElement("canceledFlights");
 		String result = marshalFlights();
 		assertXMLEqual("Marshaller wrote invalid result", ROOT_ELEMENT_EXPECTED_STRING, result);
@@ -210,10 +215,8 @@ public void testRootElement() throws Exception {
 	@Test
 	public void testNoNamespaceSchemaLocation() throws Exception {
 		String noNamespaceSchemaLocation = "flights.xsd";
-
 		getCastorMarshaller().setNoNamespaceSchemaLocation(noNamespaceSchemaLocation);
 		String result = marshalFlights();
-
 		assertXpathEvaluatesTo("The xsi:noNamespaceSchemaLocation hasn't been written or has invalid value.",
 				noNamespaceSchemaLocation, "/tns:flights/@xsi:noNamespaceSchemaLocation", result);
 		assertXMLEqual("Marshaller wrote invalid result", EXPECTED_STRING, result);
@@ -222,10 +225,8 @@ public void testNoNamespaceSchemaLocation() throws Exception {
 	@Test
 	public void testSchemaLocation() throws Exception {
 		String schemaLocation = "flights.xsd";
-
 		getCastorMarshaller().setSchemaLocation(schemaLocation);
 		String result = marshalFlights();
-
 		assertXpathEvaluatesTo("The xsi:noNamespaceSchemaLocation hasn't been written or has invalid value.",
 				schemaLocation, "/tns:flights/@xsi:schemaLocation", result);
 		assertXMLEqual("Marshaller wrote invalid result", EXPECTED_STRING, result);
@@ -234,7 +235,6 @@ public void testSchemaLocation() throws Exception {
 	@Test
 	public void testUseXsiTypeAsRootTrue() throws Exception {
 		CastorObject castorObject = createCastorObject();
-
 		getCastorMarshaller().setSuppressXsiType(false);
 		getCastorMarshaller().setUseXSITypeAtRoot(true);
 		getCastorMarshaller().setRootElement("objects");
@@ -245,7 +245,6 @@ public void testUseXsiTypeAsRootTrue() throws Exception {
 	@Test
 	public void testUseXsiTypeAsRootFalse() throws Exception {
 		CastorObject castorObject = createCastorObject();
-
 		getCastorMarshaller().setSuppressXsiType(false);
 		getCastorMarshaller().setUseXSITypeAtRoot(false);
 		getCastorMarshaller().setRootElement("objects");
@@ -259,11 +258,9 @@ private CastorMarshaller getCastorMarshaller() {
 	}
 
 	private String marshal(Object object) throws Exception {
-
 		StringWriter writer = new StringWriter();
 		StreamResult result = new StreamResult(writer);
 		getCastorMarshaller().marshal(object, result);
-
 		return writer.toString();
 	}
 
@@ -272,9 +269,9 @@ private String marshalFlights() throws Exception {
 	}
 
 	/**
-	 * Asserts the values of xpath expression evaluation is exactly the same as expected value. </p> The xpath may contain
-	 * the xml namespace prefixes, since namespaces from flight example are being registered.
-	 *
+	 * Assert the values of xpath expression evaluation is exactly the same as expected value.
+	 * <p>The xpath may contain the xml namespace prefixes, since namespaces from flight example
+	 * are being registered.
 	 * @param msg the error message that will be used in case of test failure
 	 * @param expected the expected value
 	 * @param xpath the xpath to evaluate
@@ -296,9 +293,7 @@ private void assertXpathEvaluatesTo(String msg, String expected, String xpath, S
 	}
 
 	/**
-	 * Creates a instance of {@link CastorObject} for testing.
-	 *
-	 * @return a instance of {@link CastorObject}
+	 * Create an instance of {@link CastorObject} for testing.
 	 */
 	private CastorObject createCastorObject() {
 		CastorObject castorObject = new CastorObject();
@@ -306,4 +301,5 @@ private CastorObject createCastorObject() {
 		castorObject.setValue(8);
 		return castorObject;
 	}
+
 }
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java
index 585640893b..ce2f1c7caa 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,14 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
 import org.junit.Ignore;
 import org.junit.Test;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.oxm.AbstractUnmarshallerTests;
@@ -43,15 +47,16 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests {
 	 */
 	protected static final String EXTRA_ATTRIBUTES_STRING =
 			"<tns:flights xmlns:tns=\"http://samples.springframework.org/flight\">" +
-					"<tns:flight status=\"canceled\"><tns:number>42</tns:number></tns:flight></tns:flights>";
+			"<tns:flight status=\"canceled\"><tns:number>42</tns:number></tns:flight></tns:flights>";
 
 	/**
 	 * Represents the xml with additional element that is not mapped in Castor config.
 	 */
 	protected static final String EXTRA_ELEMENTS_STRING =
 			"<tns:flights xmlns:tns=\"http://samples.springframework.org/flight\">" +
-					"<tns:flight><tns:number>42</tns:number><tns:date>2011-06-14</tns:date>" +
-					"</tns:flight></tns:flights>";
+			"<tns:flight><tns:number>42</tns:number><tns:date>2011-06-14</tns:date>" +
+			"</tns:flight></tns:flights>";
+
 
 	@Override
 	protected void testFlights(Object o) {
@@ -77,6 +82,7 @@ protected Unmarshaller createUnmarshaller() throws Exception {
 		return marshaller;
 	}
 
+
 	@Test
 	public void unmarshalTargetClass() throws Exception {
 		CastorMarshaller unmarshaller = new CastorMarshaller();
@@ -132,7 +138,6 @@ public void testIgnoreExtraAttributesTrue() throws Exception {
 
 	@Test(expected = MarshallingException.class)
 	public void testIgnoreExtraAttributesFalse() throws Exception {
-
 		getCastorUnmarshaller().setIgnoreExtraAttributes(false);
 		unmarshal(EXTRA_ATTRIBUTES_STRING);
 	}
@@ -148,7 +153,6 @@ public void testIgnoreExtraElementsTrue() throws Exception {
 
 	@Test(expected = MarshallingException.class)
 	public void testIgnoreExtraElementsFalse() throws Exception {
-
 		getCastorUnmarshaller().setIgnoreExtraElements(false);
 		unmarshal(EXTRA_ELEMENTS_STRING);
 	}
@@ -176,7 +180,7 @@ public void testClearCollectionsTrue() throws Exception {
 	}
 
 	@Test
-	@Ignore("Fails on the builder server for some reason")
+	@Ignore("Fails on the build server for some reason")
 	public void testClearCollectionsFalse() throws Exception {
 		Flights flights = new Flights();
 		flights.setFlight(new Flight[]{new Flight(), null});
@@ -191,6 +195,61 @@ public void testClearCollectionsFalse() throws Exception {
 		testFlight(flights.getFlight()[2]);
 	}
 
+	@Test
+	public void unmarshalStreamSourceExternalEntities() throws Exception {
+		final AtomicReference<XMLReader> result = new AtomicReference<XMLReader>();
+		CastorMarshaller marshaller = new CastorMarshaller() {
+			@Override
+			protected Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource) {
+				result.set(xmlReader);
+				return null;
+			}
+		};
+
+		// 1. external-general-entities and dtd support disabled (default)
+		marshaller.unmarshal(new StreamSource("1"));
+		assertNotNull(result.get());
+		assertEquals(true, result.get().getFeature("http://apache.org/xml/features/disallow-doctype-decl"));
+		assertEquals(false, result.get().getFeature("http://xml.org/sax/features/external-general-entities"));
+
+		// 2. external-general-entities and dtd support enabled
+		result.set(null);
+		marshaller.setSupportDtd(true);
+		marshaller.setProcessExternalEntities(true);
+		marshaller.unmarshal(new StreamSource("1"));
+		assertNotNull(result.get());
+		assertEquals(false, result.get().getFeature("http://apache.org/xml/features/disallow-doctype-decl"));
+		assertEquals(true, result.get().getFeature("http://xml.org/sax/features/external-general-entities"));
+	}
+
+	@Test
+	public void unmarshalSaxSourceWithXmlOptions() throws Exception {
+		final AtomicReference<XMLReader> result = new AtomicReference<XMLReader>();
+		CastorMarshaller marshaller = new CastorMarshaller() {
+			@Override
+			protected Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource) {
+				result.set(xmlReader);
+				return null;
+			}
+		};
+
+		// 1. external-general-entities and dtd support disabled (default)
+		marshaller.unmarshal(new SAXSource(new InputSource("1")));
+		assertNotNull(result.get());
+		assertEquals(true, result.get().getFeature("http://apache.org/xml/features/disallow-doctype-decl"));
+		assertEquals(false, result.get().getFeature("http://xml.org/sax/features/external-general-entities"));
+
+		// 2. external-general-entities and dtd support enabled
+		result.set(null);
+		marshaller.setSupportDtd(true);
+		marshaller.setProcessExternalEntities(true);
+		marshaller.unmarshal(new SAXSource(new InputSource("1")));
+		assertNotNull(result.get());
+		assertEquals(false, result.get().getFeature("http://apache.org/xml/features/disallow-doctype-decl"));
+		assertEquals(true, result.get().getFeature("http://xml.org/sax/features/external-general-entities"));
+	}
+
+
 	private CastorMarshaller getCastorUnmarshaller() {
 		return (CastorMarshaller) unmarshaller;
 	}
@@ -203,4 +262,5 @@ private Object unmarshal(String xml) throws Exception {
 		StreamSource source = new StreamSource(new StringReader(xml));
 		return unmarshaller.unmarshal(source);
 	}
+
 }
diff --git a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/PersonBean.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Airplane.java
similarity index 52%
rename from spring-context-support/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
rename to spring-oxm/src/test/java/org/springframework/oxm/jaxb/Airplane.java
index c3f19cf3e9..bc0060b0f4 100644
--- a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Airplane.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,36 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.ui.jasperreports;
+package org.springframework.oxm.jaxb;
 
-/**
- * @author Rob Harrop
- */
-public class PersonBean {
+import javax.xml.bind.annotation.XmlRootElement;
 
-	private int id;
+@XmlRootElement
+public class Airplane {
 
 	private String name;
 
-	private String street;
-
-	private String city;
-
-	public String getCity() {
-		return city;
-	}
-
-	public void setCity(String city) {
-		this.city = city;
-	}
-
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
 
 	public String getName() {
 		return name;
@@ -53,12 +32,4 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-	public String getStreet() {
-		return street;
-	}
-
-	public void setStreet(String street) {
-		this.street = street;
-	}
-
 }
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
index aa3eca0777..60d69bb9d6 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,9 +31,12 @@
 import javax.xml.namespace.QName;
 import javax.xml.transform.Result;
 import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
 
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InOrder;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -49,12 +52,18 @@
 import org.springframework.util.ReflectionUtils;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+
 import static org.junit.Assert.*;
+import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import static org.mockito.BDDMockito.*;
 
+/**
+ * @author Arjen Poutsma
+ * @author Biju Kunjummen
+ */
 public class Jaxb2MarshallerTests extends AbstractMarshallerTests {
 
 	private static final String CONTEXT_PATH = "org.springframework.oxm.jaxb.test";
@@ -281,6 +290,96 @@ public void marshalAttachments() throws Exception {
 		verify(mimeContainer, times(3)).addAttachment(isA(String.class), isA(DataHandler.class));
 	}
 
+	@Test
+	public void marshalAWrappedObjectHoldingAnXmlElementDeclElement() throws Exception {
+		// SPR-10714
+		marshaller = new Jaxb2Marshaller();
+		marshaller.setPackagesToScan(new String[] { "org.springframework.oxm.jaxb" });
+		marshaller.afterPropertiesSet();
+		Airplane airplane = new Airplane();
+		airplane.setName("test");
+		StringWriter writer = new StringWriter();
+		Result result = new StreamResult(writer);
+		marshaller.marshal(airplane, result);
+		assertXMLEqual("Marshalling should use root Element",
+				writer.toString(), "<airplane><name>test</name></airplane>");
+	}
+
+	// SPR-10806
+
+	@Test
+	public void unmarshalStreamSourceWithXmlOptions() throws Exception {
+
+		final javax.xml.bind.Unmarshaller unmarshaller = mock(javax.xml.bind.Unmarshaller.class);
+		Jaxb2Marshaller marshaller = new Jaxb2Marshaller() {
+			@Override
+			protected javax.xml.bind.Unmarshaller createUnmarshaller() {
+				return unmarshaller;
+			}
+		};
+
+		// 1. external-general-entities and dtd support disabled (default)
+
+		marshaller.unmarshal(new StreamSource("1"));
+		ArgumentCaptor<SAXSource> sourceCaptor = ArgumentCaptor.forClass(SAXSource.class);
+		verify(unmarshaller).unmarshal(sourceCaptor.capture());
+
+		SAXSource result = sourceCaptor.getValue();
+		assertEquals(true, result.getXMLReader().getFeature("http://apache.org/xml/features/disallow-doctype-decl"));
+		assertEquals(false, result.getXMLReader().getFeature("http://xml.org/sax/features/external-general-entities"));
+
+		// 2. external-general-entities and dtd support enabled
+
+		reset(unmarshaller);
+		marshaller.setSupportDtd(true);
+		marshaller.setProcessExternalEntities(true);
+
+		marshaller.unmarshal(new StreamSource("1"));
+		verify(unmarshaller).unmarshal(sourceCaptor.capture());
+
+		result = sourceCaptor.getValue();
+		assertEquals(false, result.getXMLReader().getFeature("http://apache.org/xml/features/disallow-doctype-decl"));
+		assertEquals(true, result.getXMLReader().getFeature("http://xml.org/sax/features/external-general-entities"));
+	}
+
+	// SPR-10806
+
+	@Test
+	public void unmarshalSaxSourceExternalEntities() throws Exception {
+
+		final javax.xml.bind.Unmarshaller unmarshaller = mock(javax.xml.bind.Unmarshaller.class);
+		Jaxb2Marshaller marshaller = new Jaxb2Marshaller() {
+			@Override
+			protected javax.xml.bind.Unmarshaller createUnmarshaller() {
+				return unmarshaller;
+			}
+		};
+
+		// 1. external-general-entities and dtd support disabled (default)
+
+		marshaller.unmarshal(new SAXSource(new InputSource("1")));
+		ArgumentCaptor<SAXSource> sourceCaptor = ArgumentCaptor.forClass(SAXSource.class);
+		verify(unmarshaller).unmarshal(sourceCaptor.capture());
+
+		SAXSource result = sourceCaptor.getValue();
+		assertEquals(true, result.getXMLReader().getFeature("http://apache.org/xml/features/disallow-doctype-decl"));
+		assertEquals(false, result.getXMLReader().getFeature("http://xml.org/sax/features/external-general-entities"));
+
+		// 2. external-general-entities and dtd support enabled
+
+		reset(unmarshaller);
+		marshaller.setSupportDtd(true);
+		marshaller.setProcessExternalEntities(true);
+
+		marshaller.unmarshal(new SAXSource(new InputSource("1")));
+		verify(unmarshaller).unmarshal(sourceCaptor.capture());
+
+		result = sourceCaptor.getValue();
+		assertEquals(false, result.getXMLReader().getFeature("http://apache.org/xml/features/disallow-doctype-decl"));
+		assertEquals(true, result.getXMLReader().getFeature("http://xml.org/sax/features/external-general-entities"));
+	}
+
+
 	@XmlRootElement
 	@SuppressWarnings("unused")
 	public static class DummyRootElement {
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
index 55a3f8d226..a802392a39 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
@@ -16,8 +16,9 @@
 
 package org.springframework.oxm.jaxb;
 
+import java.io.File;
+import java.io.IOException;
 import java.io.StringReader;
-
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
 import javax.xml.bind.JAXBElement;
@@ -26,7 +27,11 @@
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
+import static org.junit.Assert.*;
 import org.junit.Test;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.mock;
+
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.oxm.AbstractUnmarshallerTests;
@@ -36,9 +41,10 @@
 import org.springframework.oxm.mime.MimeContainer;
 import org.springframework.util.xml.StaxUtils;
 
-import static org.junit.Assert.*;
-import static org.mockito.BDDMockito.*;
-
+/**
+ * @author Arjen Poutsma
+ * @author Biju Kunjummen
+ */
 public class Jaxb2UnmarshallerTests extends AbstractUnmarshallerTests {
 
 	private static final String INPUT_STRING = "<tns:flights xmlns:tns=\"http://samples.springframework.org/flight\">" +
@@ -104,6 +110,7 @@ protected void testFlight(Object o) {
 
 	@Test
 	@Override
+	@SuppressWarnings("unchecked")
 	public void unmarshalPartialStaxSourceXmlStreamReader() throws Exception {
 		XMLInputFactory inputFactory = XMLInputFactory.newInstance();
 		XMLStreamReader streamReader = inputFactory.createXMLStreamReader(new StringReader(INPUT_STRING));
@@ -115,5 +122,27 @@ public void unmarshalPartialStaxSourceXmlStreamReader() throws Exception {
 		testFlight(flight);
 	}
 
+	@Test
+	@SuppressWarnings("unchecked")
+	public void unmarshalAnXmlReferingToAWrappedXmlElementDecl() throws Exception {
+		// SPR-10714
+		unmarshaller = new Jaxb2Marshaller();
+		unmarshaller.setPackagesToScan(new String[] { "org.springframework.oxm.jaxb" });
+		unmarshaller.afterPropertiesSet();
+		Source source = new StreamSource(new StringReader(
+				"<brand-airplane><name>test</name></brand-airplane>"));
+		JAXBElement<Airplane> airplane = (JAXBElement<Airplane>) unmarshaller.unmarshal(source);
+		assertEquals("Unmarshalling via explicit @XmlRegistry tag should return correct type",
+				"test", airplane.getValue().getName());
+	}
+
+	@Test
+	public void unmarshalFile() throws IOException {
+		Resource resource = new ClassPathResource("jaxb2.xml", getClass());
+		File file = resource.getFile();
+
+		Flights f = (Flights) unmarshaller.unmarshal(new StreamSource(file));
+		testFlights(f);
+	}
 
 }
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java
new file mode 100644
index 0000000000..a3f6c702af
--- /dev/null
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/XmlRegObjectFactory.java
@@ -0,0 +1,16 @@
+
+package org.springframework.oxm.jaxb;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+@XmlRegistry
+public class XmlRegObjectFactory {
+
+	@XmlElementDecl(name = "brand-airplane")
+	public JAXBElement<Airplane> createAirplane(Airplane airplane) {
+		return new JAXBElement<Airplane>(new QName("brand-airplane"), Airplane.class, null, airplane);
+	}
+}
\ No newline at end of file
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java
index 505befb1c5..65c9344cb7 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java
@@ -25,7 +25,9 @@
 import org.springframework.oxm.AbstractUnmarshallerTests;
 import org.springframework.oxm.Unmarshaller;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 
 /**
  * @author Arjen Poutsma
diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/jaxb/jaxb2.xml b/spring-oxm/src/test/resources/org/springframework/oxm/jaxb/jaxb2.xml
new file mode 100644
index 0000000000..4428a1dc7a
--- /dev/null
+++ b/spring-oxm/src/test/resources/org/springframework/oxm/jaxb/jaxb2.xml
@@ -0,0 +1,5 @@
+<tns:flights xmlns:tns="http://samples.springframework.org/flight">
+    <tns:flight>
+        <tns:number>42</tns:number>
+    </tns:flight>
+</tns:flights>
\ No newline at end of file
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java b/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
index 744a6cd2b9..8806a430ee 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,8 @@
 
 package org.springframework.test.util;
 
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-
 import java.io.StringReader;
 import java.util.Map;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.Source;
@@ -29,11 +26,12 @@
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.hamcrest.Matcher;
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
 
+import static org.springframework.test.util.MatcherAssertionErrors.*;
+
 /**
  * A helper class for assertions on XML content.
  *
@@ -42,7 +40,6 @@
  */
 public class XmlExpectationsHelper {
 
-
 	/**
 	 * Parse the content as {@link Node} and apply a {@link Matcher}.
 	 */
@@ -56,8 +53,7 @@ private Document parseXmlString(String xml) throws Exception  {
 		factory.setNamespaceAware(true);
 		DocumentBuilder documentBuilder = factory.newDocumentBuilder();
 		InputSource inputSource = new InputSource(new StringReader(xml));
-		Document document = documentBuilder.parse(inputSource);
-		return document;
+		return documentBuilder.parse(inputSource);
 	}
 
 	/**
@@ -73,18 +69,14 @@ public void assertSource(String content, Matcher<? super Source> matcher) throws
 	 * Parse the expected and actual content strings as XML and assert that the
 	 * two are "similar" -- i.e. they contain the same elements and attributes
 	 * regardless of order.
-	 *
 	 * <p>Use of this method assumes the
 	 * <a href="http://xmlunit.sourceforge.net/">XMLUnit<a/> library is available.
-	 *
 	 * @param expected the expected XML content
 	 * @param actual the actual XML content
-	 *
-	 * @see MockMvcResultMatchers#xpath(String, Object...)
-	 * @see MockMvcResultMatchers#xpath(String, Map, Object...)
+	 * @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Object...)
+	 * @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Map, Object...)
 	 */
 	public void assertXmlEqual(String expected, String actual) throws Exception {
-
 		XMLUnit.setIgnoreWhitespace(true);
 		XMLUnit.setIgnoreComments(true);
 		XMLUnit.setIgnoreAttributeOrder(true);
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
index 914f949d0c..35605d116d 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.client;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.request;
+package org.springframework.test.web.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -33,6 +32,9 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+import org.springframework.util.Assert;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 
 /**
  * A {@link ClientHttpRequestFactory} for requests executed via {@link MockMvc}.
@@ -46,29 +48,26 @@ public class MockMvcClientHttpRequestFactory implements ClientHttpRequestFactory
 
 
 	public MockMvcClientHttpRequestFactory(MockMvc mockMvc) {
+		Assert.notNull(mockMvc, "MockMvc must not be null");
 		this.mockMvc = mockMvc;
 	}
 
+
 	public ClientHttpRequest createRequest(final URI uri, final HttpMethod httpMethod) throws IOException {
 		return new MockClientHttpRequest(httpMethod, uri) {
-
 			@Override
 			public ClientHttpResponse executeInternal() throws IOException {
 				try {
 					MockHttpServletRequestBuilder requestBuilder = request(httpMethod, uri.toString());
 					requestBuilder.content(getBodyAsBytes());
 					requestBuilder.headers(getHeaders());
-
 					MvcResult mvcResult = MockMvcClientHttpRequestFactory.this.mockMvc.perform(requestBuilder).andReturn();
-
 					MockHttpServletResponse servletResponse = mvcResult.getResponse();
 					HttpStatus status = HttpStatus.valueOf(servletResponse.getStatus());
 					byte[] body = servletResponse.getContentAsByteArray();
 					HttpHeaders headers = getResponseHeaders(servletResponse);
-
 					MockClientHttpResponse clientResponse = new MockClientHttpResponse(body, status);
 					clientResponse.getHeaders().putAll(headers);
-
 					return clientResponse;
 				}
 				catch (Exception ex) {
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
index 4d708ddd18..0abfd6d221 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client;
 
 import java.io.IOException;
@@ -39,7 +40,7 @@
  * actual running server.
  *
  * <p>Below is an example:
- * <pre>
+ * <pre class="code">
  * RestTemplate restTemplate = new RestTemplate()
  * MockRestServiceServer mockServer = MockRestServiceServer.createServer(restTemplate);
  *
@@ -95,28 +96,24 @@ public class MockRestServiceServer {
 	private MockRestServiceServer() {
 	}
 
+
 	/**
 	 * Create a {@code MockRestServiceServer} and set up the given
 	 * {@code RestTemplate} with a mock {@link ClientHttpRequestFactory}.
-	 *
 	 * @param restTemplate the RestTemplate to set up for mock testing
 	 * @return the created mock server
 	 */
 	public static MockRestServiceServer createServer(RestTemplate restTemplate) {
 		Assert.notNull(restTemplate, "'restTemplate' must not be null");
-
 		MockRestServiceServer mockServer = new MockRestServiceServer();
 		RequestMatcherClientHttpRequestFactory factory = mockServer.new RequestMatcherClientHttpRequestFactory();
-
 		restTemplate.setRequestFactory(factory);
-
 		return mockServer;
 	}
 
 	/**
 	 * Create a {@code MockRestServiceServer} and set up the given
 	 * {@code RestGatewaySupport} with a mock {@link ClientHttpRequestFactory}.
-	 *
 	 * @param restGateway the REST gateway to set up for mock testing
 	 * @return the created mock server
 	 */
@@ -125,14 +122,12 @@ public static MockRestServiceServer createServer(RestGatewaySupport restGateway)
 		return createServer(restGateway.getRestTemplate());
 	}
 
+
 	/**
 	 * Set up a new HTTP request expectation. The returned {@link ResponseActions}
 	 * is used to set up further expectations and to define the response.
-	 *
-	 * <p>This method may be invoked multiple times before starting the test, i.e.
-	 * before using the {@code RestTemplate}, to set up expectations for multiple
-	 * requests.
-	 *
+	 * <p>This method may be invoked multiple times before starting the test, i.e. before
+	 * using the {@code RestTemplate}, to set up expectations for multiple requests.
 	 * @param requestMatcher a request expectation, see {@link MockRestRequestMatchers}
 	 * @return used to set up further expectations or to define a response
 	 */
@@ -146,7 +141,6 @@ public ResponseActions expect(RequestMatcher requestMatcher) {
 	/**
 	 * Verify that all expected requests set up via
 	 * {@link #expect(RequestMatcher)} were indeed performed.
-	 *
 	 * @throws AssertionError when some expectations were not met
 	 */
 	public void verify() {
@@ -158,7 +152,6 @@ public void verify() {
 
 	private String getVerifyMessage() {
 		StringBuilder sb = new StringBuilder("Further request(s) expected\n");
-
 		if (this.actualRequests.size() > 0) {
 			sb.append("The following ");
 		}
@@ -171,7 +164,6 @@ private String getVerifyMessage() {
 				sb.append(request.toString()).append("\n");
 			}
 		}
-
 		return sb.toString();
 	}
 
@@ -192,7 +184,7 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IO
 				this.requestIterator = MockRestServiceServer.this.expectedRequests.iterator();
 			}
 			if (!this.requestIterator.hasNext()) {
-				throw new AssertionError("No further requests expected");
+				throw new AssertionError("No further requests expected: HTTP " + httpMethod + " " + uri);
 			}
 
 			RequestMatcherClientHttpRequest request = this.requestIterator.next();
@@ -200,7 +192,6 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IO
 			request.setMethod(httpMethod);
 
 			MockRestServiceServer.this.actualRequests.add(request);
-
 			return request;
 		}
 	}
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcher.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcher.java
index e59d48b5f2..511d3176a9 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcher.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client;
 
 import java.io.IOException;
@@ -28,8 +29,7 @@
 public interface RequestMatcher {
 
 	/**
-	 * Match the given request against some expectations.
-	 *
+	 * Match the given request against specific expectations.
 	 * @param request the request to make assertions on
 	 * @throws IOException in case of I/O errors
 	 * @throws AssertionError if expectations are not met
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
index a0553cfd8d..b418614134 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client;
 
 import java.io.IOException;
@@ -45,6 +46,7 @@ public RequestMatcherClientHttpRequest(RequestMatcher requestMatcher) {
 		this.requestMatchers.add(requestMatcher);
 	}
 
+
 	public ResponseActions andExpect(RequestMatcher requestMatcher) {
 		Assert.notNull(requestMatcher, "RequestMatcher is required");
 		this.requestMatchers.add(requestMatcher);
@@ -57,22 +59,17 @@ public void andRespond(ResponseCreator responseCreator) {
 	}
 
 	public ClientHttpResponse executeInternal() throws IOException {
-
 		if (this.requestMatchers.isEmpty()) {
 			throw new AssertionError("No request expectations to execute");
 		}
-
 		if (this.responseCreator == null) {
-			throw new AssertionError("No ResponseCreator was set up. Add it after request expectations, "
-					+ "e.g. MockRestServiceServer.expect(requestTo(\"/foo\")).andRespond(withSuccess())");
+			throw new AssertionError("No ResponseCreator was set up. Add it after request expectations, " +
+					"e.g. MockRestServiceServer.expect(requestTo(\"/foo\")).andRespond(withSuccess())");
 		}
-
 		for (RequestMatcher requestMatcher : this.requestMatchers) {
 			requestMatcher.match(this);
 		}
-
 		setResponse(this.responseCreator.createResponse(this));
-
 		return super.executeInternal();
 	}
 
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
index 1bcb49a5b9..47e1126088 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,24 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.client.match;
 
-import static org.springframework.test.util.AssertionErrors.assertEquals;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
+package org.springframework.test.web.client.match;
 
 import java.io.IOException;
-
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
 import org.hamcrest.Matcher;
+import org.w3c.dom.Node;
+
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
 import org.springframework.test.util.XmlExpectationsHelper;
 import org.springframework.test.web.client.RequestMatcher;
-import org.w3c.dom.Node;
+
+import static org.hamcrest.MatcherAssert.*;
+import static org.springframework.test.util.AssertionErrors.*;
 
 /**
  * Factory for request content {@code RequestMatcher}'s. An instance of this
@@ -52,6 +52,7 @@ protected ContentRequestMatchers() {
 		this.xmlHelper = new XmlExpectationsHelper();
 	}
 
+
 	/**
 	 * Assert the request content type as a String.
 	 */
@@ -135,10 +136,8 @@ public void match(ClientHttpRequest request) throws IOException, AssertionError
 	 * Parse the request body and the given String as XML and assert that the
 	 * two are "similar" - i.e. they contain the same elements and attributes
 	 * regardless of order.
-	 *
 	 * <p>Use of this matcher assumes the
 	 * <a href="http://xmlunit.sourceforge.net/">XMLUnit<a/> library is available.
-	 *
 	 * @param expectedXmlContent the expected XML content
 	 */
 	public RequestMatcher xml(final String expectedXmlContent) {
@@ -175,6 +174,7 @@ protected void matchInternal(MockClientHttpRequest request) throws Exception {
 		};
 	}
 
+
 	/**
 	 * Abstract base class for XML {@link RequestMatcher}'s.
 	 */
@@ -185,12 +185,12 @@ public final void match(ClientHttpRequest request) throws IOException, Assertion
 				MockClientHttpRequest mockRequest = (MockClientHttpRequest) request;
 				matchInternal(mockRequest);
 			}
-			catch (Exception e) {
-				throw new AssertionError("Failed to parse expected or actual XML request content: " + e.getMessage());
+			catch (Exception ex) {
+				throw new AssertionError("Failed to parse expected or actual XML request content: " + ex.getMessage());
 			}
 		}
 
 		protected abstract void matchInternal(MockClientHttpRequest request) throws Exception;
-
 	}
+
 }
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
index d4da756185..3ea820ed11 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,20 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client.match;
 
 import java.io.IOException;
 import java.text.ParseException;
 
 import org.hamcrest.Matcher;
+
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
 import org.springframework.test.util.JsonPathExpectationsHelper;
 import org.springframework.test.web.client.RequestMatcher;
 
 /**
- * Factory methods for request content {@code RequestMatcher}'s using a <a
- * href="http://goessner.net/articles/JsonPath/">JSONPath</a> expression.
+ * Factory methods for request content {@code RequestMatcher}'s using a
+ * <a href="http://goessner.net/articles/JsonPath/">JSONPath</a> expression.
  * An instance of this class is typically accessed via
  * {@code RequestMatchers.jsonPath(..)}.
  *
@@ -42,7 +44,6 @@ public class JsonPathRequestMatchers {
 	 * Class constructor, not for direct instantiation. Use
 	 * {@link MockRestRequestMatchers#jsonPath(String, Matcher)} or
 	 * {@link MockRestRequestMatchers#jsonPath(String, Object...)}.
-	 *
 	 * @param expression the JSONPath expression
 	 * @param args arguments to parameterize the JSONPath expression with using
 	 * the formatting specifiers defined in
@@ -52,6 +53,7 @@ protected JsonPathRequestMatchers(String expression, Object ... args) {
 		this.jsonPathHelper = new JsonPathExpectationsHelper(expression, args);
 	}
 
+
 	/**
 	 * Evaluate the JSONPath and assert the resulting value with the given {@code Matcher}.
 	 */
@@ -123,12 +125,12 @@ public final void match(ClientHttpRequest request) throws IOException, Assertion
 				MockClientHttpRequest mockRequest = (MockClientHttpRequest) request;
 				matchInternal(mockRequest);
 			}
-			catch (ParseException e) {
-				throw new AssertionError("Failed to parse JSON request content: " + e.getMessage());
+			catch (ParseException ex) {
+				throw new AssertionError("Failed to parse JSON request content: " + ex.getMessage());
 			}
 		}
 
 		protected abstract void matchInternal(MockClientHttpRequest request) throws IOException, ParseException;
-
 	}
+
 }
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
index ce3c7fb80d..292052b929 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,13 +47,6 @@
  */
 public abstract class MockRestRequestMatchers {
 
-
-	/**
-	 * Private class constructor.
-	 */
-	private MockRestRequestMatchers() {
-	}
-
 	/**
 	 * Match to any request.
 	 */
@@ -66,7 +59,6 @@ public void match(ClientHttpRequest request) throws AssertionError {
 
 	/**
 	 * Assert the request URI string with the given matcher.
-	 *
 	 * @param matcher String matcher for the expected URI
 	 * @return the request matcher
 	 */
@@ -81,7 +73,6 @@ public void match(ClientHttpRequest request) throws IOException, AssertionError
 
 	/**
 	 * Assert the request URI string.
-	 *
 	 * @param expectedUri the expected URI
 	 * @return the request matcher
 	 */
@@ -96,7 +87,6 @@ public void match(ClientHttpRequest request) throws IOException, AssertionError
 
 	/**
 	 * Assert the {@link HttpMethod} of the request.
-	 *
 	 * @param method the HTTP method
 	 * @return the request matcher
 	 */
@@ -111,7 +101,6 @@ public void match(ClientHttpRequest request) throws AssertionError {
 
 	/**
 	 * Expect a request to the given URI.
-	 *
 	 * @param uri the expected URI
 	 * @return the request matcher
 	 */
@@ -156,8 +145,8 @@ public void match(ClientHttpRequest request) {
 	private static void assertHeaderValueCount(final String name, HttpHeaders headers, int expectedCount) {
 		List<String> actualValues = headers.get(name);
 		AssertionErrors.assertTrue("Expected header <" + name + ">", actualValues != null);
-		AssertionErrors.assertTrue("Expected header <" + name + "> to have at least <" + expectedCount
-				+ "> values but found " + actualValues, expectedCount <= actualValues.size());
+		AssertionErrors.assertTrue("Expected header <" + name + "> to have at least <" + expectedCount +
+				"> values but found " + actualValues, expectedCount <= actualValues.size());
 	}
 
 	/**
@@ -168,12 +157,11 @@ public static ContentRequestMatchers content() {
 	}
 
 	/**
-	 * Access to request body matchers using a <a
-	 * href="http://goessner.net/articles/JsonPath/">JSONPath</a> expression to
+	 * Access to request body matchers using a
+	 * <a href="http://goessner.net/articles/JsonPath/">JSONPath</a> expression to
 	 * inspect a specific subset of the body. The JSON path expression can be a
 	 * parameterized string using formatting specifiers as defined in
 	 * {@link String#format(String, Object...)}.
-	 *
 	 * @param expression the JSON path optionally parameterized with arguments
 	 * @param args arguments to parameterize the JSON path expression with
 	 */
@@ -182,11 +170,10 @@ public static JsonPathRequestMatchers jsonPath(String expression, Object ... arg
 	}
 
 	/**
-	 * Access to request body matchers using a <a
-	 * href="http://goessner.net/articles/JsonPath/">JSONPath</a> expression to
+	 * Access to request body matchers using a
+	 * <a href="http://goessner.net/articles/JsonPath/">JSONPath</a> expression to
 	 * inspect a specific subset of the body and a Hamcrest match for asserting
 	 * the value found at the JSON path.
-	 *
 	 * @param expression the JSON path expression
 	 * @param matcher a matcher for the value expected at the JSON path
 	 */
@@ -199,7 +186,6 @@ public static <T> RequestMatcher jsonPath(String expression, Matcher<T> matcher)
 	 * subset of the body. The XPath expression can be a parameterized string
 	 * using formatting specifiers as defined in
 	 * {@link String#format(String, Object...)}.
-	 *
 	 * @param expression the XPath optionally parameterized with arguments
 	 * @param args arguments to parameterize the XPath expression with
 	 */
@@ -212,7 +198,6 @@ public static XpathRequestMatchers xpath(String expression, Object... args) thro
 	 * subset of the body. The XPath expression can be a parameterized string
 	 * using formatting specifiers as defined in
 	 * {@link String#format(String, Object...)}.
-	 *
 	 * @param expression the XPath optionally parameterized with arguments
 	 * @param namespaces namespaces referenced in the XPath expression
 	 * @param args arguments to parameterize the XPath expression with
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
index 9c3ac04c41..ac5c66319a 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,15 +17,15 @@
 
 import java.io.IOException;
 import java.util.Map;
-
 import javax.xml.xpath.XPathExpressionException;
 
 import org.hamcrest.Matcher;
+import org.w3c.dom.Node;
+
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
 import org.springframework.test.util.XpathExpectationsHelper;
 import org.springframework.test.web.client.RequestMatcher;
-import org.w3c.dom.Node;
 
 /**
  * Factory methods for request content {@code RequestMatcher}'s using an XPath
@@ -44,12 +44,10 @@ public class XpathRequestMatchers {
 	 * Class constructor, not for direct instantiation. Use
 	 * {@link MockRestRequestMatchers#xpath(String, Object...)} or
 	 * {@link MockRestRequestMatchers#xpath(String, Map, Object...)}.
-	 *
 	 * @param expression the XPath expression
 	 * @param namespaces XML namespaces referenced in the XPath expression, or {@code null}
 	 * @param args arguments to parameterize the XPath expression with using the
 	 * formatting specifiers defined in {@link String#format(String, Object...)}
-	 *
 	 * @throws XPathExpressionException
 	 */
 	protected XpathRequestMatchers(String expression, Map<String, String> namespaces, Object ... args)
@@ -58,6 +56,7 @@ protected XpathRequestMatchers(String expression, Map<String, String> namespaces
 		this.xpathHelper = new XpathExpectationsHelper(expression, namespaces, args);
 	}
 
+
 	/**
 	 * Apply the XPath and assert it with the given {@code Matcher<Node>}.
 	 */
@@ -196,7 +195,6 @@ public final void match(ClientHttpRequest request) throws IOException, Assertion
 		}
 
 		protected abstract void matchInternal(MockClientHttpRequest request) throws Exception;
-
 	}
 
 }
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
index 7518f14f64..a1ac2d4ab7 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.client.response;
 
 import java.io.IOException;
@@ -38,36 +39,24 @@
  */
 public class DefaultResponseCreator implements ResponseCreator {
 
+	private HttpStatus statusCode;
+
 	private byte[] content;
 
 	private Resource contentResource;
 
 	private final HttpHeaders headers = new HttpHeaders();
 
-	private HttpStatus statusCode;
-
 
 	/**
 	 * Protected constructor.
 	 * Use static factory methods in {@link MockRestResponseCreators}.
 	 */
 	protected DefaultResponseCreator(HttpStatus statusCode) {
-		Assert.notNull(statusCode);
+		Assert.notNull(statusCode, "HttpStatus must not be null");
 		this.statusCode = statusCode;
 	}
 
-	public ClientHttpResponse createResponse(ClientHttpRequest request) throws IOException {
-		MockClientHttpResponse response;
-		if (this.contentResource != null ){
-			InputStream stream = this.contentResource.getInputStream();
-			response = new MockClientHttpResponse(stream, this.statusCode);
-		}
-		else {
-			response = new MockClientHttpResponse(this.content, this.statusCode);
-		}
-		response.getHeaders().putAll(this.headers);
-		return response;
-	}
 
 	/**
 	 * Set the body as a UTF-8 String.
@@ -76,9 +65,9 @@ public DefaultResponseCreator body(String content) {
 		try {
 			this.content = content.getBytes("UTF-8");
 		}
-		catch (UnsupportedEncodingException e) {
+		catch (UnsupportedEncodingException ex) {
 			// should not happen, UTF-8 is always supported
-			throw new IllegalStateException(e);
+			throw new IllegalStateException(ex);
 		}
 		return this;
 	}
@@ -129,4 +118,18 @@ public DefaultResponseCreator headers(HttpHeaders headers) {
 		return this;
 	}
 
+
+	public ClientHttpResponse createResponse(ClientHttpRequest request) throws IOException {
+		MockClientHttpResponse response;
+		if (this.contentResource != null) {
+			InputStream stream = this.contentResource.getInputStream();
+			response = new MockClientHttpResponse(stream, this.statusCode);
+		}
+		else {
+			response = new MockClientHttpResponse(this.content, this.statusCode);
+		}
+		response.getHeaders().putAll(this.headers);
+		return response;
+	}
+
 }
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
index 243309b3c9..0ff14df9a1 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,10 +33,6 @@
  */
 public abstract class MockRestResponseCreators {
 
-
-	private MockRestResponseCreators() {
-	}
-
 	/**
 	 * {@code ResponseCreator} for a 200 response (OK).
 	 */
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
index 117a95c2bf..7c24d6fb06 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package org.springframework.test.web.servlet;
 
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.util.Assert;
 import org.springframework.web.servlet.FlashMap;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
@@ -36,6 +36,9 @@
  */
 class DefaultMvcResult implements MvcResult {
 
+	private static final Object RESULT_NONE = new Object();
+
+
 	private final MockHttpServletRequest mockRequest;
 
 	private final MockHttpServletResponse mockResponse;
@@ -48,9 +51,7 @@ class DefaultMvcResult implements MvcResult {
 
 	private Exception resolvedException;
 
-	private Object asyncResult;
-
-	private CountDownLatch asyncResultLatch;
+	private final AtomicReference<Object> asyncResult = new AtomicReference<Object>(RESULT_NONE);
 
 
 	/**
@@ -106,42 +107,39 @@ public FlashMap getFlashMap() {
 	}
 
 	public void setAsyncResult(Object asyncResult) {
-		this.asyncResult = asyncResult;
+		this.asyncResult.set(asyncResult);
 	}
 
 	public Object getAsyncResult() {
 		return getAsyncResult(-1);
 	}
 
-	public Object getAsyncResult(long timeout) {
+	public Object getAsyncResult(long timeToWait) {
+
 		// MockHttpServletRequest type doesn't have async methods
 		HttpServletRequest request = this.mockRequest;
-		if ((timeout != 0) && request.isAsyncStarted()) {
-			if (timeout == -1) {
-				timeout = request.getAsyncContext().getTimeout();
-			}
-			if (!awaitAsyncResult(timeout)) {
-				throw new IllegalStateException(
-						"Gave up waiting on async result from handler [" + this.handler + "] to complete");
-			}
+		if (request.getAsyncContext() != null) {
+			timeToWait = (timeToWait == -1 ? request.getAsyncContext().getTimeout() : timeToWait);
 		}
-		return this.asyncResult;
-	}
 
-	private boolean awaitAsyncResult(long timeout) {
-		if (this.asyncResultLatch != null) {
-			try {
-				return this.asyncResultLatch.await(timeout, TimeUnit.MILLISECONDS);
-			}
-			catch (InterruptedException e) {
-				return false;
+		if (timeToWait > 0) {
+			long endTime = System.currentTimeMillis() + timeToWait;
+			while (System.currentTimeMillis() < endTime && this.asyncResult.get() == RESULT_NONE) {
+				try {
+					Thread.sleep(200);
+				}
+				catch (InterruptedException ex) {
+					throw new IllegalStateException("Interrupted while waiting for " +
+							"async result to be set for handler [" + this.handler + "]", ex);
+				}
 			}
 		}
-		return true;
-	}
 
-	public void setAsyncResultLatch(CountDownLatch asyncResultLatch) {
-		this.asyncResultLatch = asyncResultLatch;
+		Assert.state(this.asyncResult.get() != RESULT_NONE,
+				"Async result for handler [" + this.handler + "] " +
+						"was not set during the specified timeToWait=" + timeToWait);
+
+		return this.asyncResult.get();
 	}
 
 }
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
index b18fc3554f..a5e15a60e0 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.servlet.Filter;
 import javax.servlet.ServletContext;
 
 import org.springframework.beans.Mergeable;
@@ -54,7 +55,9 @@ public final class MockMvc {
 
 	static String MVC_RESULT_ATTRIBUTE = MockMvc.class.getName().concat(".MVC_RESULT_ATTRIBUTE");
 
-	private final MockFilterChain filterChain;
+	private final TestDispatcherServlet servlet;
+
+	private final Filter[] filters;
 
 	private final ServletContext servletContext;
 
@@ -69,11 +72,15 @@ public final class MockMvc {
 	 * Private constructor, not for direct instantiation.
 	 * @see org.springframework.test.web.servlet.setup.MockMvcBuilders
 	 */
-	MockMvc(MockFilterChain filterChain, ServletContext servletContext) {
+	MockMvc(TestDispatcherServlet servlet, Filter[] filters, ServletContext servletContext) {
+
+		Assert.notNull(servlet, "DispatcherServlet is required");
+		Assert.notNull(filters, "filters cannot be null");
+		Assert.noNullElements(filters, "filters cannot contain null values");
 		Assert.notNull(servletContext, "A ServletContext is required");
-		Assert.notNull(filterChain, "A MockFilterChain is required");
 
-		this.filterChain = filterChain;
+		this.servlet = servlet;
+		this.filters = filters;
 		this.servletContext = servletContext;
 	}
 
@@ -130,8 +137,8 @@ public ResultActions perform(RequestBuilder requestBuilder) throws Exception {
 		final MvcResult mvcResult = new DefaultMvcResult(request, response);
 		request.setAttribute(MVC_RESULT_ATTRIBUTE, mvcResult);
 
-		this.filterChain.reset();
-		this.filterChain.doFilter(request, response);
+		MockFilterChain filterChain = new MockFilterChain(this.servlet, this.filters);
+		filterChain.doFilter(request, response);
 
 		applyDefaultResultActions(mvcResult);
 
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
index d2e1054a63..925c6b0e9e 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
@@ -23,7 +23,6 @@
 import javax.servlet.ServletException;
 
 import org.springframework.core.NestedRuntimeException;
-import org.springframework.mock.web.MockFilterChain;
 import org.springframework.mock.web.MockServletConfig;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -57,9 +56,7 @@ protected final MockMvc createMockMvc(Filter[] filters, MockServletConfig servle
 			throw new MockMvcBuildException("Failed to initialize TestDispatcherServlet", ex);
 		}
 
-		MockFilterChain filterChain = new MockFilterChain(dispatcherServlet, filters);
-
-		MockMvc mockMvc = new MockMvc(filterChain, servletContext);
+		MockMvc mockMvc = new MockMvc(dispatcherServlet, filters, servletContext);
 		mockMvc.setDefaultRequest(defaultRequestBuilder);
 		mockMvc.setGlobalResultMatchers(globalResultMatchers);
 		mockMvc.setGlobalResultHandlers(globalResultHandlers);
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java
index f886e7bc1f..3d0cd8357d 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License; Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,24 +76,22 @@ public interface MvcResult {
 	FlashMap getFlashMap();
 
 	/**
-	 * Get the result of asynchronous execution or {@code null} if concurrent
-	 * handling did not start. This method will hold and await the completion
-	 * of concurrent handling.
+	 * Get the result of async execution. This method will wait for the async result
+	 * to be set for up to the amount of time configured on the async request,
 	 *
-	 * @throws IllegalStateException if concurrent handling does not complete
-	 * within the allocated async timeout value.
+	 * @throws IllegalStateException if the async result was not set.
 	 */
 	Object getAsyncResult();
 
 	/**
-	 * Get the result of asynchronous execution or {@code null} if concurrent
-	 * handling did not start. This method will wait for up to the given timeout
-	 * for the completion of concurrent handling.
+	 * Get the result of async execution. This method will wait for the async result
+	 * to be set for up to the specified amount of time.
 	 *
-	 * @param timeout how long to wait for the async result to be set in
-	 * milliseconds; if -1, the wait will be as long as the async timeout set
-	 * on the Servlet request
+	 * @param timeToWait how long to wait for the async result to be set, in
+	 * 	milliseconds; if -1, then the async request timeout value is used,
+	 *
+	 * @throws IllegalStateException if the async result was not set.
 	 */
-	Object getAsyncResult(long timeout);
+	Object getAsyncResult(long timeToWait);
 
 }
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
index 8c57fae247..cf2b6fbd5e 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,34 +58,25 @@ public TestDispatcherServlet(WebApplicationContext webApplicationContext) {
 	}
 
 	@Override
-	protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-		CountDownLatch latch = registerAsyncInterceptors(request);
-		getMvcResult(request).setAsyncResultLatch(latch);
+	protected void service(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
 
+		registerAsyncInterceptors(request);
 		super.service(request, response);
 	}
 
-	private CountDownLatch registerAsyncInterceptors(final HttpServletRequest servletRequest) {
-
-		final CountDownLatch asyncResultLatch = new CountDownLatch(1);
-
+	private void registerAsyncInterceptors(final HttpServletRequest servletRequest) {
 		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(servletRequest);
-
 		asyncManager.registerCallableInterceptor(KEY, new CallableProcessingInterceptorAdapter() {
 			public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object value) throws Exception {
 				getMvcResult(servletRequest).setAsyncResult(value);
-				asyncResultLatch.countDown();
 			}
 		});
 		asyncManager.registerDeferredResultInterceptor(KEY, new DeferredResultProcessingInterceptorAdapter() {
 			public <T> void postProcess(NativeWebRequest request, DeferredResult<T> result, Object value) throws Exception {
 				getMvcResult(servletRequest).setAsyncResult(value);
-				asyncResultLatch.countDown();
 			}
 		});
-
-		return asyncResultLatch;
 	}
 
 	protected DefaultMvcResult getMvcResult(ServletRequest request) {
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
index dbd9ac1d88..fb1e3db6a6 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,16 +69,17 @@
  *
  * @author Rossen Stoyanchev
  * @author Arjen Poutsma
-  * @since 3.2
-*/
+ * @since 3.2
+ */
 public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable {
 
 	static final boolean servlet3Present = ClassUtils.hasMethod(ServletRequest.class, "startAsync");
 
-	private final UriComponents uriComponents;
 
 	private final HttpMethod method;
 
+	private final UriComponents uriComponents;
+
 	private final MultiValueMap<String, Object> headers = new LinkedMultiValueMap<String, Object>();
 
 	private String contentType;
@@ -93,10 +94,10 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable
 
 	private String characterEncoding;
 
-	private Principal principal;
-
 	private Boolean secure;
 
+	private Principal principal;
+
 	private final Map<String, Object> attributes = new LinkedHashMap<String, Object>();
 
 	private MockHttpSession session;
@@ -111,34 +112,28 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable
 
 	private String pathInfo = ValueConstants.DEFAULT_NONE;
 
-	private final List<RequestPostProcessor> postProcessors =
-			new ArrayList<RequestPostProcessor>();
+	private final List<RequestPostProcessor> postProcessors = new ArrayList<RequestPostProcessor>();
 
 
 	/**
 	 * Package private constructor. To get an instance, use static factory
 	 * methods in {@link MockMvcRequestBuilders}.
-	 *
 	 * <p>Although this class cannot be extended, additional ways to initialize
 	 * the {@code MockHttpServletRequest} can be plugged in via
 	 * {@link #with(RequestPostProcessor)}.
-	 *
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
 	 * @param urlVariables zero or more URL variables
 	 */
 	MockHttpServletRequestBuilder(HttpMethod httpMethod, String urlTemplate, Object... urlVariables) {
-
-		Assert.notNull(urlTemplate, "uriTemplate is required");
 		Assert.notNull(httpMethod, "httpMethod is required");
-
-		this.uriComponents = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(urlVariables).encode();
+		Assert.notNull(urlTemplate, "uriTemplate is required");
 		this.method = httpMethod;
+		this.uriComponents = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(urlVariables).encode();
 	}
 
 	/**
 	 * Add a request parameter to the {@link MockHttpServletRequest}.
 	 * If called more than once, the new values are added.
-	 *
 	 * @param name the parameter name
 	 * @param values one or more values
 	 */
@@ -149,7 +144,6 @@ public MockHttpServletRequestBuilder param(String name, String... values) {
 
 	/**
 	 * Add a header to the request. Values are always added.
-	 *
 	 * @param name the header name
 	 * @param values one or more header values
 	 */
@@ -160,7 +154,6 @@ public MockHttpServletRequestBuilder header(String name, Object... values) {
 
 	/**
 	 * Add all headers to the request. Values are always added.
-	 *
 	 * @param httpHeaders the headers and values to add
 	 */
 	public MockHttpServletRequestBuilder headers(HttpHeaders httpHeaders) {
@@ -173,7 +166,6 @@ public MockHttpServletRequestBuilder headers(HttpHeaders httpHeaders) {
 
 	/**
 	 * Set the 'Content-Type' header of the request.
-	 *
 	 * @param mediaType the content type
 	 */
 	public MockHttpServletRequestBuilder contentType(MediaType mediaType) {
@@ -185,7 +177,6 @@ public MockHttpServletRequestBuilder contentType(MediaType mediaType) {
 
 	/**
 	 * Set the 'Accept' header to the given media type(s).
-	 *
 	 * @param mediaTypes one or more media types
 	 */
 	public MockHttpServletRequestBuilder accept(MediaType... mediaTypes) {
@@ -196,7 +187,6 @@ public MockHttpServletRequestBuilder accept(MediaType... mediaTypes) {
 
 	/**
 	 * Set the request body.
-	 *
 	 * @param content the body content
 	 */
 	public MockHttpServletRequestBuilder content(byte[] content) {
@@ -206,7 +196,6 @@ public MockHttpServletRequestBuilder content(byte[] content) {
 
 	/**
 	 * Set the request body as a UTF-8 String.
-	 *
 	 * @param content the body content
 	 */
 	public MockHttpServletRequestBuilder content(String content) {
@@ -221,7 +210,6 @@ public MockHttpServletRequestBuilder content(String content) {
 
 	/**
 	 * Add the given cookies to the request. Cookies are always added.
-	 *
 	 * @param cookies the cookies to add
 	 */
 	public MockHttpServletRequestBuilder cookie(Cookie... cookies) {
@@ -233,7 +221,6 @@ public MockHttpServletRequestBuilder cookie(Cookie... cookies) {
 
 	/**
 	 * Set the locale of the request.
-	 *
 	 * @param locale the locale
 	 */
 	public MockHttpServletRequestBuilder locale(Locale locale) {
@@ -243,7 +230,6 @@ public MockHttpServletRequestBuilder locale(Locale locale) {
 
 	/**
 	 * Set the character encoding of the request.
-	 *
 	 * @param encoding the character encoding
 	 */
 	public MockHttpServletRequestBuilder characterEncoding(String encoding) {
@@ -253,7 +239,6 @@ public MockHttpServletRequestBuilder characterEncoding(String encoding) {
 
 	/**
 	 * Set a request attribute.
-	 *
 	 * @param name the attribute name
 	 * @param value the attribute value
 	 */
@@ -264,7 +249,6 @@ public MockHttpServletRequestBuilder requestAttr(String name, Object value) {
 
 	/**
 	 * Set a session attribute.
-	 *
 	 * @param name the session attribute name
 	 * @param value the session attribute value
 	 */
@@ -275,7 +259,6 @@ public MockHttpServletRequestBuilder sessionAttr(String name, Object value) {
 
 	/**
 	 * Set session attributes.
-	 *
 	 * @param sessionAttributes the session attributes
 	 */
 	public MockHttpServletRequestBuilder sessionAttrs(Map<String, Object> sessionAttributes) {
@@ -288,7 +271,6 @@ public MockHttpServletRequestBuilder sessionAttrs(Map<String, Object> sessionAtt
 
 	/**
 	 * Set an "input" flash attribute.
-	 *
 	 * @param name the flash attribute name
 	 * @param value the flash attribute value
 	 */
@@ -299,7 +281,6 @@ public MockHttpServletRequestBuilder flashAttr(String name, Object value) {
 
 	/**
 	 * Set flash attributes.
-	 *
 	 * @param flashAttributes the flash attributes
 	 */
 	public MockHttpServletRequestBuilder flashAttrs(Map<String, Object> flashAttributes) {
@@ -312,10 +293,8 @@ public MockHttpServletRequestBuilder flashAttrs(Map<String, Object> flashAttribu
 
 	/**
 	 * Set the HTTP session to use, possibly re-used across requests.
-	 *
 	 * <p>Individual attributes provided via {@link #sessionAttr(String, Object)}
 	 * override the content of the session provided here.
-	 *
 	 * @param session the HTTP session
 	 */
 	public MockHttpServletRequestBuilder session(MockHttpSession session) {
@@ -326,7 +305,6 @@ public MockHttpServletRequestBuilder session(MockHttpSession session) {
 
 	/**
 	 * Set the principal of the request.
-	 *
 	 * @param principal the principal
 	 */
 	public MockHttpServletRequestBuilder principal(Principal principal) {
@@ -337,16 +315,12 @@ public MockHttpServletRequestBuilder principal(Principal principal) {
 
 	/**
 	 * Specify the portion of the requestURI that represents the context path.
-	 * The context path, if specified, must match to the start of the request
-	 * URI.
-	 *
+	 * The context path, if specified, must match to the start of the request URI.
 	 * <p>In most cases, tests can be written by omitting the context path from
 	 * the requestURI. This is because most applications don't actually depend
 	 * on the name under which they're deployed. If specified here, the context
 	 * path must start with a "/" and must not end with a "/".
-	 *
-	 * @see <a
-	 * href="http://docs.oracle.com/javaee/6/api/javax/servlet/http/HttpServletRequest.html#getContextPath%28%29">HttpServletRequest.getContextPath()</a>
+	 * @see <a href="http://docs.oracle.com/javaee/6/api/javax/servlet/http/HttpServletRequest.html#getContextPath%28%29">HttpServletRequest.getContextPath()</a>
 	 */
 	public MockHttpServletRequestBuilder contextPath(String contextPath) {
 		if (StringUtils.hasText(contextPath)) {
@@ -361,7 +335,6 @@ public MockHttpServletRequestBuilder contextPath(String contextPath) {
 	 * Specify the portion of the requestURI that represents the path to which
 	 * the Servlet is mapped. This is typically a portion of the requestURI
 	 * after the context path.
-	 *
 	 * <p>In most cases, tests can be written by omitting the servlet path from
 	 * the requestURI. This is because most applications don't actually depend
 	 * on the prefix to which a servlet is mapped. For example if a Servlet is
@@ -369,9 +342,7 @@ public MockHttpServletRequestBuilder contextPath(String contextPath) {
 	 * {@code "/accounts/1"} as opposed to {@code "/main/accounts/1"}.
 	 * If specified here, the servletPath must start with a "/" and must not
 	 * end with a "/".
-	 *
-	 * @see <a
-	 * href="http://docs.oracle.com/javaee/6/api/javax/servlet/http/HttpServletRequest.html#getServletPath%28%29">HttpServletRequest.getServletPath()</a>
+	 * @see <a href="http://docs.oracle.com/javaee/6/api/javax/servlet/http/HttpServletRequest.html#getServletPath%28%29">HttpServletRequest.getServletPath()</a>
 	 */
 	public MockHttpServletRequestBuilder servletPath(String servletPath) {
 		if (StringUtils.hasText(servletPath)) {
@@ -384,16 +355,12 @@ public MockHttpServletRequestBuilder servletPath(String servletPath) {
 
 	/**
 	 * Specify the portion of the requestURI that represents the pathInfo.
-	 *
 	 * <p>If left unspecified (recommended), the pathInfo will be automatically
 	 * derived by removing the contextPath and the servletPath from the
 	 * requestURI and using any remaining part. If specified here, the pathInfo
 	 * must start with a "/".
-	 *
 	 * <p>If specified, the pathInfo will be used as is.
-	 *
-	 * @see <a
-	 * href="http://docs.oracle.com/javaee/6/api/javax/servlet/http/HttpServletRequest.html#getPathInfo%28%29">HttpServletRequest.getServletPath()</a>
+	 * @see <a href="http://docs.oracle.com/javaee/6/api/javax/servlet/http/HttpServletRequest.html#getPathInfo%28%29">HttpServletRequest.getServletPath()</a>
 	 */
 	public MockHttpServletRequestBuilder pathInfo(String pathInfo) {
 		if (StringUtils.hasText(pathInfo)) {
@@ -406,7 +373,6 @@ public MockHttpServletRequestBuilder pathInfo(String pathInfo) {
 	/**
 	 * Set the secure property of the {@link ServletRequest} indicating use of a
 	 * secure channel, such as HTTPS.
-	 *
 	 * @param secure whether the request is using a secure channel
 	 */
 	public MockHttpServletRequestBuilder secure(boolean secure){
@@ -419,7 +385,6 @@ public MockHttpServletRequestBuilder secure(boolean secure){
 	 * in ways not built directly into the {@code MockHttpServletRequestBuilder}.
 	 * Implementation of this interface can have builder-style methods themselves
 	 * and be made accessible through static factory methods.
-	 *
 	 * @param postProcessor a post-processor to add
 	 */
 	public MockHttpServletRequestBuilder with(RequestPostProcessor postProcessor) {
@@ -439,7 +404,6 @@ public boolean isMergeEnabled() {
 	/**
 	 * Merges the properties of the "parent" RequestBuilder accepting values
 	 * only if not already set in "this" instance.
-	 *
 	 * @param parent the parent {@code RequestBuilder} to inherit properties from
 	 * @return the result of the merge
 	 */
@@ -450,7 +414,6 @@ public Object merge(Object parent) {
 		if (!(parent instanceof MockHttpServletRequestBuilder)) {
 			throw new IllegalArgumentException("Cannot merge with [" + parent.getClass().getName() + "]");
 		}
-
 		MockHttpServletRequestBuilder parentBuilder = (MockHttpServletRequestBuilder) parent;
 
 		for (String headerName : parentBuilder.headers.keySet()) {
@@ -462,7 +425,6 @@ public Object merge(Object parent) {
 		if (this.contentType == null) {
 			this.contentType = parentBuilder.contentType;
 		}
-
 		if (this.content == null) {
 			this.content = parentBuilder.content;
 		}
@@ -472,7 +434,6 @@ public Object merge(Object parent) {
 				this.parameters.put(paramName, parentBuilder.parameters.get(paramName));
 			}
 		}
-
 		for (Cookie cookie : parentBuilder.cookies) {
 			if (!containsCookie(cookie)) {
 				this.cookies.add(cookie);
@@ -482,18 +443,16 @@ public Object merge(Object parent) {
 		if (this.locale == null) {
 			this.locale = parentBuilder.locale;
 		}
-
 		if (this.characterEncoding == null) {
 			this.characterEncoding = parentBuilder.characterEncoding;
 		}
 
-		if (this.principal == null) {
-			this.principal = parentBuilder.principal;
-		}
-
 		if (this.secure == null) {
 			this.secure = parentBuilder.secure;
 		}
+		if (this.principal == null) {
+			this.principal = parentBuilder.principal;
+		}
 
 		for (String attributeName : parentBuilder.attributes.keySet()) {
 			if (!this.attributes.containsKey(attributeName)) {
@@ -535,8 +494,8 @@ public Object merge(Object parent) {
 	}
 
 	private boolean containsCookie(Cookie cookie) {
-		for (Cookie c : this.cookies) {
-			if (ObjectUtils.nullSafeEquals(c.getName(), cookie.getName())) {
+		for (Cookie cookieToCheck : this.cookies) {
+			if (ObjectUtils.nullSafeEquals(cookieToCheck.getName(), cookie.getName())) {
 				return true;
 			}
 		}
@@ -547,12 +506,10 @@ private boolean containsCookie(Cookie cookie) {
 	 * Build a {@link MockHttpServletRequest}.
 	 */
 	public final MockHttpServletRequest buildRequest(ServletContext servletContext) {
-
 		MockHttpServletRequest request = createServletRequest(servletContext);
 
 		String requestUri = this.uriComponents.getPath();
 		request.setRequestURI(requestUri);
-
 		updatePathRequestProperties(request, requestUri);
 
 		if (this.uriComponents.getScheme() != null) {
@@ -566,7 +523,6 @@ public final MockHttpServletRequest buildRequest(ServletContext servletContext)
 		}
 
 		request.setMethod(this.method.name());
-
 		for (String name : this.headers.keySet()) {
 			for (Object value : this.headers.get(name)) {
 				request.addHeader(name, value);
@@ -581,9 +537,8 @@ public final MockHttpServletRequest buildRequest(ServletContext servletContext)
 
 			for (Entry<String, List<String>> entry : this.uriComponents.getQueryParams().entrySet()) {
 				for (String value : entry.getValue()) {
-					request.addParameter(
-							UriUtils.decode(entry.getKey(), "UTF-8"),
-							UriUtils.decode(value, "UTF-8"));
+					value = (value != null) ? UriUtils.decode(value, "UTF-8") : null;
+					request.addParameter(UriUtils.decode(entry.getKey(), "UTF-8"), value);
 				}
 			}
 		}
@@ -599,31 +554,26 @@ public final MockHttpServletRequest buildRequest(ServletContext servletContext)
 
 		request.setContentType(this.contentType);
 		request.setContent(this.content);
-
 		request.setCookies(this.cookies.toArray(new Cookie[this.cookies.size()]));
 
 		if (this.locale != null) {
 			request.addPreferredLocale(this.locale);
 		}
-
 		request.setCharacterEncoding(this.characterEncoding);
 
-		request.setUserPrincipal(this.principal);
-
 		if (this.secure != null) {
 			request.setSecure(this.secure);
 		}
+		request.setUserPrincipal(this.principal);
 
 		for (String name : this.attributes.keySet()) {
 			request.setAttribute(name, this.attributes.get(name));
 		}
 
 		// Set session before session and flash attributes
-
 		if (this.session != null) {
 			request.setSession(this.session);
 		}
-
 		for (String name : this.sessionAttributes.keySet()) {
 			request.getSession().setAttribute(name, this.sessionAttributes.get(name));
 		}
@@ -635,21 +585,22 @@ public final MockHttpServletRequest buildRequest(ServletContext servletContext)
 		flashMapManager.saveOutputFlashMap(flashMap, request, new MockHttpServletResponse());
 
 		// Apply post-processors at the very end
-
 		for (RequestPostProcessor postProcessor : this.postProcessors) {
 			request = postProcessor.postProcessRequest(request);
-			Assert.notNull(request, "Post-processor [" + postProcessor.getClass().getName() + "] returned null");
+			if (request == null) {
+				throw new IllegalStateException("Post-processor [" + postProcessor.getClass().getName() + "] returned null");
+			}
 		}
 
 		return request;
 	}
 
 	/**
-	 * Creates a new {@link MockHttpServletRequest} based on the given
-	 * {@link ServletContext}. Can be overridden in sub-classes.
+	 * Create a new {@link MockHttpServletRequest} based on the given
+	 * {@link ServletContext}. Can be overridden in subclasses.
 	 */
 	protected MockHttpServletRequest createServletRequest(ServletContext servletContext) {
-		return servlet3Present ? createServlet3Request(servletContext) : new MockHttpServletRequest(servletContext);
+		return (servlet3Present ? createServlet3Request(servletContext) : new MockHttpServletRequest(servletContext));
 	}
 
 	private MockHttpServletRequest createServlet3Request(ServletContext servletContext) {
@@ -659,8 +610,8 @@ private MockHttpServletRequest createServlet3Request(ServletContext servletConte
 			Constructor<?> constructor = clazz.getConstructor(ServletContext.class);
 			return (MockHttpServletRequest) BeanUtils.instantiateClass(constructor, servletContext);
 		}
-		catch (Throwable t) {
-			throw new IllegalStateException("Failed to instantiate MockHttpServletRequest", t);
+		catch (Throwable ex) {
+			throw new IllegalStateException("Failed to instantiate MockHttpServletRequest", ex);
 		}
 	}
 
@@ -668,22 +619,16 @@ private MockHttpServletRequest createServlet3Request(ServletContext servletConte
 	 * Update the contextPath, servletPath, and pathInfo of the request.
 	 */
 	private void updatePathRequestProperties(MockHttpServletRequest request, String requestUri) {
-
 		Assert.isTrue(requestUri.startsWith(this.contextPath),
 				"requestURI [" + requestUri + "] does not start with contextPath [" + this.contextPath + "]");
-
 		request.setContextPath(this.contextPath);
 		request.setServletPath(this.servletPath);
-
 		if (ValueConstants.DEFAULT_NONE.equals(this.pathInfo)) {
-
 			Assert.isTrue(requestUri.startsWith(this.contextPath + this.servletPath),
 					"Invalid servletPath [" + this.servletPath + "] for requestURI [" + requestUri + "]");
-
 			String extraPath = requestUri.substring(this.contextPath.length() + this.servletPath.length());
 			this.pathInfo = (StringUtils.hasText(extraPath)) ? extraPath : null;
 		}
-
 		request.setPathInfo(this.pathInfo);
 	}
 
@@ -695,10 +640,12 @@ private FlashMapManager getFlashMapManager(MockHttpServletRequest request) {
 			flashMapManager = wac.getBean(DispatcherServlet.FLASH_MAP_MANAGER_BEAN_NAME, FlashMapManager.class);
 		}
 		catch (IllegalStateException ex) {
+			// ignore
 		}
 		catch (NoSuchBeanDefinitionException ex) {
+			// ignore
 		}
-		return (flashMapManager != null) ? flashMapManager : new SessionFlashMapManager();
+		return (flashMapManager != null ? flashMapManager : new SessionFlashMapManager());
 	}
 
 	private static <T> void addToMultiValueMap(MultiValueMap<String, T> map, String name, T[] values) {
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
index 78ff9d2d56..5b4450ab4e 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,13 +43,11 @@ public class MockMultipartHttpServletRequestBuilder extends MockHttpServletReque
 
 
 	/**
-	 * Package private constructor. Use static factory methods in
+	 * Package-private constructor. Use static factory methods in
 	 * {@link MockMvcRequestBuilders}.
-	 *
 	 * <p>For other ways to initialize a {@code MockMultipartHttpServletRequest},
 	 * see {@link #with(RequestPostProcessor)} and the
 	 * {@link RequestPostProcessor} extension point.
-	 *
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
 	 * @param urlVariables zero or more URL variables
 	 */
@@ -58,9 +56,9 @@ public class MockMultipartHttpServletRequestBuilder extends MockHttpServletReque
 		super.contentType(MediaType.MULTIPART_FORM_DATA);
 	}
 
+
 	/**
 	 * Create a new MockMultipartFile with the given content.
-	 *
 	 * @param name the name of the file
 	 * @param content the content of the file
 	 */
@@ -71,7 +69,6 @@ public MockMultipartHttpServletRequestBuilder file(String name, byte[] content)
 
 	/**
 	 * Add the given MockMultipartFile.
-	 *
 	 * @param file the multipart file
 	 */
 	public MockMultipartHttpServletRequestBuilder file(MockMultipartFile file) {
@@ -99,8 +96,8 @@ public Object merge(Object parent) {
 
 	@Override
 	protected final MockHttpServletRequest createServletRequest(ServletContext servletContext) {
-		MockMultipartHttpServletRequest request = servlet3Present ?
-				createServlet3Request() : new MockMultipartHttpServletRequest();
+		MockMultipartHttpServletRequest request =
+				(servlet3Present ? createServlet3Request() : new MockMultipartHttpServletRequest());
 		for (MockMultipartFile file : this.files) {
 			request.addFile(file);
 		}
@@ -114,8 +111,8 @@ private MockMultipartHttpServletRequest createServlet3Request() {
 			Constructor<?> constructor = clazz.getDeclaredConstructor();
 			return (MockMultipartHttpServletRequest) BeanUtils.instantiateClass(constructor);
 		}
-		catch (Throwable t) {
-			throw new IllegalStateException("Failed to instantiate MockHttpServletRequest", t);
+		catch (Throwable ex) {
+			throw new IllegalStateException("Failed to instantiate MockMultipartHttpServletRequest", ex);
 		}
 	}
 
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
index bb0c109a09..7b51604f3a 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
@@ -28,21 +28,18 @@
 /**
  * Static factory methods for {@link RequestBuilder}s.
  *
- * <p><strong>Eclipse users:</strong> consider adding this class as a Java
+ * <p><strong>Eclipse users:</strong> Consider adding this class as a Java
  * editor favorite. To navigate, open the Preferences and type "favorites".
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
+ * @author Greg Turnquist
  * @since 3.2
  */
 public abstract class MockMvcRequestBuilders {
 
-	private MockMvcRequestBuilders() {
-	}
-
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for a GET request.
-	 *
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
 	 * @param urlVariables zero or more URL variables
 	 */
@@ -52,7 +49,6 @@ public static MockHttpServletRequestBuilder get(String urlTemplate, Object... ur
 
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for a POST request.
-	 *
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
 	 * @param urlVariables zero or more URL variables
 	 */
@@ -62,7 +58,6 @@ public static MockHttpServletRequestBuilder post(String urlTemplate, Object... u
 
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for a PUT request.
-	 *
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
 	 * @param urlVariables zero or more URL variables
 	 */
@@ -70,9 +65,17 @@ public static MockHttpServletRequestBuilder put(String urlTemplate, Object... ur
 		return new MockHttpServletRequestBuilder(HttpMethod.PUT, urlTemplate, urlVariables);
 	}
 
+	/**
+	 * Create a {@link MockHttpServletRequestBuilder} for a PATCH request.
+	 * @param urlTemplate a URL template; the resulting URL will be encoded
+	 * @param urlVariables zero or more URL variables
+	 */
+	public static MockHttpServletRequestBuilder patch(String urlTemplate, Object... urlVariables) {
+		return new MockHttpServletRequestBuilder(HttpMethod.PATCH, urlTemplate, urlVariables);
+	}
+
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for a DELETE request.
-	 *
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
 	 * @param urlVariables zero or more URL variables
 	 */
@@ -82,7 +85,6 @@ public static MockHttpServletRequestBuilder delete(String urlTemplate, Object...
 
 	/**
      * Create a {@link MockHttpServletRequestBuilder} for an OPTIONS request.
-     *
      * @param urlTemplate a URL template; the resulting URL will be encoded
      * @param urlVariables zero or more URL variables
      */
@@ -93,7 +95,6 @@ public static MockHttpServletRequestBuilder options(String urlTemplate, Object..
 
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for a request with the given HTTP method.
-	 *
 	 * @param httpMethod the HTTP method
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
 	 * @param urlVariables zero or more URL variables
@@ -104,7 +105,6 @@ public static MockHttpServletRequestBuilder request(HttpMethod httpMethod, Strin
 
 	/**
 	 * Create a {@link MockHttpServletRequestBuilder} for a multipart request.
-	 *
 	 * @param urlTemplate a URL template; the resulting URL will be encoded
 	 * @param urlVariables zero or more URL variables
 	 */
@@ -115,22 +115,19 @@ public static MockMultipartHttpServletRequestBuilder fileUpload(String urlTempla
 	/**
 	 * Create a {@link RequestBuilder} for an async dispatch from the
 	 * {@link MvcResult} of the request that started async processing.
-	 *
 	 * <p>Usage involves performing one request first that starts async processing:
-	 * <pre>
+	 * <pre class="code">
 	 * MvcResult mvcResult = this.mockMvc.perform(get("/1"))
 	 *	.andExpect(request().asyncStarted())
 	 *	.andReturn();
 	 *  </pre>
-	 *
 	 * <p>And then performing the async dispatch re-using the {@code MvcResult}:
-	 * <pre>
+	 * <pre class="code">
 	 * this.mockMvc.perform(asyncDispatch(mvcResult))
 	 * 	.andExpect(status().isOk())
 	 * 	.andExpect(content().contentType(MediaType.APPLICATION_JSON))
 	 * 	.andExpect(content().string("{\"name\":\"Joe\",\"someDouble\":0.0,\"someBoolean\":false}"));
 	 * </pre>
-	 *
 	 * @param mvcResult the result from the request that started async processing
 	 */
 	public static RequestBuilder asyncDispatch(final MvcResult mvcResult) {
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java
index cb2322e636..f531fc07f4 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.servlet.request;
 
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -20,12 +21,12 @@
 /**
  * Extension point for applications or 3rd party libraries that wish to further
  * initialize a {@link MockHttpServletRequest} instance after it has been built
- * by {@link MockHttpServletRequestBuilder} or its sub-class
+ * by {@link MockHttpServletRequestBuilder} or its subclass
  * {@link MockMultipartHttpServletRequestBuilder}.
  *
  * <p>Implementations of this interface can be provided to
  * {@link MockHttpServletRequestBuilder#with(RequestPostProcessor)} at the time
- * when a request is about to be performed.
+ * when a request is about to be constructed.
  *
  * @author Rossen Stoyanchev
  * @author Rob Winch
@@ -36,9 +37,8 @@ public interface RequestPostProcessor {
 	/**
 	 * Post-process the given {@code MockHttpServletRequest} after its creation
 	 * and initialization through a {@code MockHttpServletRequestBuilder}.
-	 *
 	 * @param request the request to initialize
-	 * @return the request to use, either the one passed in or a wrapped one;
+	 * @return the request to use, either the one passed in or a wrapped one
 	 */
 	MockHttpServletRequest postProcessRequest(MockHttpServletRequest request);
 
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
index 6ec1d9346b..6dce33e764 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,6 +84,21 @@ public void match(MvcResult result) throws Exception {
 		};
 	}
 
+    /**
+     * Assert the given model attributes do not exist
+     */
+    public ResultMatcher attributeDoesNotExist(final String... names) {
+        return new ResultMatcher() {
+            @Override
+            public void match(MvcResult result) throws Exception {
+                ModelAndView mav = getModelAndView(result);
+                for (String name : names) {
+                    assertTrue("Model attribute '" + name + "' exists", mav.getModel().get(name) == null);
+                }
+            }
+        };
+    }
+
 	/**
 	 * Assert the given model attribute(s) have errors.
 	 */
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
index 1a5f07f6e9..c72c07661b 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
@@ -135,7 +135,7 @@ protected void printAsyncResult(MvcResult result) throws Exception {
 		if (servlet3Present) {
 			HttpServletRequest request = result.getRequest();
 			this.printer.printValue("Was async started", request.isAsyncStarted());
-			this.printer.printValue("Async result", result.getAsyncResult(0));
+			this.printer.printValue("Async result", (request.isAsyncStarted() ? result.getAsyncResult(0) : null));
 		}
 	}
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java b/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java
index 53ef980ee2..061c1ba564 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,10 +79,15 @@ public boolean equals(Object other) {
 				ObjectUtils.nullSafeEquals(this.someBoolean, otherPerson.someBoolean));
 	}
 
+	@Override
+	public int hashCode() {
+		return Person.class.hashCode();
+	}
+
 	@Override
 	public String toString() {
 		return "Person [name=" + this.name + ", someDouble=" + this.someDouble
 				+ ", someBoolean=" + this.someBoolean + "]";
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java
index ef4b4957a6..dfd3a7147e 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.client;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.anything;
+package org.springframework.test.web.client;
 
 import java.net.URI;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
+import static org.junit.Assert.*;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.*;
+
 /**
- * Tests for {@link MockClientHttpRequestFactory}.
+ * Tests for
+ * {@link org.springframework.test.web.client.MockMvcClientHttpRequestFactory}.
  *
  * @author Rossen Stoyanchev
  */
@@ -66,7 +66,7 @@ public void noFurtherRequestsExpected() throws Exception {
 			this.factory.createRequest(new URI("/foo"), HttpMethod.GET);
 		}
 		catch (AssertionError error) {
-			assertEquals("No further requests expected", error.getMessage());
+			assertEquals("No further requests expected: HTTP GET /foo", error.getMessage());
 		}
 	}
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java
index b0488791f9..e06097b955 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,23 @@
  */
 package org.springframework.test.web.servlet;
 
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import javax.servlet.AsyncContext;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 
-import static org.mockito.BDDMockito.*;
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.Part;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
 
 /**
  * Test fixture for {@link DefaultMvcResult}.
@@ -33,82 +40,73 @@
  */
 public class DefaultMvcResultTests {
 
-	private static final long DEFAULT_TIMEOUT = 10000L;
-
 	private DefaultMvcResult mvcResult;
 
-	private CountDownLatch countDownLatch;
-
-
 	@Before
 	public void setup() {
 		ExtendedMockHttpServletRequest request = new ExtendedMockHttpServletRequest();
-		request.setAsyncStarted(true);
-
-		this.countDownLatch = mock(CountDownLatch.class);
-
 		this.mvcResult = new DefaultMvcResult(request, null);
-		this.mvcResult.setAsyncResultLatch(this.countDownLatch);
-	}
-
-	@Test
-	public void getAsyncResultWithTimeout() throws Exception {
-		long timeout = 1234L;
-		given(this.countDownLatch.await(timeout, TimeUnit.MILLISECONDS)).willReturn(true);
-		this.mvcResult.getAsyncResult(timeout);
-		verify(this.countDownLatch).await(timeout, TimeUnit.MILLISECONDS);
-	}
-
-	@Test
-	public void getAsyncResultWithTimeoutNegativeOne() throws Exception {
-		given(this.countDownLatch.await(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS)).willReturn(true);
-		this.mvcResult.getAsyncResult(-1);
-		verify(this.countDownLatch).await(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS);
 	}
 
 	@Test
-	public void getAsyncResultWithoutTimeout() throws Exception {
-		given(this.countDownLatch.await(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS)).willReturn(true);
-		this.mvcResult.getAsyncResult();
-		verify(this.countDownLatch).await(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS);
+	public void getAsyncResultSuccess() throws Exception {
+		this.mvcResult.setAsyncResult("Foo");
+		assertEquals("Foo", this.mvcResult.getAsyncResult());
 	}
 
-	@Test
-	public void getAsyncResultWithTimeoutZero() throws Exception {
+	@Test(expected = IllegalStateException.class)
+	public void getAsyncResultFailure() throws Exception {
 		this.mvcResult.getAsyncResult(0);
-		verifyZeroInteractions(this.countDownLatch);
-	}
-
-	@Test(expected=IllegalStateException.class)
-	public void getAsyncResultAndTimeOut() throws Exception {
-		this.mvcResult.getAsyncResult(-1);
-		verify(this.countDownLatch).await(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS);
 	}
 
 
 	private static class ExtendedMockHttpServletRequest extends MockHttpServletRequest {
 
-		private boolean asyncStarted;
 		private AsyncContext asyncContext;
 
 		public ExtendedMockHttpServletRequest() {
-			super();
 			this.asyncContext = mock(AsyncContext.class);
-			given(this.asyncContext.getTimeout()).willReturn(new Long(DEFAULT_TIMEOUT));
-		}
-
-		public void setAsyncStarted(boolean asyncStarted) {
-			this.asyncStarted = asyncStarted;
+			given(this.asyncContext.getTimeout()).willReturn(0L);
 		}
 
 		@Override
 		public boolean isAsyncStarted() {
-			return this.asyncStarted;
+			return true;
 		}
 
 		@Override
 		public AsyncContext getAsyncContext() {
-			return asyncContext;
+			return this.asyncContext;
+		}
+
+		@Override
+		public Collection<Part> getParts() throws IOException, ServletException {
+			return null;
+		}
+
+		@Override
+		public Part getPart(String name) throws IOException, ServletException {
+			return null;
+		}
+
+		@Override
+		public AsyncContext startAsync() throws IllegalStateException {
+			return this.asyncContext;
+		}
+
+		@Override
+		public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) {
+			return this.asyncContext;
+		}
+
+		@Override
+		public boolean isAsyncSupported() {
+			return true;
+		}
+
+		@Override
+		public DispatcherType getDispatcherType() {
+			return null;
 		}
 	}
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
index 9320acd338..e33e92260b 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
@@ -228,6 +228,19 @@ public void requestParameterFromQueryWithEncoding() throws Exception {
 		assertEquals("bar=baz", request.getParameter("foo"));
 	}
 
+	// SPR-11043
+
+	@Test
+	public void requestParameterFromQueryNull() throws Exception {
+		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/?foo");
+
+		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
+		Map<String, String[]> parameterMap = request.getParameterMap();
+
+		assertArrayEquals(new String[]{null}, parameterMap.get("foo"));
+		assertEquals("foo", request.getQueryString());
+	}
+
 	@Test
 	public void acceptHeader() throws Exception {
 		this.builder.accept(MediaType.TEXT_HTML, MediaType.APPLICATION_XML);
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java
index ac9ddd2eb2..315095d911 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,7 +70,17 @@ public void attributeExists_doesNotExist() throws Exception {
 		this.matchers.attributeExists("bad").match(this.mvcResult);
 	}
 
-	@Test
+    @Test
+    public void  attributeDoesNotExist() throws Exception {
+        this.matchers.attributeDoesNotExist("bad").match(this.mvcResult);
+    }
+
+    @Test(expected=AssertionError.class)
+    public void attributeDoesNotExist_doesExist() throws Exception {
+        this.matchers.attributeDoesNotExist("good").match(this.mvcResultWithError);
+    }
+
+    @Test
 	public void attribute_equal() throws Exception {
 		this.matchers.attribute("good", is("good")).match(this.mvcResult);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/http/MockHttpInputMessage.java b/spring-test/src/main/java/org/springframework/mock/http/MockHttpInputMessage.java
index 5de14e9954..1029a6c534 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/MockHttpInputMessage.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/MockHttpInputMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.mock.http;
 
 import java.io.ByteArrayInputStream;
@@ -37,14 +38,15 @@ public class MockHttpInputMessage implements HttpInputMessage {
 
 
 	public MockHttpInputMessage(byte[] contents) {
-		this.body = (contents != null) ? new ByteArrayInputStream(contents) : null;
+		this.body = (contents != null ? new ByteArrayInputStream(contents) : null);
 	}
 
 	public MockHttpInputMessage(InputStream body) {
-		Assert.notNull(body, "'body' must not be null");
+		Assert.notNull(body, "InputStream must not be null");
 		this.body = body;
 	}
 
+
 	public HttpHeaders getHeaders() {
 		return this.headers;
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/http/MockHttpOutputMessage.java b/spring-test/src/main/java/org/springframework/mock/http/MockHttpOutputMessage.java
index 43fa1b3e7e..a4ef87e743 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/MockHttpOutputMessage.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/MockHttpOutputMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.mock.http;
 
 import java.io.ByteArrayOutputStream;
@@ -36,7 +37,7 @@ public class MockHttpOutputMessage implements HttpOutputMessage {
 
 	private final HttpHeaders headers = new HttpHeaders();
 
-	private final ByteArrayOutputStream body = new ByteArrayOutputStream();
+	private final ByteArrayOutputStream body = new ByteArrayOutputStream(1024);
 
 
 	/**
@@ -74,12 +75,11 @@ public String getBodyAsString() {
 	public String getBodyAsString(Charset charset) {
 		byte[] bytes = getBodyAsBytes();
 		try {
-			// Use
 			return new String(bytes, charset.name());
 		}
 		catch (UnsupportedEncodingException ex) {
 			// should not occur
-			throw new InternalError(ex.getMessage());
+			throw new IllegalStateException(ex);
 		}
 	}
 
diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java b/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java
index 0f46bbbcf3..ef35be0137 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,14 +33,14 @@
  */
 public class MockClientHttpRequest extends MockHttpOutputMessage implements ClientHttpRequest {
 
-	private URI uri;
-
 	private HttpMethod httpMethod;
 
-	private boolean executed = false;
+	private URI uri;
 
 	private ClientHttpResponse clientHttpResponse;
 
+	private boolean executed = false;
+
 
 	/**
 	 * Default constructor.
@@ -56,20 +56,21 @@ public MockClientHttpRequest(HttpMethod httpMethod, URI uri) {
 		this.uri = uri;
 	}
 
-	public URI getURI() {
-		return this.uri;
-	}
 
-	public void setURI(URI uri) {
-		this.uri = uri;
+	public void setMethod(HttpMethod httpMethod) {
+		this.httpMethod = httpMethod;
 	}
 
 	public HttpMethod getMethod() {
 		return this.httpMethod;
 	}
 
-	public void setMethod(HttpMethod httpMethod) {
-		this.httpMethod = httpMethod;
+	public void setURI(URI uri) {
+		this.uri = uri;
+	}
+
+	public URI getURI() {
+		return this.uri;
 	}
 
 	public void setResponse(ClientHttpResponse clientHttpResponse) {
@@ -93,7 +94,6 @@ public final ClientHttpResponse execute() throws IOException {
 	/**
 	 * The default implementation returns the configured
 	 * {@link #setResponse(ClientHttpResponse) response}.
-	 *
 	 * <p>Override this method to execute the request and provide a response,
 	 * potentially different than the configured response.
 	 */
@@ -101,6 +101,7 @@ protected ClientHttpResponse executeInternal() throws IOException {
 		return this.clientHttpResponse;
 	}
 
+
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
@@ -111,7 +112,7 @@ public String toString() {
 			sb.append(" ").append(this.uri);
 		}
 		if (!getHeaders().isEmpty()) {
-			sb.append(", headers : ").append(getHeaders());
+			sb.append(", headers: ").append(getHeaders());
 		}
 		if (sb.length() == 0) {
 			sb.append("Not yet initialized");
diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpResponse.java b/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpResponse.java
index 9ed40774f1..5b7a363207 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.mock.http.client;
 
 import java.io.IOException;
@@ -39,7 +40,7 @@ public class MockClientHttpResponse extends MockHttpInputMessage implements Clie
 	 */
 	public MockClientHttpResponse(byte[] body, HttpStatus statusCode) {
 		super(body);
-		Assert.notNull(statusCode, "statisCode is required");
+		Assert.notNull(statusCode, "HttpStatus is required");
 		this.status = statusCode;
 	}
 
@@ -48,10 +49,11 @@ public MockClientHttpResponse(byte[] body, HttpStatus statusCode) {
 	 */
 	public MockClientHttpResponse(InputStream body, HttpStatus statusCode) {
 		super(body);
-		Assert.notNull(statusCode, "statisCode is required");
+		Assert.notNull(statusCode, "HttpStatus is required");
 		this.status = statusCode;
 	}
 
+
 	public HttpStatus getStatusCode() throws IOException {
 		return this.status;
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index 5d2f70d519..f813203bb2 100644
--- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.mock.jndi;
 
 import java.util.Hashtable;
-
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
@@ -195,7 +194,7 @@ public InitialContextFactory createInitialContextFactory(Hashtable<?,?> environm
 		if (activated == null && environment != null) {
 			Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY);
 			if (icf != null) {
-				Class<?> icfClass = null;
+				Class<?> icfClass;
 				if (icf instanceof Class) {
 					icfClass = (Class<?>) icf;
 				}
@@ -214,10 +213,7 @@ else if (icf instanceof String) {
 					return (InitialContextFactory) icfClass.newInstance();
 				}
 				catch (Throwable ex) {
-					IllegalStateException ise =
-							new IllegalStateException("Cannot instantiate specified InitialContextFactory: " + icf);
-					ise.initCause(ex);
-					throw ise;
+					throw new IllegalStateException("Cannot instantiate specified InitialContextFactory: " + icf, ex);
 				}
 			}
 		}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
index 0d29289c77..178dffd62c 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@
 
 import org.springframework.util.Assert;
 import org.springframework.util.LinkedCaseInsensitiveMap;
+import org.springframework.util.StringUtils;
 
 /**
  * Mock implementation of the {@link javax.servlet.http.HttpServletRequest} interface.
@@ -210,8 +211,8 @@ public MockHttpServletRequest(String method, String requestURI) {
 
 	/**
 	 * Create a new {@code MockHttpServletRequest} with the supplied {@link ServletContext}.
-	 * @param servletContext the ServletContext that the request runs in (may be
-	 * {@code null} to use a default {@link MockServletContext})
+	 * @param servletContext the ServletContext that the request runs in
+	 * (may be {@code null} to use a default {@link MockServletContext})
 	 * @see #MockHttpServletRequest(ServletContext, String, String)
 	 */
 	public MockHttpServletRequest(ServletContext servletContext) {
@@ -308,9 +309,10 @@ public void setCharacterEncoding(String characterEncoding) {
 	}
 
 	private void updateContentTypeHeader() {
-		if (this.contentType != null) {
+		if (StringUtils.hasLength(this.contentType)) {
 			StringBuilder sb = new StringBuilder(this.contentType);
-			if (!this.contentType.toLowerCase().contains(CHARSET_PREFIX) && this.characterEncoding != null) {
+			if (!this.contentType.toLowerCase().contains(CHARSET_PREFIX) &&
+					StringUtils.hasLength(this.characterEncoding)) {
 				sb.append(";").append(CHARSET_PREFIX).append(this.characterEncoding);
 			}
 			doAddHeaderValue(CONTENT_TYPE_HEADER, sb.toString(), true);
@@ -330,8 +332,7 @@ public void setContentType(String contentType) {
 		if (contentType != null) {
 			int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX);
 			if (charsetIndex != -1) {
-				String encoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
-				this.characterEncoding = encoding;
+				this.characterEncoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
 			}
 			updateContentTypeHeader();
 		}
@@ -715,8 +716,8 @@ else if (value instanceof Number) {
 			return ((Number) value).longValue();
 		}
 		else if (value != null) {
-			throw new IllegalArgumentException("Value for header '" + name + "' is neither a Date nor a Number: "
-					+ value);
+			throw new IllegalArgumentException(
+					"Value for header '" + name + "' is neither a Date nor a Number: " + value);
 		}
 		else {
 			return -1L;
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
index 75a7a1fc3b..b575c402f7 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	private boolean charset = false;
 
-	private final ByteArrayOutputStream content = new ByteArrayOutputStream();
+	private final ByteArrayOutputStream content = new ByteArrayOutputStream(1024);
 
 	private final ServletOutputStream outputStream = new ResponseServletOutputStream(this.content);
 
@@ -183,8 +183,8 @@ public byte[] getContentAsByteArray() {
 
 	public String getContentAsString() throws UnsupportedEncodingException {
 		flushBuffer();
-		return (this.characterEncoding != null) ?
-				this.content.toString(this.characterEncoding) : this.content.toString();
+		return (this.characterEncoding != null ?
+				this.content.toString(this.characterEncoding) : this.content.toString());
 	}
 
 	public void setContentLength(int contentLength) {
@@ -201,8 +201,7 @@ public void setContentType(String contentType) {
 		if (contentType != null) {
 			int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX);
 			if (charsetIndex != -1) {
-				String encoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
-				this.characterEncoding = encoding;
+				this.characterEncoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
 				this.charset = true;
 			}
 			updateContentTypeHeader();
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
index 7575d11863..49b49e58c1 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
@@ -243,11 +243,10 @@ public int getEffectiveMinorVersion() {
 	}
 
 	/**
-	 * This method uses the Java Activation framework, which returns
-	 * "application/octet-stream" when the mime type is unknown (i.e. it never returns
-	 * {@code null}). In order to maintain the {@link ServletContext#getMimeType(String)
-	 * contract, as of version 3.2.2, this method returns null if the mimeType is
-	 * "application/octet-stream".
+	 * This method uses the Java Activation framework, which returns "application/octet-stream"
+	 * when the mime type is unknown (i.e. it never returns {@code null}). In order to maintain
+	 * the {@link ServletContext#getMimeType(String)} contract, this method returns {@code null}
+	 * if the mimeType is "application/octet-stream", as of Spring 3.2.2.
 	 */
 	public String getMimeType(String filePath) {
 		String mimeType = MimeTypeResolver.getMimeType(filePath);
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMimeResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMimeResponse.java
index e606fc808d..4944ab64ac 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMimeResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMimeResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 
 	private int bufferSize = 4096;
 
-	private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+	private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(1024);
 
 	private final CacheControl cacheControl = new MockCacheControl();
 
@@ -126,9 +126,9 @@ public String getCharacterEncoding() {
 
 	public PrintWriter getWriter() throws UnsupportedEncodingException {
 		if (this.writer == null) {
-			Writer targetWriter = (this.characterEncoding != null
-					? new OutputStreamWriter(this.outputStream, this.characterEncoding)
-					: new OutputStreamWriter(this.outputStream));
+			Writer targetWriter = (this.characterEncoding != null ?
+					new OutputStreamWriter(this.outputStream, this.characterEncoding) :
+					new OutputStreamWriter(this.outputStream));
 			this.writer = new PrintWriter(targetWriter);
 		}
 		return this.writer;
@@ -141,9 +141,8 @@ public byte[] getContentAsByteArray() {
 
 	public String getContentAsString() throws UnsupportedEncodingException {
 		flushBuffer();
-		return (this.characterEncoding != null)
-				? this.outputStream.toString(this.characterEncoding)
-				: this.outputStream.toString();
+		return (this.characterEncoding != null ?
+				this.outputStream.toString(this.characterEncoding) : this.outputStream.toString());
 	}
 
 	public void setLocale(Locale locale) {
@@ -166,13 +165,11 @@ public void flushBuffer() {
 		if (this.writer != null) {
 			this.writer.flush();
 		}
-		if (this.outputStream != null) {
-			try {
-				this.outputStream.flush();
-			}
-			catch (IOException ex) {
-				throw new IllegalStateException("Could not flush OutputStream: " + ex.getMessage());
-			}
+		try {
+			this.outputStream.flush();
+		}
+		catch (IOException ex) {
+			throw new IllegalStateException("Could not flush OutputStream: " + ex.getMessage());
 		}
 		this.committed = true;
 	}
diff --git a/spring-test/src/main/java/org/springframework/test/context/CacheAwareContextLoaderDelegate.java b/spring-test/src/main/java/org/springframework/test/context/CacheAwareContextLoaderDelegate.java
index f7375def03..507d255574 100644
--- a/spring-test/src/main/java/org/springframework/test/context/CacheAwareContextLoaderDelegate.java
+++ b/spring-test/src/main/java/org/springframework/test/context/CacheAwareContextLoaderDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.ApplicationContext;
 import org.springframework.util.Assert;
 
@@ -37,6 +38,8 @@ public class CacheAwareContextLoaderDelegate {
 
 	private static final Log logger = LogFactory.getLog(CacheAwareContextLoaderDelegate.class);
 
+	private static final Log statsLogger = LogFactory.getLog("org.springframework.test.context.cache");
+
 	private final ContextCache contextCache;
 
 
@@ -45,6 +48,7 @@ public class CacheAwareContextLoaderDelegate {
 		this.contextCache = contextCache;
 	}
 
+
 	/**
 	 * Load the {@code ApplicationContext} for the supplied merged context
 	 * configuration. Supports both the {@link SmartContextLoader} and
@@ -53,9 +57,10 @@ public class CacheAwareContextLoaderDelegate {
 	 */
 	private ApplicationContext loadContextInternal(MergedContextConfiguration mergedContextConfiguration)
 			throws Exception {
+
 		ContextLoader contextLoader = mergedContextConfiguration.getContextLoader();
-		Assert.notNull(contextLoader, "Cannot load an ApplicationContext with a NULL 'contextLoader'. "
-				+ "Consider annotating your test class with @ContextConfiguration or @ContextHierarchy.");
+		Assert.notNull(contextLoader, "Cannot load an ApplicationContext with a NULL 'contextLoader'. " +
+				"Consider annotating your test class with @ContextConfiguration or @ContextHierarchy.");
 
 		ApplicationContext applicationContext;
 
@@ -65,8 +70,8 @@ private ApplicationContext loadContextInternal(MergedContextConfiguration merged
 		}
 		else {
 			String[] locations = mergedContextConfiguration.getLocations();
-			Assert.notNull(locations, "Cannot load an ApplicationContext with a NULL 'locations' array. "
-					+ "Consider annotating your test class with @ContextConfiguration or @ContextHierarchy.");
+			Assert.notNull(locations, "Cannot load an ApplicationContext with a NULL 'locations' array. " +
+					"Consider annotating your test class with @ContextConfiguration or @ContextHierarchy.");
 			applicationContext = contextLoader.loadContext(locations);
 		}
 
@@ -76,7 +81,6 @@ private ApplicationContext loadContextInternal(MergedContextConfiguration merged
 	/**
 	 * Load the {@link ApplicationContext application context} for the supplied
 	 * merged context configuration.
-	 *
 	 * <p>If the context is present in the cache it will simply be returned;
 	 * otherwise, it will be loaded, stored in the cache, and returned.
 	 * @return the application context
@@ -84,16 +88,16 @@ private ApplicationContext loadContextInternal(MergedContextConfiguration merged
 	 * loading the application context
 	 */
 	public ApplicationContext loadContext(MergedContextConfiguration mergedContextConfiguration) {
-		synchronized (contextCache) {
-			ApplicationContext context = contextCache.get(mergedContextConfiguration);
+		synchronized (this.contextCache) {
+			ApplicationContext context = this.contextCache.get(mergedContextConfiguration);
 			if (context == null) {
 				try {
 					context = loadContextInternal(mergedContextConfiguration);
 					if (logger.isDebugEnabled()) {
-						logger.debug(String.format("Storing ApplicationContext in cache under key [%s].",
-							mergedContextConfiguration));
+						logger.debug(String.format("Storing ApplicationContext in cache under key [%s]",
+								mergedContextConfiguration));
 					}
-					contextCache.put(mergedContextConfiguration, context);
+					this.contextCache.put(mergedContextConfiguration, context);
 				}
 				catch (Exception ex) {
 					throw new IllegalStateException("Failed to load ApplicationContext", ex);
@@ -101,10 +105,15 @@ public ApplicationContext loadContext(MergedContextConfiguration mergedContextCo
 			}
 			else {
 				if (logger.isDebugEnabled()) {
-					logger.debug(String.format("Retrieved ApplicationContext from cache with key [%s].",
-						mergedContextConfiguration));
+					logger.debug(String.format("Retrieved ApplicationContext from cache with key [%s]",
+							mergedContextConfiguration));
 				}
 			}
+
+			if (statsLogger.isDebugEnabled()) {
+				statsLogger.debug("Spring test ApplicationContext cache statistics: " + this.contextCache);
+			}
+
 			return context;
 		}
 	}
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextCache.java b/spring-test/src/main/java/org/springframework/test/context/ContextCache.java
index 3a5a5b1adb..576021bdaa 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextCache.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -47,13 +48,11 @@
  */
 class ContextCache {
 
-	private final Object monitor = new Object();
-
 	/**
 	 * Map of context keys to Spring {@code ApplicationContext} instances.
 	 */
-	private final Map<MergedContextConfiguration, ApplicationContext> contextMap = new ConcurrentHashMap<MergedContextConfiguration, ApplicationContext>(
-		64);
+	private final Map<MergedContextConfiguration, ApplicationContext> contextMap =
+			new ConcurrentHashMap<MergedContextConfiguration, ApplicationContext>(64);
 
 	/**
 	 * Map of parent keys to sets of children keys, representing a top-down <em>tree</em>
@@ -61,128 +60,99 @@ class ContextCache {
 	 * need to be recursively removed and closed when removing a context that is a parent
 	 * of other contexts.
 	 */
-	private final Map<MergedContextConfiguration, Set<MergedContextConfiguration>> hierarchyMap = new ConcurrentHashMap<MergedContextConfiguration, Set<MergedContextConfiguration>>(
-		64);
+	private final Map<MergedContextConfiguration, Set<MergedContextConfiguration>> hierarchyMap =
+			new ConcurrentHashMap<MergedContextConfiguration, Set<MergedContextConfiguration>>(64);
 
-	private int hitCount;
+	private final AtomicInteger hitCount = new AtomicInteger();
 
-	private int missCount;
+	private final AtomicInteger missCount = new AtomicInteger();
 
 
 	/**
-	 * Clears all contexts from the cache and clears context hierarchy information as
-	 * well.
+	 * Clear all contexts from the cache and clears context hierarchy information as well.
 	 */
-	void clear() {
-		synchronized (monitor) {
-			this.contextMap.clear();
-			this.hierarchyMap.clear();
-		}
+	public void clear() {
+		this.contextMap.clear();
+		this.hierarchyMap.clear();
 	}
 
 	/**
-	 * Clears hit and miss count statistics for the cache (i.e., resets counters to zero).
+	 * Clear hit and miss count statistics for the cache (i.e., resets counters to zero).
 	 */
-	void clearStatistics() {
-		this.hitCount = 0;
-		this.missCount = 0;
+	public void clearStatistics() {
+		this.hitCount.set(0);
+		this.missCount.set(0);
 	}
 
 	/**
 	 * Return whether there is a cached context for the given key.
-	 *
 	 * @param key the context key (never {@code null})
 	 */
-	boolean contains(MergedContextConfiguration key) {
+	public boolean contains(MergedContextConfiguration key) {
 		Assert.notNull(key, "Key must not be null");
-		synchronized (monitor) {
-			return this.contextMap.containsKey(key);
-		}
+		return this.contextMap.containsKey(key);
 	}
 
 	/**
 	 * Obtain a cached {@code ApplicationContext} for the given key.
-	 *
-	 * <p>The {@link #getHitCount() hit} and {@link #getMissCount() miss} counts will be
-	 * updated accordingly.
-	 *
+	 * <p>The {@link #getHitCount() hit} and {@link #getMissCount() miss} counts will
+	 * be updated accordingly.
 	 * @param key the context key (never {@code null})
-	 * @return the corresponding {@code ApplicationContext} instance, or {@code null} if
-	 * not found in the cache.
+	 * @return the corresponding {@code ApplicationContext} instance, or {@code null}
+	 * if not found in the cache
 	 * @see #remove
 	 */
-	ApplicationContext get(MergedContextConfiguration key) {
+	public ApplicationContext get(MergedContextConfiguration key) {
 		Assert.notNull(key, "Key must not be null");
-		synchronized (monitor) {
-			ApplicationContext context = this.contextMap.get(key);
-			if (context == null) {
-				incrementMissCount();
-			}
-			else {
-				incrementHitCount();
-			}
-			return context;
+		ApplicationContext context = this.contextMap.get(key);
+		if (context == null) {
+			this.missCount.incrementAndGet();
 		}
+		else {
+			this.hitCount.incrementAndGet();
+		}
+		return context;
 	}
 
 	/**
-	 * Increment the hit count by one. A <em>hit</em> is an access to the cache, which
-	 * returned a non-null context for a queried key.
-	 */
-	private void incrementHitCount() {
-		this.hitCount++;
-	}
-
-	/**
-	 * Increment the miss count by one. A <em>miss</em> is an access to the cache, which
-	 * returned a {@code null} context for a queried key.
-	 */
-	private void incrementMissCount() {
-		this.missCount++;
-	}
-
-	/**
-	 * Get the overall hit count for this cache. A <em>hit</em> is an access to the cache,
-	 * which returned a non-null context for a queried key.
+	 * Get the overall hit count for this cache.
+	 * <p>A <em>hit</em> is an access to the cache, which returned a non-null context
+	 * for a queried key.
 	 */
-	int getHitCount() {
-		return this.hitCount;
+	public int getHitCount() {
+		return this.hitCount.get();
 	}
 
 	/**
-	 * Get the overall miss count for this cache. A <em>miss</em> is an access to the
-	 * cache, which returned a {@code null} context for a queried key.
+	 * Get the overall miss count for this cache.
+	 * <p>A <em>miss</em> is an access to the cache, which returned a {@code null} context
+	 * for a queried key.
 	 */
-	int getMissCount() {
-		return this.missCount;
+	public int getMissCount() {
+		return this.missCount.get();
 	}
 
 	/**
-	 * Explicitly add an {@code ApplicationContext} instance to the cache under the given
-	 * key.
-	 *
+	 * Explicitly add an {@code ApplicationContext} instance to the cache under the given key.
 	 * @param key the context key (never {@code null})
 	 * @param context the {@code ApplicationContext} instance (never {@code null})
 	 */
-	void put(MergedContextConfiguration key, ApplicationContext context) {
+	public void put(MergedContextConfiguration key, ApplicationContext context) {
 		Assert.notNull(key, "Key must not be null");
 		Assert.notNull(context, "ApplicationContext must not be null");
 
-		synchronized (monitor) {
-			this.contextMap.put(key, context);
-
-			MergedContextConfiguration child = key;
-			MergedContextConfiguration parent = child.getParent();
-			while (parent != null) {
-				Set<MergedContextConfiguration> list = hierarchyMap.get(parent);
-				if (list == null) {
-					list = new HashSet<MergedContextConfiguration>();
-					hierarchyMap.put(parent, list);
-				}
-				list.add(child);
-				child = parent;
-				parent = child.getParent();
+		this.contextMap.put(key, context);
+		MergedContextConfiguration child = key;
+		MergedContextConfiguration parent = child.getParent();
+		while (parent != null) {
+			Set<MergedContextConfiguration> list = this.hierarchyMap.get(parent);
+			if (list == null) {
+				list = new HashSet<MergedContextConfiguration>();
+				this.hierarchyMap.put(parent, list);
 			}
+			list.add(child);
+			child = parent;
+			parent = child.getParent();
 		}
 	}
 
@@ -190,19 +160,16 @@ void put(MergedContextConfiguration key, ApplicationContext context) {
 	 * Remove the context with the given key from the cache and explicitly
 	 * {@linkplain ConfigurableApplicationContext#close() close} it if it is an
 	 * instance of {@link ConfigurableApplicationContext}.
-	 *
 	 * <p>Generally speaking, you would only call this method if you change the
 	 * state of a singleton bean, potentially affecting future interaction with
 	 * the context.
-	 *
 	 * <p>In addition, the semantics of the supplied {@code HierarchyMode} will
 	 * be honored. See the Javadoc for {@link HierarchyMode} for details.
-	 *
 	 * @param key the context key; never {@code null}
 	 * @param hierarchyMode the hierarchy mode; may be {@code null} if the context
 	 * is not part of a hierarchy
 	 */
-	void remove(MergedContextConfiguration key, HierarchyMode hierarchyMode) {
+	public void remove(MergedContextConfiguration key, HierarchyMode hierarchyMode) {
 		Assert.notNull(key, "Key must not be null");
 
 		// startKey is the level at which to begin clearing the cache, depending
@@ -214,24 +181,21 @@ void remove(MergedContextConfiguration key, HierarchyMode hierarchyMode) {
 			}
 		}
 
-		synchronized (monitor) {
-			final List<MergedContextConfiguration> removedContexts = new ArrayList<MergedContextConfiguration>();
-
-			remove(removedContexts, startKey);
+		List<MergedContextConfiguration> removedContexts = new ArrayList<MergedContextConfiguration>();
+		remove(removedContexts, startKey);
 
-			// Remove all remaining references to any removed contexts from the
-			// hierarchy map.
-			for (MergedContextConfiguration currentKey : removedContexts) {
-				for (Set<MergedContextConfiguration> children : hierarchyMap.values()) {
-					children.remove(currentKey);
-				}
+		// Remove all remaining references to any removed contexts from the
+		// hierarchy map.
+		for (MergedContextConfiguration currentKey : removedContexts) {
+			for (Set<MergedContextConfiguration> children : this.hierarchyMap.values()) {
+				children.remove(currentKey);
 			}
+		}
 
-			// Remove empty entries from the hierarchy map.
-			for (MergedContextConfiguration currentKey : hierarchyMap.keySet()) {
-				if (hierarchyMap.get(currentKey).isEmpty()) {
-					hierarchyMap.remove(currentKey);
-				}
+		// Remove empty entries from the hierarchy map.
+		for (MergedContextConfiguration currentKey : this.hierarchyMap.keySet()) {
+			if (this.hierarchyMap.get(currentKey).isEmpty()) {
+				this.hierarchyMap.remove(currentKey);
 			}
 		}
 	}
@@ -239,26 +203,23 @@ void remove(MergedContextConfiguration key, HierarchyMode hierarchyMode) {
 	private void remove(List<MergedContextConfiguration> removedContexts, MergedContextConfiguration key) {
 		Assert.notNull(key, "Key must not be null");
 
-		synchronized (monitor) {
-			Set<MergedContextConfiguration> children = hierarchyMap.get(key);
-			if (children != null) {
-				for (MergedContextConfiguration child : children) {
-					// Recurse through lower levels
-					remove(removedContexts, child);
-				}
-				// Remove the set of children for the current context from the
-				// hierarchy map.
-				hierarchyMap.remove(key);
+		Set<MergedContextConfiguration> children = this.hierarchyMap.get(key);
+		if (children != null) {
+			for (MergedContextConfiguration child : children) {
+				// Recurse through lower levels
+				remove(removedContexts, child);
 			}
+			// Remove the set of children for the current context from the hierarchy map.
+			this.hierarchyMap.remove(key);
+		}
 
-			// Physically remove and close leaf nodes first (i.e., on the way back up the
-			// stack as opposed to prior to the recursive call).
-			ApplicationContext context = contextMap.remove(key);
-			if (context instanceof ConfigurableApplicationContext) {
-				((ConfigurableApplicationContext) context).close();
-			}
-			removedContexts.add(key);
+		// Physically remove and close leaf nodes first (i.e., on the way back up the
+		// stack as opposed to prior to the recursive call).
+		ApplicationContext context = this.contextMap.remove(key);
+		if (context instanceof ConfigurableApplicationContext) {
+			((ConfigurableApplicationContext) context).close();
 		}
+		removedContexts.add(key);
 	}
 
 	/**
@@ -266,34 +227,30 @@ private void remove(List<MergedContextConfiguration> removedContexts, MergedCont
 	 * contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
 	 * <tt>Integer.MAX_VALUE</tt>.
 	 */
-	int size() {
-		synchronized (monitor) {
-			return this.contextMap.size();
-		}
+	public int size() {
+		return this.contextMap.size();
 	}
 
 	/**
 	 * Determine the number of parent contexts currently tracked within the cache.
 	 */
-	int getParentContextCount() {
-		synchronized (monitor) {
-			return this.hierarchyMap.size();
-		}
+	public int getParentContextCount() {
+		return this.hierarchyMap.size();
 	}
 
 	/**
 	 * Generates a text string, which contains the {@linkplain #size() size} as well
-	 * as the {@linkplain #getHitCount() hit}, {@linkplain #getMissCount() miss}, and
-	 * {@linkplain #getParentContextCount() parent context} counts.
+	 * as the {@linkplain #getHitCount() hit}, {@linkplain #getMissCount() miss},
+	 * and {@linkplain #getParentContextCount() parent context} counts.
 	 */
 	@Override
 	public String toString() {
-		return new ToStringCreator(this)//
-		.append("size", size())//
-		.append("hitCount", getHitCount())//
-		.append("missCount", getMissCount())//
-		.append("parentContextCount", getParentContextCount())//
-		.toString();
+		return new ToStringCreator(this)
+				.append("size", size())
+				.append("hitCount", getHitCount())
+				.append("missCount", getMissCount())
+				.append("parentContextCount", getParentContextCount())
+				.toString();
 	}
 
 }
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java b/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
index 035483a71e..16c724a8a6 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,15 +23,15 @@
 
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * {@code ContextConfigurationAttributes} encapsulates the context
- * configuration attributes declared on a test class via
- * {@link ContextConfiguration @ContextConfiguration}.
+ * {@code ContextConfigurationAttributes} encapsulates the context configuration
+ * attributes declared via {@link ContextConfiguration @ContextConfiguration}.
  *
  * @author Sam Brannen
  * @since 3.1
@@ -45,13 +45,11 @@ public class ContextConfigurationAttributes {
 
 	private final Class<?> declaringClass;
 
-	private String[] locations;
-
 	private Class<?>[] classes;
 
-	private final boolean inheritLocations;
+	private String[] locations;
 
-	private final Class<? extends ContextLoader> contextLoaderClass;
+	private final boolean inheritLocations;
 
 	private final Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>[] initializers;
 
@@ -59,34 +57,8 @@ public class ContextConfigurationAttributes {
 
 	private final String name;
 
+	private final Class<? extends ContextLoader> contextLoaderClass;
 
-	/**
-	 * Resolve resource locations from the {@link ContextConfiguration#locations() locations}
-	 * and {@link ContextConfiguration#value() value} attributes of the supplied
-	 * {@link ContextConfiguration} annotation.
-	 *
-	 * @throws IllegalStateException if both the locations and value attributes have been declared
-	 */
-	private static String[] resolveLocations(Class<?> declaringClass, ContextConfiguration contextConfiguration) {
-		Assert.notNull(declaringClass, "declaringClass must not be null");
-
-		String[] locations = contextConfiguration.locations();
-		String[] valueLocations = contextConfiguration.value();
-
-		if (!ObjectUtils.isEmpty(valueLocations) && !ObjectUtils.isEmpty(locations)) {
-			String msg = String.format("Test class [%s] has been configured with @ContextConfiguration's 'value' %s "
-					+ "and 'locations' %s attributes. Only one declaration of resource "
-					+ "locations is permitted per @ContextConfiguration annotation.", declaringClass.getName(),
-				ObjectUtils.nullSafeToString(valueLocations), ObjectUtils.nullSafeToString(locations));
-			logger.error(msg);
-			throw new IllegalStateException(msg);
-		}
-		else if (!ObjectUtils.isEmpty(valueLocations)) {
-			locations = valueLocations;
-		}
-
-		return locations;
-	}
 
 	/**
 	 * Construct a new {@link ContextConfigurationAttributes} instance for the
@@ -97,8 +69,26 @@ else if (!ObjectUtils.isEmpty(valueLocations)) {
 	 */
 	public ContextConfigurationAttributes(Class<?> declaringClass, ContextConfiguration contextConfiguration) {
 		this(declaringClass, resolveLocations(declaringClass, contextConfiguration), contextConfiguration.classes(),
-			contextConfiguration.inheritLocations(), contextConfiguration.initializers(),
-			contextConfiguration.inheritInitializers(), contextConfiguration.name(), contextConfiguration.loader());
+				contextConfiguration.inheritLocations(), contextConfiguration.initializers(),
+				contextConfiguration.inheritInitializers(), contextConfiguration.name(), contextConfiguration.loader());
+	}
+
+	/**
+	 * Construct a new {@link ContextConfigurationAttributes} instance for the
+	 * supplied {@link AnnotationAttributes} (parsed from a
+	 * {@link ContextConfiguration @ContextConfiguration} annotation) and
+	 * the {@linkplain Class test class} that declared them.
+	 * @param declaringClass the test class that declared {@code @ContextConfiguration}
+	 * @param annAttrs the annotation attributes from which to retrieve the attributes
+	 */
+	@SuppressWarnings("unchecked")
+	public ContextConfigurationAttributes(Class<?> declaringClass, AnnotationAttributes annAttrs) {
+		this(declaringClass,
+				resolveLocations(declaringClass, annAttrs.getStringArray("locations"), annAttrs.getStringArray("value")),
+				annAttrs.getClassArray("classes"), annAttrs.getBoolean("inheritLocations"),
+				(Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>[]) annAttrs.getClassArray("initializers"),
+				annAttrs.getBoolean("inheritInitializers"), annAttrs.getString("name"),
+				(Class<? extends ContextLoader>) annAttrs.getClass("loader"));
 	}
 
 	/**
@@ -106,14 +96,13 @@ public ContextConfigurationAttributes(Class<?> declaringClass, ContextConfigurat
 	 * {@linkplain Class test class} that declared the
 	 * {@link ContextConfiguration @ContextConfiguration} annotation and its
 	 * corresponding attributes.
-	 *
 	 * @param declaringClass the test class that declared {@code @ContextConfiguration}
 	 * @param locations the resource locations declared via {@code @ContextConfiguration}
 	 * @param classes the annotated classes declared via {@code @ContextConfiguration}
 	 * @param inheritLocations the {@code inheritLocations} flag declared via {@code @ContextConfiguration}
 	 * @param contextLoaderClass the {@code ContextLoader} class declared via {@code @ContextConfiguration}
 	 * @throws IllegalArgumentException if the {@code declaringClass} or {@code contextLoaderClass} is
-	 * {@code null}, or if the {@code locations} and {@code classes} are both non-empty
+	 * {@code null}
 	 * @deprecated as of Spring 3.2, use
 	 * {@link #ContextConfigurationAttributes(Class, String[], Class[], boolean, Class[], boolean, String, Class)}
 	 * instead
@@ -121,6 +110,7 @@ public ContextConfigurationAttributes(Class<?> declaringClass, ContextConfigurat
 	@Deprecated
 	public ContextConfigurationAttributes(Class<?> declaringClass, String[] locations, Class<?>[] classes,
 			boolean inheritLocations, Class<? extends ContextLoader> contextLoaderClass) {
+
 		this(declaringClass, locations, classes, inheritLocations, null, true, null, contextLoaderClass);
 	}
 
@@ -129,7 +119,6 @@ public ContextConfigurationAttributes(Class<?> declaringClass, String[] location
 	 * {@linkplain Class test class} that declared the
 	 * {@link ContextConfiguration @ContextConfiguration} annotation and its
 	 * corresponding attributes.
-	 *
 	 * @param declaringClass the test class that declared {@code @ContextConfiguration}
 	 * @param locations the resource locations declared via {@code @ContextConfiguration}
 	 * @param classes the annotated classes declared via {@code @ContextConfiguration}
@@ -138,14 +127,15 @@ public ContextConfigurationAttributes(Class<?> declaringClass, String[] location
 	 * @param inheritInitializers the {@code inheritInitializers} flag declared via {@code @ContextConfiguration}
 	 * @param contextLoaderClass the {@code ContextLoader} class declared via {@code @ContextConfiguration}
 	 * @throws IllegalArgumentException if the {@code declaringClass} or {@code contextLoaderClass} is
-	 * {@code null}, or if the {@code locations} and {@code classes} are both non-empty
+	 * {@code null}
 	 */
-	public ContextConfigurationAttributes(Class<?> declaringClass, String[] locations, Class<?>[] classes,
-			boolean inheritLocations,
+	public ContextConfigurationAttributes(
+			Class<?> declaringClass, String[] locations, Class<?>[] classes, boolean inheritLocations,
 			Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>[] initializers,
 			boolean inheritInitializers, Class<? extends ContextLoader> contextLoaderClass) {
+
 		this(declaringClass, locations, classes, inheritLocations, initializers, inheritInitializers, null,
-			contextLoaderClass);
+				contextLoaderClass);
 	}
 
 	/**
@@ -153,7 +143,6 @@ public ContextConfigurationAttributes(Class<?> declaringClass, String[] location
 	 * {@linkplain Class test class} that declared the
 	 * {@link ContextConfiguration @ContextConfiguration} annotation and its
 	 * corresponding attributes.
-	 *
 	 * @param declaringClass the test class that declared {@code @ContextConfiguration}
 	 * @param locations the resource locations declared via {@code @ContextConfiguration}
 	 * @param classes the annotated classes declared via {@code @ContextConfiguration}
@@ -163,24 +152,23 @@ public ContextConfigurationAttributes(Class<?> declaringClass, String[] location
 	 * @param name the name of level in the context hierarchy, or {@code null} if not applicable
 	 * @param contextLoaderClass the {@code ContextLoader} class declared via {@code @ContextConfiguration}
 	 * @throws IllegalArgumentException if the {@code declaringClass} or {@code contextLoaderClass} is
-	 * {@code null}, or if the {@code locations} and {@code classes} are both non-empty
+	 * {@code null}
 	 */
-	public ContextConfigurationAttributes(Class<?> declaringClass, String[] locations, Class<?>[] classes,
-			boolean inheritLocations,
+	public ContextConfigurationAttributes(
+			Class<?> declaringClass, String[] locations, Class<?>[] classes, boolean inheritLocations,
 			Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>[] initializers,
 			boolean inheritInitializers, String name, Class<? extends ContextLoader> contextLoaderClass) {
 
 		Assert.notNull(declaringClass, "declaringClass must not be null");
 		Assert.notNull(contextLoaderClass, "contextLoaderClass must not be null");
 
-		if (!ObjectUtils.isEmpty(locations) && !ObjectUtils.isEmpty(classes)) {
-			String msg = String.format(
-				"Test class [%s] has been configured with @ContextConfiguration's 'locations' (or 'value') %s "
-						+ "and 'classes' %s attributes. Only one declaration of resources "
-						+ "is permitted per @ContextConfiguration annotation.", declaringClass.getName(),
-				ObjectUtils.nullSafeToString(locations), ObjectUtils.nullSafeToString(classes));
-			logger.error(msg);
-			throw new IllegalArgumentException(msg);
+		if (!ObjectUtils.isEmpty(locations) && !ObjectUtils.isEmpty(classes) && logger.isDebugEnabled()) {
+			logger.debug(String.format(
+					"Test class [%s] has been configured with @ContextConfiguration's 'locations' (or 'value') %s " +
+							"and 'classes' %s attributes. Most SmartContextLoader implementations support " +
+							"only one declaration of resources per @ContextConfiguration annotation.",
+					declaringClass.getName(), ObjectUtils.nullSafeToString(locations),
+					ObjectUtils.nullSafeToString(classes)));
 		}
 
 		this.declaringClass = declaringClass;
@@ -189,77 +177,112 @@ public ContextConfigurationAttributes(Class<?> declaringClass, String[] location
 		this.inheritLocations = inheritLocations;
 		this.initializers = initializers;
 		this.inheritInitializers = inheritInitializers;
-		this.name = StringUtils.hasText(name) ? name : null;
+		this.name = (StringUtils.hasText(name) ? name : null);
 		this.contextLoaderClass = contextLoaderClass;
 	}
 
+
 	/**
-	 * Get the {@linkplain Class class} that declared the
-	 * {@link ContextConfiguration @ContextConfiguration} annotation.
-	 *
-	 * @return the declaring class; never {@code null}
+	 * Resolve resource locations from the {@link ContextConfiguration#locations() locations}
+	 * and {@link ContextConfiguration#value() value} attributes of the supplied
+	 * {@link ContextConfiguration} annotation.
+	 * @throws IllegalStateException if both the locations and value attributes have been declared
 	 */
-	public Class<?> getDeclaringClass() {
-		return declaringClass;
+	private static String[] resolveLocations(Class<?> declaringClass, ContextConfiguration contextConfiguration) {
+		return resolveLocations(declaringClass, contextConfiguration.locations(), contextConfiguration.value());
 	}
 
 	/**
-	 * Get the resource locations that were declared via
-	 * {@link ContextConfiguration @ContextConfiguration}.
-	 *
-	 * <p>Note: this is a mutable property. The returned value may therefore
-	 * represent a <em>processed</em> value that does not match the original value
-	 * declared via {@link ContextConfiguration @ContextConfiguration}.
-	 *
-	 * @return the resource locations; potentially {@code null} or <em>empty</em>
-	 * @see ContextConfiguration#value
-	 * @see ContextConfiguration#locations
-	 * @see #setLocations(String[])
+	 * Resolve resource locations from the supplied {@code locations} and
+	 * {@code value} arrays, which correspond to attributes of the same names in
+	 * the {@link ContextConfiguration} annotation.
+	 * @throws IllegalStateException if both the locations and value attributes have been declared
 	 */
-	public String[] getLocations() {
+	private static String[] resolveLocations(Class<?> declaringClass, String[] locations, String[] value) {
+		Assert.notNull(declaringClass, "declaringClass must not be null");
+		if (!ObjectUtils.isEmpty(value) && !ObjectUtils.isEmpty(locations)) {
+			throw new IllegalStateException(String.format("Test class [%s] has been configured with " +
+							"@ContextConfiguration's 'value' %s and 'locations' %s attributes. Only one declaration " +
+							"of resource locations is permitted per @ContextConfiguration annotation.",
+					declaringClass.getName(), ObjectUtils.nullSafeToString(value), ObjectUtils.nullSafeToString(locations)));
+		}
+		else if (!ObjectUtils.isEmpty(value)) {
+			locations = value;
+		}
 		return locations;
 	}
 
+
 	/**
-	 * Set the <em>processed</em> resource locations, effectively overriding the
+	 * Get the {@linkplain Class class} that declared the
+	 * {@link ContextConfiguration @ContextConfiguration} annotation.
+	 * @return the declaring class (never {@code null})
+	 */
+	public Class<?> getDeclaringClass() {
+		return this.declaringClass;
+	}
+
+	/**
+	 * Set the <em>processed</em> annotated classes, effectively overriding the
 	 * original value declared via {@link ContextConfiguration @ContextConfiguration}.
-	 *
-	 * @see #getLocations()
+	 * @see #getClasses()
 	 */
-	public void setLocations(String[] locations) {
-		this.locations = locations;
+	public void setClasses(Class<?>... classes) {
+		this.classes = classes;
 	}
 
 	/**
 	 * Get the annotated classes that were declared via
 	 * {@link ContextConfiguration @ContextConfiguration}.
-	 *
 	 * <p>Note: this is a mutable property. The returned value may therefore
 	 * represent a <em>processed</em> value that does not match the original value
 	 * declared via {@link ContextConfiguration @ContextConfiguration}.
-	 *
 	 * @return the annotated classes; potentially {@code null} or <em>empty</em>
 	 * @see ContextConfiguration#classes
 	 * @see #setClasses(Class[])
 	 */
 	public Class<?>[] getClasses() {
-		return classes;
+		return this.classes;
 	}
 
 	/**
-	 * Set the <em>processed</em> annotated classes, effectively overriding the
+	 * Determine if this {@code ContextConfigurationAttributes} instance has
+	 * class-based resources.
+	 * @return {@code true} if the {@link #getClasses() classes} array is not empty
+	 * @see #hasResources()
+	 * @see #hasLocations()
+	 */
+	public boolean hasClasses() {
+		return !ObjectUtils.isEmpty(getClasses());
+	}
+
+	/**
+	 * Set the <em>processed</em> resource locations, effectively overriding the
 	 * original value declared via {@link ContextConfiguration @ContextConfiguration}.
-	 *
-	 * @see #getClasses()
+	 * @see #getLocations()
 	 */
-	public void setClasses(Class<?>[] classes) {
-		this.classes = classes;
+	public void setLocations(String... locations) {
+		this.locations = locations;
+	}
+
+	/**
+	 * Get the resource locations that were declared via
+	 * {@link ContextConfiguration @ContextConfiguration}.
+	 * <p>Note: this is a mutable property. The returned value may therefore
+	 * represent a <em>processed</em> value that does not match the original value
+	 * declared via {@link ContextConfiguration @ContextConfiguration}.
+	 * @return the resource locations; potentially {@code null} or <em>empty</em>
+	 * @see ContextConfiguration#value
+	 * @see ContextConfiguration#locations
+	 * @see #setLocations(String[])
+	 */
+	public String[] getLocations() {
+		return this.locations;
 	}
 
 	/**
 	 * Determine if this {@code ContextConfigurationAttributes} instance has
 	 * path-based resource locations.
-	 *
 	 * @return {@code true} if the {@link #getLocations() locations} array is not empty
 	 * @see #hasResources()
 	 * @see #hasClasses()
@@ -268,79 +291,51 @@ public boolean hasLocations() {
 		return !ObjectUtils.isEmpty(getLocations());
 	}
 
-	/**
-	 * Determine if this {@code ContextConfigurationAttributes} instance has
-	 * class-based resources.
-	 *
-	 * @return {@code true} if the {@link #getClasses() classes} array is not empty
-	 * @see #hasResources()
-	 * @see #hasLocations()
-	 */
-	public boolean hasClasses() {
-		return !ObjectUtils.isEmpty(getClasses());
-	}
-
 	/**
 	 * Determine if this {@code ContextConfigurationAttributes} instance has
 	 * either path-based resource locations or class-based resources.
-	 *
 	 * @return {@code true} if either the {@link #getLocations() locations}
 	 * or the {@link #getClasses() classes} array is not empty
 	 * @see #hasLocations()
 	 * @see #hasClasses()
 	 */
 	public boolean hasResources() {
-		return hasLocations() || hasClasses();
+		return (hasLocations() || hasClasses());
 	}
 
 	/**
 	 * Get the {@code inheritLocations} flag that was declared via
 	 * {@link ContextConfiguration @ContextConfiguration}.
-	 *
 	 * @return the {@code inheritLocations} flag
 	 * @see ContextConfiguration#inheritLocations
 	 */
 	public boolean isInheritLocations() {
-		return inheritLocations;
+		return this.inheritLocations;
 	}
 
 	/**
 	 * Get the {@code ApplicationContextInitializer} classes that were declared via
 	 * {@link ContextConfiguration @ContextConfiguration}.
-	 *
 	 * @return the {@code ApplicationContextInitializer} classes
 	 * @since 3.2
 	 */
 	public Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>[] getInitializers() {
-		return initializers;
+		return this.initializers;
 	}
 
 	/**
 	 * Get the {@code inheritInitializers} flag that was declared via
 	 * {@link ContextConfiguration @ContextConfiguration}.
-	 *
 	 * @return the {@code inheritInitializers} flag
 	 * @since 3.2
 	 */
 	public boolean isInheritInitializers() {
-		return inheritInitializers;
-	}
-
-	/**
-	 * Get the {@code ContextLoader} class that was declared via
-	 * {@link ContextConfiguration @ContextConfiguration}.
-	 *
-	 * @return the {@code ContextLoader} class
-	 * @see ContextConfiguration#loader
-	 */
-	public Class<? extends ContextLoader> getContextLoaderClass() {
-		return contextLoaderClass;
+		return this.inheritInitializers;
 	}
 
 	/**
 	 * Get the name of the context hierarchy level that was declared via
 	 * {@link ContextConfiguration @ContextConfiguration}.
-	 *
 	 * @return the name of the context hierarchy level or {@code null} if not applicable
 	 * @see ContextConfiguration#name()
 	 * @since 3.2.2
@@ -350,24 +345,16 @@ public String getName() {
 	}
 
 	/**
-	 * Generate a unique hash code for all properties of this
-	 * {@code ContextConfigurationAttributes} instance excluding the
-	 * {@linkplain #getName() name}.
+	 * Get the {@code ContextLoader} class that was declared via
+	 * {@link ContextConfiguration @ContextConfiguration}.
+	 * @return the {@code ContextLoader} class
+	 * @see ContextConfiguration#loader
 	 */
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + declaringClass.hashCode();
-		result = prime * result + Arrays.hashCode(locations);
-		result = prime * result + Arrays.hashCode(classes);
-		result = prime * result + (inheritLocations ? 1231 : 1237);
-		result = prime * result + Arrays.hashCode(initializers);
-		result = prime * result + (inheritInitializers ? 1231 : 1237);
-		result = prime * result + contextLoaderClass.hashCode();
-		return result;
+	public Class<? extends ContextLoader> getContextLoaderClass() {
+		return this.contextLoaderClass;
 	}
 
+
 	/**
 	 * Determine if the supplied object is equal to this
 	 * {@code ContextConfigurationAttributes} instance by comparing both object's
@@ -380,56 +367,36 @@ public int hashCode() {
 	 * {@link #getContextLoaderClass() ContextLoader class}.
 	 */
 	@Override
-	public boolean equals(Object obj) {
-
-		if (this == obj) {
+	public boolean equals(Object other) {
+		if (this == other) {
 			return true;
 		}
-		if (!(obj instanceof ContextConfigurationAttributes)) {
+		if (!(other instanceof ContextConfigurationAttributes)) {
 			return false;
 		}
+		ContextConfigurationAttributes otherAttr = (ContextConfigurationAttributes) other;
+		return (ObjectUtils.nullSafeEquals(this.declaringClass, otherAttr.declaringClass) &&
+				Arrays.equals(this.classes, otherAttr.classes)) &&
+				Arrays.equals(this.locations, otherAttr.locations) &&
+				this.inheritLocations == otherAttr.inheritLocations &&
+				Arrays.equals(this.initializers, otherAttr.initializers) &&
+				this.inheritInitializers == otherAttr.inheritInitializers &&
+				ObjectUtils.nullSafeEquals(this.name, otherAttr.name) &&
+				ObjectUtils.nullSafeEquals(this.contextLoaderClass, otherAttr.contextLoaderClass);
+	}
 
-		final ContextConfigurationAttributes that = (ContextConfigurationAttributes) obj;
-
-		if (this.declaringClass == null) {
-			if (that.declaringClass != null) {
-				return false;
-			}
-		}
-		else if (!this.declaringClass.equals(that.declaringClass)) {
-			return false;
-		}
-
-		if (!Arrays.equals(this.locations, that.locations)) {
-			return false;
-		}
-
-		if (!Arrays.equals(this.classes, that.classes)) {
-			return false;
-		}
-
-		if (this.inheritLocations != that.inheritLocations) {
-			return false;
-		}
-
-		if (!Arrays.equals(this.initializers, that.initializers)) {
-			return false;
-		}
-
-		if (this.inheritInitializers != that.inheritInitializers) {
-			return false;
-		}
-
-		if (this.contextLoaderClass == null) {
-			if (that.contextLoaderClass != null) {
-				return false;
-			}
-		}
-		else if (!this.contextLoaderClass.equals(that.contextLoaderClass)) {
-			return false;
-		}
-
-		return true;
+	/**
+	 * Generate a unique hash code for all properties of this
+	 * {@code ContextConfigurationAttributes} instance excluding the
+	 * {@linkplain #getName() name}.
+	 */
+	@Override
+	public int hashCode() {
+		int result = this.declaringClass.hashCode();
+		result = 31 * result + Arrays.hashCode(this.classes);
+		result = 31 * result + Arrays.hashCode(this.locations);
+		result = 31 * result + Arrays.hashCode(this.initializers);
+		return result;
 	}
 
 	/**
@@ -438,16 +405,16 @@ else if (!this.contextLoaderClass.equals(that.contextLoaderClass)) {
 	 */
 	@Override
 	public String toString() {
-		return new ToStringCreator(this)//
-		.append("declaringClass", declaringClass.getName())//
-		.append("locations", ObjectUtils.nullSafeToString(locations))//
-		.append("classes", ObjectUtils.nullSafeToString(classes))//
-		.append("inheritLocations", inheritLocations)//
-		.append("initializers", ObjectUtils.nullSafeToString(initializers))//
-		.append("inheritInitializers", inheritInitializers)//
-		.append("name", name)//
-		.append("contextLoaderClass", contextLoaderClass.getName())//
-		.toString();
+		return new ToStringCreator(this)
+				.append("declaringClass", this.declaringClass.getName())
+				.append("classes", ObjectUtils.nullSafeToString(this.classes))
+				.append("locations", ObjectUtils.nullSafeToString(this.locations))
+				.append("inheritLocations", this.inheritLocations)
+				.append("initializers", ObjectUtils.nullSafeToString(this.initializers))
+				.append("inheritInitializers", this.inheritInitializers)
+				.append("name", this.name)
+				.append("contextLoaderClass", this.contextLoaderClass.getName())
+				.toString();
 	}
 
 }
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java b/spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java
index a43897eb0b..f71e447b6c 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java
@@ -237,11 +237,9 @@ private static void convertContextConfigToConfigAttributesAndAddToList(ContextCo
 	 * never {@code null}
 	 * @throws IllegalArgumentException if the supplied class is {@code null}; if
 	 * neither {@code @ContextConfiguration} nor {@code @ContextHierarchy} is
-	 * <em>present</em> on the supplied class; if a given class in the class hierarchy
+	 * <em>present</em> on the supplied class; or if a given class in the class hierarchy
 	 * declares both {@code @ContextConfiguration} and {@code @ContextHierarchy} as
-	 * top-level annotations; or if individual {@code @ContextConfiguration}
-	 * elements within a {@code @ContextHierarchy} declaration on a given class
-	 * in the class hierarchy do not define unique context configuration.
+	 * top-level annotations.
 	 *
 	 * @since 3.2.2
 	 * @see #buildContextHierarchyMap(Class)
@@ -287,17 +285,6 @@ else if (contextHierarchyDeclaredLocally) {
 					convertContextConfigToConfigAttributesAndAddToList(contextConfiguration, declaringClass,
 						configAttributesList);
 				}
-
-				// Check for uniqueness
-				Set<ContextConfigurationAttributes> configAttributesSet = new HashSet<ContextConfigurationAttributes>(
-					configAttributesList);
-				if (configAttributesSet.size() != configAttributesList.size()) {
-					String msg = String.format("The @ContextConfiguration elements configured via "
-							+ "@ContextHierarchy in test class [%s] must define unique contexts to load.",
-						declaringClass.getName());
-					logger.error(msg);
-					throw new IllegalStateException(msg);
-				}
 			}
 			else {
 				// This should theoretically actually never happen...
@@ -336,6 +323,9 @@ else if (contextHierarchyDeclaredLocally) {
 	 * (must not be {@code null})
 	 * @return a map of context configuration attributes for the context hierarchy,
 	 * keyed by context hierarchy level name; never {@code null}
+	 * @throws IllegalArgumentException if the lists of context configuration
+	 * attributes for each level in the {@code @ContextHierarchy} do not define
+	 * unique context configuration within the overall hierarchy.
 	 *
 	 * @since 3.2.2
 	 * @see #resolveContextHierarchyAttributes(Class)
@@ -363,6 +353,16 @@ static Map<String, List<ContextConfigurationAttributes>> buildContextHierarchyMa
 			}
 		}
 
+		// Check for uniqueness
+		Set<List<ContextConfigurationAttributes>> set = new HashSet<List<ContextConfigurationAttributes>>(map.values());
+		if (set.size() != map.size()) {
+			String msg = String.format("The @ContextConfiguration elements configured via "
+					+ "@ContextHierarchy in test class [%s] and its superclasses must "
+					+ "define unique contexts per hierarchy level.", testClass.getName());
+			logger.error(msg);
+			throw new IllegalStateException(msg);
+		}
+
 		return map;
 	}
 
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContext.java b/spring-test/src/main/java/org/springframework/test/context/TestContext.java
index d2719b50a0..9324340fea 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestContext.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.AttributeAccessorSupport;
 import org.springframework.core.style.ToStringCreator;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.HierarchyMode;
 import org.springframework.util.Assert;
 
@@ -79,8 +79,7 @@ public class TestContext extends AttributeAccessorSupport {
 	 * @param testClass the test class for which the test context should be
 	 * constructed (must not be {@code null})
 	 * @param contextCache the context cache from which the constructed test
-	 * context should retrieve application contexts (must not be
-	 * {@code null})
+	 * context should retrieve application contexts (must not be {@code null})
 	 * @param defaultContextLoaderClassName the name of the default
 	 * {@code ContextLoader} class to use (may be {@code null})
 	 */
@@ -94,8 +93,8 @@ public class TestContext extends AttributeAccessorSupport {
 
 		MergedContextConfiguration mergedContextConfiguration;
 
-		if (testClass.isAnnotationPresent(ContextConfiguration.class)
-				|| testClass.isAnnotationPresent(ContextHierarchy.class)) {
+		if (testClass.isAnnotationPresent(ContextConfiguration.class) ||
+				testClass.isAnnotationPresent(ContextHierarchy.class)) {
 			mergedContextConfiguration = ContextLoaderUtils.buildMergedContextConfiguration(testClass,
 				defaultContextLoaderClassName, cacheAwareContextLoaderDelegate);
 		}
@@ -111,6 +110,7 @@ public class TestContext extends AttributeAccessorSupport {
 		this.mergedContextConfiguration = mergedContextConfiguration;
 	}
 
+
 	/**
 	 * Get the {@link ApplicationContext application context} for this test
 	 * context, possibly cached.
@@ -119,15 +119,15 @@ public class TestContext extends AttributeAccessorSupport {
 	 * application context
 	 */
 	public ApplicationContext getApplicationContext() {
-		return cacheAwareContextLoaderDelegate.loadContext(mergedContextConfiguration);
+		return this.cacheAwareContextLoaderDelegate.loadContext(this.mergedContextConfiguration);
 	}
 
 	/**
 	 * Get the {@link Class test class} for this test context.
 	 * @return the test class (never {@code null})
 	 */
-	public final Class<?> getTestClass() {
-		return testClass;
+	public Class<?> getTestClass() {
+		return this.testClass;
 	}
 
 	/**
@@ -136,8 +136,8 @@ public final Class<?> getTestClass() {
 	 * @return the current test instance (may be {@code null})
 	 * @see #updateState(Object, Method, Throwable)
 	 */
-	public final Object getTestInstance() {
-		return testInstance;
+	public Object getTestInstance() {
+		return this.testInstance;
 	}
 
 	/**
@@ -146,8 +146,8 @@ public final Object getTestInstance() {
 	 * @return the current test method (may be {@code null})
 	 * @see #updateState(Object, Method, Throwable)
 	 */
-	public final Method getTestMethod() {
-		return testMethod;
+	public Method getTestMethod() {
+		return this.testMethod;
 	}
 
 	/**
@@ -158,8 +158,8 @@ public final Method getTestMethod() {
 	 * exception was thrown
 	 * @see #updateState(Object, Method, Throwable)
 	 */
-	public final Throwable getTestException() {
-		return testException;
+	public Throwable getTestException() {
+		return this.testException;
 	}
 
 	/**
@@ -167,7 +167,8 @@ public final Throwable getTestException() {
 	 * context} associated with this test context is <em>dirty</em> and should be
 	 * discarded. Do this if a test has modified the context &mdash; for example,
 	 * by replacing a bean definition or modifying the state of a singleton bean.
-	 * @deprecated As of Spring 3.2.2, use {@link #markApplicationContextDirty(HierarchyMode)} instead.
+	 * @deprecated as of Spring 3.2.2; use
+	 * {@link #markApplicationContextDirty(DirtiesContext.HierarchyMode)} instead.
 	 */
 	@Deprecated
 	public void markApplicationContextDirty() {
@@ -183,12 +184,13 @@ public void markApplicationContextDirty() {
 	 * context is part of a hierarchy (may be {@code null})
 	 */
 	public void markApplicationContextDirty(HierarchyMode hierarchyMode) {
-		contextCache.remove(mergedContextConfiguration, hierarchyMode);
+		synchronized (this.contextCache) {
+			this.contextCache.remove(this.mergedContextConfiguration, hierarchyMode);
+		}
 	}
 
 	/**
-	 * Update this test context to reflect the state of the currently executing
-	 * test.
+	 * Update this test context to reflect the state of the currently executing test.
 	 * @param testInstance the current test instance (may be {@code null})
 	 * @param testMethod the current test method (may be {@code null})
 	 * @param testException the exception that was thrown in the test method, or
@@ -200,18 +202,19 @@ void updateState(Object testInstance, Method testMethod, Throwable testException
 		this.testException = testException;
 	}
 
+
 	/**
 	 * Provide a String representation of this test context's state.
 	 */
 	@Override
 	public String toString() {
-		return new ToStringCreator(this)//
-		.append("testClass", testClass)//
-		.append("testInstance", testInstance)//
-		.append("testMethod", testMethod)//
-		.append("testException", testException)//
-		.append("mergedContextConfiguration", mergedContextConfiguration)//
-		.toString();
+		return new ToStringCreator(this)
+				.append("testClass", this.testClass)
+				.append("testInstance", this.testInstance)
+				.append("testMethod", this.testMethod)
+				.append("testException", this.testException)
+				.append("mergedContextConfiguration", this.mergedContextConfiguration)
+				.toString();
 	}
 
 }
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
index aabdf33dfb..4cf8b13f2f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,42 +27,41 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.beans.BeanInstantiationException;
 import org.springframework.beans.BeanUtils;
-import org.springframework.context.ApplicationContext;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 
 /**
- * <p>
- * {@code TestContextManager} is the main entry point into the
- * <em>Spring TestContext Framework</em>, which provides support for loading and
- * accessing {@link ApplicationContext application contexts}, dependency
- * injection of test instances,
- * {@link org.springframework.transaction.annotation.Transactional
- * transactional} execution of test methods, etc.
- * </p>
- * <p>
- * Specifically, a {@code TestContextManager} is responsible for managing a
+ * {@code TestContextManager} is the main entry point into the <em>Spring
+ * TestContext Framework</em>, which provides support for loading and accessing
+ * {@link org.springframework.context.ApplicationContext application contexts},
+ * dependency injection of test instances,
+ * {@link org.springframework.transaction.annotation.Transactional transactional}
+ * execution of test methods, etc.
+ *
+ * <p>Specifically, a {@code TestContextManager} is responsible for managing a
  * single {@link TestContext} and signaling events to all registered
  * {@link TestExecutionListener TestExecutionListeners} at well defined test
  * execution points:
- * </p>
+ *
  * <ul>
  * <li>{@link #beforeTestClass() before test class execution}: prior to any
  * <em>before class methods</em> of a particular testing framework (e.g., JUnit
- * 4's {@link org.junit.BeforeClass &#064;BeforeClass})</li>
+ * 4's {@link org.junit.BeforeClass @BeforeClass})</li>
  * <li>{@link #prepareTestInstance(Object) test instance preparation}:
  * immediately following instantiation of the test instance</li>
  * <li>{@link #beforeTestMethod(Object, Method) before test method execution}:
  * prior to any <em>before methods</em> of a particular testing framework (e.g.,
- * JUnit 4's {@link org.junit.Before &#064;Before})</li>
+ * JUnit 4's {@link org.junit.Before @Before})</li>
  * <li>{@link #afterTestMethod(Object, Method, Throwable) after test method
  * execution}: after any <em>after methods</em> of a particular testing
- * framework (e.g., JUnit 4's {@link org.junit.After &#064;After})</li>
+ * framework (e.g., JUnit 4's {@link org.junit.After @After})</li>
  * <li>{@link #afterTestClass() after test class execution}: after any
  * <em>after class methods</em> of a particular testing framework (e.g., JUnit
- * 4's {@link org.junit.AfterClass &#064;AfterClass})</li>
+ * 4's {@link org.junit.AfterClass @AfterClass})</li>
  * </ul>
  *
  * @author Sam Brannen
@@ -76,17 +75,18 @@
 public class TestContextManager {
 
 	private static final String[] DEFAULT_TEST_EXECUTION_LISTENER_CLASS_NAMES = new String[] {
-		"org.springframework.test.context.web.ServletTestExecutionListener",
-		"org.springframework.test.context.support.DependencyInjectionTestExecutionListener",
-		"org.springframework.test.context.support.DirtiesContextTestExecutionListener",
-		"org.springframework.test.context.transaction.TransactionalTestExecutionListener" };
+			"org.springframework.test.context.web.ServletTestExecutionListener",
+			"org.springframework.test.context.support.DependencyInjectionTestExecutionListener",
+			"org.springframework.test.context.support.DirtiesContextTestExecutionListener",
+			"org.springframework.test.context.transaction.TransactionalTestExecutionListener" };
 
 	private static final Log logger = LogFactory.getLog(TestContextManager.class);
 
 	/**
-	 * Cache of Spring application contexts. This needs to be static, as tests
-	 * may be destroyed and recreated between running individual test methods,
-	 * for example with JUnit.
+	 * Cache of Spring application contexts.
+	 * <p>This needs to be static, since test instances may be destroyed and
+	 * recreated between invocations of individual test methods, as is the case
+	 * with JUnit.
 	 */
 	static final ContextCache contextCache = new ContextCache();
 
@@ -96,7 +96,11 @@ public class TestContextManager {
 
 
 	/**
-	 * Delegates to {@link #TestContextManager(Class, String)} with a value of
+	 * Construct a new {@code TestContextManager} for the specified {@linkplain Class test class}
+	 * and automatically {@link #registerTestExecutionListeners register} the
+	 * {@link TestExecutionListener TestExecutionListeners} configured for the test class
+	 * via the {@link TestExecutionListeners &#064;TestExecutionListeners} annotation.
+	 * <p>Delegates to {@link #TestContextManager(Class, String)} with a value of
 	 * {@code null} for the default {@code ContextLoader} class name.
 	 */
 	public TestContextManager(Class<?> testClass) {
@@ -104,23 +108,23 @@ public TestContextManager(Class<?> testClass) {
 	}
 
 	/**
-	 * Constructs a new {@code TestContextManager} for the specified {@linkplain Class
-	 * test class} and automatically {@link #registerTestExecutionListeners registers} the
+	 * Construct a new {@code TestContextManager} for the specified {@linkplain Class test class}
+	 * and automatically {@link #registerTestExecutionListeners register} the
 	 * {@link TestExecutionListener TestExecutionListeners} configured for the test class
 	 * via the {@link TestExecutionListeners &#064;TestExecutionListeners} annotation.
 	 * @param testClass the test class to be managed
-	 * @param defaultContextLoaderClassName the name of the default {@code ContextLoader}
-	 * class to use (may be {@code null})
-	 * @see #registerTestExecutionListeners(TestExecutionListener...)
+	 * @param defaultContextLoaderClassName the name of the default {@code ContextLoader} class
+	 * to use (may be {@code null})
+	 * @see #registerTestExecutionListeners
 	 */
 	public TestContextManager(Class<?> testClass, String defaultContextLoaderClassName) {
 		this.testContext = new TestContext(testClass, contextCache, defaultContextLoaderClassName);
 		registerTestExecutionListeners(retrieveTestExecutionListeners(testClass));
 	}
 
+
 	/**
-	 * Returns the {@link TestContext} managed by this
-	 * {@code TestContextManager}.
+	 * Get the {@link TestContext} managed by this {@code TestContextManager}.
 	 */
 	protected final TestContext getTestContext() {
 		return this.testContext;
@@ -154,18 +158,17 @@ public final List<TestExecutionListener> getTestExecutionListeners() {
 	 * registered for this {@code TestContextManager} in reverse order.
 	 */
 	private List<TestExecutionListener> getReversedTestExecutionListeners() {
-		List<TestExecutionListener> listenersReversed = new ArrayList<TestExecutionListener>(
-			getTestExecutionListeners());
+		List<TestExecutionListener> listenersReversed = new ArrayList<TestExecutionListener>(getTestExecutionListeners());
 		Collections.reverse(listenersReversed);
 		return listenersReversed;
 	}
 
 	/**
 	 * Retrieve an array of newly instantiated {@link TestExecutionListener TestExecutionListeners}
-	 * for the specified {@link Class class}. If {@link TestExecutionListeners &#064;TestExecutionListeners}
+	 * for the specified {@link Class class}. If {@link TestExecutionListeners @TestExecutionListeners}
 	 * is not <em>present</em> on the supplied class, the default listeners will be returned.
 	 * <p>Note that the {@link TestExecutionListeners#inheritListeners() inheritListeners} flag of
-	 * {@link TestExecutionListeners &#064;TestExecutionListeners} will be taken into consideration.
+	 * {@link TestExecutionListeners @TestExecutionListeners} will be taken into consideration.
 	 * Specifically, if the {@code inheritListeners} flag is set to {@code true}, listeners
 	 * defined in the annotated class will be appended to the listeners defined in superclasses.
 	 * @param clazz the test class for which the listeners should be retrieved
@@ -176,35 +179,32 @@ private TestExecutionListener[] retrieveTestExecutionListeners(Class<?> clazz) {
 		Class<TestExecutionListeners> annotationType = TestExecutionListeners.class;
 		List<Class<? extends TestExecutionListener>> classesList = new ArrayList<Class<? extends TestExecutionListener>>();
 		Class<?> declaringClass = AnnotationUtils.findAnnotationDeclaringClass(annotationType, clazz);
-		boolean defaultListeners = false;
 
 		// Use defaults?
 		if (declaringClass == null) {
 			if (logger.isDebugEnabled()) {
-				logger.debug("@TestExecutionListeners is not present for class [" + clazz + "]: using defaults.");
+				logger.debug("@TestExecutionListeners is not present for class [" + clazz.getName() + "]: using defaults.");
 			}
 			classesList.addAll(getDefaultTestExecutionListenerClasses());
-			defaultListeners = true;
-		} else {
+		}
+		else {
 			// Traverse the class hierarchy...
 			while (declaringClass != null) {
 				TestExecutionListeners testExecutionListeners = declaringClass.getAnnotation(annotationType);
 				if (logger.isTraceEnabled()) {
-					logger.trace("Retrieved @TestExecutionListeners [" + testExecutionListeners
-							+ "] for declaring class [" + declaringClass + "].");
+					logger.trace("Retrieved @TestExecutionListeners [" + testExecutionListeners +
+							"] for declaring class [" + declaringClass.getName() + "].");
 				}
 
 				Class<? extends TestExecutionListener>[] valueListenerClasses = testExecutionListeners.value();
 				Class<? extends TestExecutionListener>[] listenerClasses = testExecutionListeners.listeners();
 				if (!ObjectUtils.isEmpty(valueListenerClasses) && !ObjectUtils.isEmpty(listenerClasses)) {
-					String msg = String.format(
-						"Test class [%s] has been configured with @TestExecutionListeners' 'value' [%s] "
-								+ "and 'listeners' [%s] attributes. Use one or the other, but not both.",
-						declaringClass, ObjectUtils.nullSafeToString(valueListenerClasses),
-						ObjectUtils.nullSafeToString(listenerClasses));
-					logger.error(msg);
-					throw new IllegalStateException(msg);
-				} else if (!ObjectUtils.isEmpty(valueListenerClasses)) {
+					throw new IllegalStateException(String.format("Class [%s] configured with @TestExecutionListeners' " +
+							"'value' [%s] and 'listeners' [%s] attributes. Use one or the other, but not both.",
+							declaringClass.getName(), ObjectUtils.nullSafeToString(valueListenerClasses),
+							ObjectUtils.nullSafeToString(listenerClasses)));
+				}
+				else if (!ObjectUtils.isEmpty(valueListenerClasses)) {
 					listenerClasses = valueListenerClasses;
 				}
 
@@ -212,23 +212,30 @@ private TestExecutionListener[] retrieveTestExecutionListeners(Class<?> clazz) {
 					classesList.addAll(0, Arrays.<Class<? extends TestExecutionListener>> asList(listenerClasses));
 				}
 				declaringClass = (testExecutionListeners.inheritListeners() ? AnnotationUtils.findAnnotationDeclaringClass(
-					annotationType, declaringClass.getSuperclass()) : null);
+						annotationType, declaringClass.getSuperclass()) : null);
 			}
 		}
 
 		List<TestExecutionListener> listeners = new ArrayList<TestExecutionListener>(classesList.size());
 		for (Class<? extends TestExecutionListener> listenerClass : classesList) {
+			NoClassDefFoundError ncdfe = null;
 			try {
 				listeners.add(BeanUtils.instantiateClass(listenerClass));
-			} catch (NoClassDefFoundError err) {
-				if (defaultListeners) {
-					if (logger.isDebugEnabled()) {
-						logger.debug("Could not instantiate default TestExecutionListener class ["
-								+ listenerClass.getName()
-								+ "]. Specify custom listener classes or make the default listener classes available.");
-					}
-				} else {
-					throw err;
+			}
+			catch (NoClassDefFoundError err) {
+				ncdfe = err;
+			}
+			catch (BeanInstantiationException ex) {
+				if (ex.getCause() instanceof NoClassDefFoundError) {
+					ncdfe = (NoClassDefFoundError) ex.getCause();
+				}
+			}
+			if (ncdfe != null) {
+				if (logger.isInfoEnabled()) {
+					logger.info(String.format("Could not instantiate TestExecutionListener [%s]. " +
+							"Specify custom listener classes or make the default listener classes " +
+							"(and their required dependencies) available. Offending class: [%s]",
+							listenerClass.getName(), ncdfe.getMessage()));
 				}
 			}
 		}
@@ -241,14 +248,15 @@ private TestExecutionListener[] retrieveTestExecutionListeners(Class<?> clazz) {
 	@SuppressWarnings("unchecked")
 	protected Set<Class<? extends TestExecutionListener>> getDefaultTestExecutionListenerClasses() {
 		Set<Class<? extends TestExecutionListener>> defaultListenerClasses = new LinkedHashSet<Class<? extends TestExecutionListener>>();
+		ClassLoader cl = getClass().getClassLoader();
 		for (String className : DEFAULT_TEST_EXECUTION_LISTENER_CLASS_NAMES) {
 			try {
-				defaultListenerClasses.add((Class<? extends TestExecutionListener>) getClass().getClassLoader().loadClass(
-					className));
-			} catch (Throwable t) {
+				defaultListenerClasses.add((Class<? extends TestExecutionListener>) ClassUtils.forName(className, cl));
+			}
+			catch (Throwable ex) {
 				if (logger.isDebugEnabled()) {
-					logger.debug("Could not load default TestExecutionListener class [" + className
-							+ "]. Specify custom listener classes or make the default listener classes available.", t);
+					logger.debug("Could not load default TestExecutionListener class [" + className +
+							"]. Specify custom listener classes or make the default listener classes available.", ex);
 				}
 			}
 		}
@@ -259,7 +267,7 @@ protected Set<Class<? extends TestExecutionListener>> getDefaultTestExecutionLis
 	 * Hook for pre-processing a test class <em>before</em> execution of any
 	 * tests within the class. Should be called prior to any framework-specific
 	 * <em>before class methods</em> (e.g., methods annotated with JUnit's
-	 * {@link org.junit.BeforeClass &#064;BeforeClass}).
+	 * {@link org.junit.BeforeClass @BeforeClass}).
 	 * <p>An attempt will be made to give each registered
 	 * {@link TestExecutionListener} a chance to pre-process the test class
 	 * execution. If a listener throws an exception, however, the remaining
@@ -269,18 +277,19 @@ protected Set<Class<? extends TestExecutionListener>> getDefaultTestExecutionLis
 	 * @see #getTestExecutionListeners()
 	 */
 	public void beforeTestClass() throws Exception {
-		final Class<?> testClass = getTestContext().getTestClass();
+		Class<?> testClass = getTestContext().getTestClass();
 		if (logger.isTraceEnabled()) {
-			logger.trace("beforeTestClass(): class [" + testClass + "]");
+			logger.trace("beforeTestClass(): class [" + testClass.getName() + "]");
 		}
 		getTestContext().updateState(null, null, null);
 
 		for (TestExecutionListener testExecutionListener : getTestExecutionListeners()) {
 			try {
 				testExecutionListener.beforeTestClass(getTestContext());
-			} catch (Exception ex) {
-				logger.warn("Caught exception while allowing TestExecutionListener [" + testExecutionListener
-						+ "] to process 'before class' callback for test class [" + testClass + "]", ex);
+			}
+			catch (Exception ex) {
+				logger.warn("Caught exception while allowing TestExecutionListener [" + testExecutionListener +
+						"] to process 'before class' callback for test class [" + testClass + "]", ex);
 				throw ex;
 			}
 		}
@@ -310,9 +319,10 @@ public void prepareTestInstance(Object testInstance) throws Exception {
 		for (TestExecutionListener testExecutionListener : getTestExecutionListeners()) {
 			try {
 				testExecutionListener.prepareTestInstance(getTestContext());
-			} catch (Exception ex) {
-				logger.error("Caught exception while allowing TestExecutionListener [" + testExecutionListener
-						+ "] to prepare test instance [" + testInstance + "]", ex);
+			}
+			catch (Exception ex) {
+				logger.error("Caught exception while allowing TestExecutionListener [" + testExecutionListener +
+						"] to prepare test instance [" + testInstance + "]", ex);
 				throw ex;
 			}
 		}
@@ -323,7 +333,7 @@ public void prepareTestInstance(Object testInstance) throws Exception {
 	 * {@link Method test method}, for example for setting up test fixtures,
 	 * starting a transaction, etc. Should be called prior to any
 	 * framework-specific <em>before methods</em> (e.g., methods annotated with
-	 * JUnit's {@link org.junit.Before &#064;Before}).
+	 * JUnit's {@link org.junit.Before @Before}).
 	 * <p>The managed {@link TestContext} will be updated with the supplied
 	 * {@code testInstance} and {@code testMethod}.
 	 * <p>An attempt will be made to give each registered
@@ -346,10 +356,11 @@ public void beforeTestMethod(Object testInstance, Method testMethod) throws Exce
 		for (TestExecutionListener testExecutionListener : getTestExecutionListeners()) {
 			try {
 				testExecutionListener.beforeTestMethod(getTestContext());
-			} catch (Exception ex) {
-				logger.warn("Caught exception while allowing TestExecutionListener [" + testExecutionListener
-						+ "] to process 'before' execution of test method [" + testMethod + "] for test instance ["
-						+ testInstance + "]", ex);
+			}
+			catch (Exception ex) {
+				logger.warn("Caught exception while allowing TestExecutionListener [" + testExecutionListener +
+						"] to process 'before' execution of test method [" + testMethod + "] for test instance [" +
+						testInstance + "]", ex);
 				throw ex;
 			}
 		}
@@ -360,7 +371,7 @@ public void beforeTestMethod(Object testInstance, Method testMethod) throws Exce
 	 * {@link Method test method}, for example for tearing down test fixtures,
 	 * ending a transaction, etc. Should be called after any framework-specific
 	 * <em>after methods</em> (e.g., methods annotated with JUnit's
-	 * {@link org.junit.After &#064;After}).
+	 * {@link org.junit.After @After}).
 	 * <p>The managed {@link TestContext} will be updated with the supplied
 	 * {@code testInstance}, {@code testMethod}, and
 	 * {@code exception}.
@@ -382,8 +393,8 @@ public void beforeTestMethod(Object testInstance, Method testMethod) throws Exce
 	public void afterTestMethod(Object testInstance, Method testMethod, Throwable exception) throws Exception {
 		Assert.notNull(testInstance, "testInstance must not be null");
 		if (logger.isTraceEnabled()) {
-			logger.trace("afterTestMethod(): instance [" + testInstance + "], method [" + testMethod + "], exception ["
-					+ exception + "]");
+			logger.trace("afterTestMethod(): instance [" + testInstance + "], method [" + testMethod +
+					"], exception [" + exception + "]");
 		}
 		getTestContext().updateState(testInstance, testMethod, exception);
 
@@ -393,10 +404,11 @@ public void afterTestMethod(Object testInstance, Method testMethod, Throwable ex
 		for (TestExecutionListener testExecutionListener : getReversedTestExecutionListeners()) {
 			try {
 				testExecutionListener.afterTestMethod(getTestContext());
-			} catch (Exception ex) {
-				logger.warn("Caught exception while allowing TestExecutionListener [" + testExecutionListener
-						+ "] to process 'after' execution for test: method [" + testMethod + "], instance ["
-						+ testInstance + "], exception [" + exception + "]", ex);
+			}
+			catch (Exception ex) {
+				logger.warn("Caught exception while allowing TestExecutionListener [" + testExecutionListener +
+						"] to process 'after' execution for test: method [" + testMethod + "], instance [" +
+						testInstance + "], exception [" + exception + "]", ex);
 				if (afterTestMethodException == null) {
 					afterTestMethodException = ex;
 				}
@@ -411,7 +423,7 @@ public void afterTestMethod(Object testInstance, Method testMethod, Throwable ex
 	 * Hook for post-processing a test class <em>after</em> execution of all
 	 * tests within the class. Should be called after any framework-specific
 	 * <em>after class methods</em> (e.g., methods annotated with JUnit's
-	 * {@link org.junit.AfterClass &#064;AfterClass}).
+	 * {@link org.junit.AfterClass @AfterClass}).
 	 * <p>Each registered {@link TestExecutionListener} will be given a chance to
 	 * post-process the test class. If a listener throws an exception, the
 	 * remaining registered listeners will still be called, but the first
@@ -422,9 +434,9 @@ public void afterTestMethod(Object testInstance, Method testMethod, Throwable ex
 	 * @see #getTestExecutionListeners()
 	 */
 	public void afterTestClass() throws Exception {
-		final Class<?> testClass = getTestContext().getTestClass();
+		Class<?> testClass = getTestContext().getTestClass();
 		if (logger.isTraceEnabled()) {
-			logger.trace("afterTestClass(): class [" + testClass + "]");
+			logger.trace("afterTestClass(): class [" + testClass.getName() + "]");
 		}
 		getTestContext().updateState(null, null, null);
 
@@ -434,9 +446,10 @@ public void afterTestClass() throws Exception {
 		for (TestExecutionListener testExecutionListener : getReversedTestExecutionListeners()) {
 			try {
 				testExecutionListener.afterTestClass(getTestContext());
-			} catch (Exception ex) {
-				logger.warn("Caught exception while allowing TestExecutionListener [" + testExecutionListener
-						+ "] to process 'after class' callback for test class [" + testClass + "]", ex);
+			}
+			catch (Exception ex) {
+				logger.warn("Caught exception while allowing TestExecutionListener [" + testExecutionListener +
+						"] to process 'after class' callback for test class [" + testClass + "]", ex);
 				if (afterTestClassException == null) {
 					afterTestClassException = ex;
 				}
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java
index 555892901e..05d35d01df 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
 import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
+import org.springframework.test.context.web.ServletTestExecutionListener;
 
 /**
  * Abstract base test class which integrates the <em>Spring TestContext
@@ -45,6 +46,15 @@
  * the appropriate {@link org.springframework.test.context.TestExecutionListener
  * TestExecutionListeners} manually.</em>
  *
+ * <p>The following {@link org.springframework.test.context.TestExecutionListener
+ * TestExecutionListeners} are configured by default:
+ *
+ * <ul>
+ *   <li>{@link org.springframework.test.context.web.ServletTestExecutionListener}
+ *   <li>{@link org.springframework.test.context.support.DependencyInjectionTestExecutionListener}
+ *   <li>{@link org.springframework.test.context.support.DirtiesContextTestExecutionListener}
+ * </ul>
+ *
  * <p>Note: this class serves only as a convenience for extension. If you do not
  * wish for your test classes to be tied to a Spring-specific class hierarchy,
  * you may configure your own custom test classes by using
@@ -57,11 +67,16 @@
  * @see ContextConfiguration
  * @see TestContext
  * @see TestContextManager
+ * @see TestExecutionListeners
+ * @see ServletTestExecutionListener
+ * @see DependencyInjectionTestExecutionListener
+ * @see DirtiesContextTestExecutionListener
  * @see AbstractTransactionalJUnit4SpringContextTests
  * @see org.springframework.test.context.testng.AbstractTestNGSpringContextTests
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class })
+@TestExecutionListeners({ ServletTestExecutionListener.class, DependencyInjectionTestExecutionListener.class,
+	DirtiesContextTestExecutionListener.class })
 public abstract class AbstractJUnit4SpringContextTests implements ApplicationContextAware {
 
 	/**
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
index 0fc6c6012c..8b497ccce4 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@
 package org.springframework.test.context.support;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextInitializer;
@@ -61,11 +61,12 @@
  */
 public abstract class AbstractContextLoader implements SmartContextLoader {
 
-	private static final Log logger = LogFactory.getLog(AbstractContextLoader.class);
-
 	private static final String[] EMPTY_STRING_ARRAY = new String[0];
+
 	private static final String SLASH = "/";
 
+	private static final Log logger = LogFactory.getLog(AbstractContextLoader.class);
+
 
 	// --- SmartContextLoader -----------------------------------------------
 
@@ -79,23 +80,19 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 	 * processed locations are then
 	 * {@link ContextConfigurationAttributes#setLocations(String[]) set} in
 	 * the supplied configuration attributes.
-	 *
 	 * <p>Can be overridden in subclasses &mdash; for example, to process
 	 * annotated classes instead of resource locations.
-	 *
 	 * @since 3.1
 	 * @see #processLocations(Class, String...)
 	 */
 	public void processContextConfiguration(ContextConfigurationAttributes configAttributes) {
-		String[] processedLocations = processLocations(configAttributes.getDeclaringClass(),
-			configAttributes.getLocations());
+		String[] processedLocations = processLocations(configAttributes.getDeclaringClass(), configAttributes.getLocations());
 		configAttributes.setLocations(processedLocations);
 	}
 
 	/**
 	 * Prepare the {@link ConfigurableApplicationContext} created by this
 	 * {@code SmartContextLoader} <i>before</i> bean definitions are read.
-	 *
 	 * <p>The default implementation:
 	 * <ul>
 	 * <li>Sets the <em>active bean definition profiles</em> from the supplied
@@ -106,45 +103,43 @@ public void processContextConfiguration(ContextConfigurationAttributes configAtt
 	 * {@linkplain ApplicationContextInitializer#initialize invokes each} with the
 	 * given application context.</li>
 	 * </ul>
-	 *
 	 * <p>Any {@code ApplicationContextInitializers} implementing
 	 * {@link org.springframework.core.Ordered Ordered} or marked with {@link
 	 * org.springframework.core.annotation.Order @Order} will be sorted appropriately.
-	 *
 	 * @param context the newly created application context
 	 * @param mergedConfig the merged context configuration
+	 * @since 3.2
 	 * @see ApplicationContextInitializer#initialize(ConfigurableApplicationContext)
 	 * @see #loadContext(MergedContextConfiguration)
 	 * @see ConfigurableApplicationContext#setId
-	 * @since 3.2
 	 */
 	@SuppressWarnings("unchecked")
 	protected void prepareContext(ConfigurableApplicationContext context, MergedContextConfiguration mergedConfig) {
-
 		context.getEnvironment().setActiveProfiles(mergedConfig.getActiveProfiles());
 
-		Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses = mergedConfig.getContextInitializerClasses();
-
-		if (initializerClasses.size() == 0) {
+		Set<Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>>> initializerClasses =
+				mergedConfig.getContextInitializerClasses();
+		if (initializerClasses.isEmpty()) {
 			// no ApplicationContextInitializers have been declared -> nothing to do
 			return;
 		}
 
-		final List<ApplicationContextInitializer<ConfigurableApplicationContext>> initializerInstances = new ArrayList<ApplicationContextInitializer<ConfigurableApplicationContext>>();
-		final Class<?> contextClass = context.getClass();
+		List<ApplicationContextInitializer<ConfigurableApplicationContext>> initializerInstances =
+				new ArrayList<ApplicationContextInitializer<ConfigurableApplicationContext>>();
+		Class<?> contextClass = context.getClass();
 
 		for (Class<? extends ApplicationContextInitializer<? extends ConfigurableApplicationContext>> initializerClass : initializerClasses) {
 			Class<?> initializerContextClass = GenericTypeResolver.resolveTypeArgument(initializerClass,
-				ApplicationContextInitializer.class);
+					ApplicationContextInitializer.class);
 			Assert.isAssignable(initializerContextClass, contextClass, String.format(
-				"Could not add context initializer [%s] since its generic parameter [%s] "
-						+ "is not assignable from the type of application context used by this "
-						+ "context loader [%s]: ", initializerClass.getName(), initializerContextClass.getName(),
-				contextClass.getName()));
+					"Could not add context initializer [%s] since its generic parameter [%s] " +
+							"is not assignable from the type of application context used by this " +
+							"context loader [%s]: ", initializerClass.getName(), initializerContextClass.getName(),
+					contextClass.getName()));
 			initializerInstances.add((ApplicationContextInitializer<ConfigurableApplicationContext>) BeanUtils.instantiateClass(initializerClass));
 		}
 
-		Collections.sort(initializerInstances, new AnnotationAwareOrderComparator());
+		AnnotationAwareOrderComparator.sort(initializerInstances);
 		for (ApplicationContextInitializer<ConfigurableApplicationContext> initializer : initializerInstances) {
 			initializer.initialize(context);
 		}
@@ -161,7 +156,6 @@ protected void prepareContext(ConfigurableApplicationContext context, MergedCont
 	 * {@link #getResourceSuffix() resource suffix}; otherwise, the supplied
 	 * {@code locations} will be {@link #modifyLocations modified} if
 	 * necessary and returned.
-	 *
 	 * @param clazz the class with which the locations are associated: to be
 	 * used when generating default locations
 	 * @param locations the unmodified locations to use for loading the
@@ -175,29 +169,25 @@ protected void prepareContext(ConfigurableApplicationContext context, MergedCont
 	 * @see #processContextConfiguration(ContextConfigurationAttributes)
 	 */
 	public final String[] processLocations(Class<?> clazz, String... locations) {
-		return (ObjectUtils.isEmpty(locations) && isGenerateDefaultLocations()) ? generateDefaultLocations(clazz)
-				: modifyLocations(clazz, locations);
+		return (ObjectUtils.isEmpty(locations) && isGenerateDefaultLocations()) ?
+				generateDefaultLocations(clazz) : modifyLocations(clazz, locations);
 	}
 
 	/**
 	 * Generate the default classpath resource locations array based on the
 	 * supplied class.
-	 *
 	 * <p>For example, if the supplied class is {@code com.example.MyTest},
 	 * the generated locations will contain a single string with a value of
 	 * &quot;classpath:/com/example/MyTest{@code <suffix>}&quot;,
 	 * where {@code <suffix>} is the value of the
 	 * {@link #getResourceSuffix() resource suffix} string.
-	 *
 	 * <p>As of Spring 3.1, the implementation of this method adheres to the
 	 * contract defined in the {@link SmartContextLoader} SPI. Specifically,
 	 * this method will <em>preemptively</em> verify that the generated default
 	 * location actually exists. If it does not exist, this method will log a
 	 * warning and return an empty array.
-	 *
 	 * <p>Subclasses can override this method to implement a different
 	 * <em>default location generation</em> strategy.
-	 *
 	 * @param clazz the class for which the default locations are to be generated
 	 * @return an array of default application context resource locations
 	 * @since 2.5
@@ -213,23 +203,22 @@ protected String[] generateDefaultLocations(Class<?> clazz) {
 
 		if (classPathResource.exists()) {
 			if (logger.isInfoEnabled()) {
-				logger.info(String.format("Detected default resource location \"%s\" for test class [%s].",
-					prefixedResourcePath, clazz.getName()));
+				logger.info(String.format("Detected default resource location \"%s\" for test class [%s]",
+						prefixedResourcePath, clazz.getName()));
 			}
-			return new String[] { prefixedResourcePath };
+			return new String[] {prefixedResourcePath};
 		}
-
-		// else
-		if (logger.isInfoEnabled()) {
-			logger.info(String.format("Could not detect default resource locations for test class [%s]: "
-					+ "%s does not exist.", clazz.getName(), classPathResource));
+		else {
+			if (logger.isInfoEnabled()) {
+				logger.info(String.format("Could not detect default resource locations for test class [%s]: " +
+						"%s does not exist", clazz.getName(), classPathResource));
+			}
+			return EMPTY_STRING_ARRAY;
 		}
-		return EMPTY_STRING_ARRAY;
 	}
 
 	/**
 	 * Generate a modified version of the supplied locations array and return it.
-	 *
 	 * <p>A plain path &mdash; for example, &quot;context.xml&quot; &mdash; will
 	 * be treated as a classpath resource that is relative to the package in which
 	 * the specified class is defined. A path starting with a slash is treated
@@ -239,10 +228,8 @@ protected String[] generateDefaultLocations(Class<?> clazz) {
 	 * {@link ResourceUtils#CLASSPATH_URL_PREFIX classpath:},
 	 * {@link ResourceUtils#FILE_URL_PREFIX file:}, {@code http:},
 	 * etc.) will be added to the results unchanged.
-	 *
 	 * <p>Subclasses can override this method to implement a different
 	 * <em>location modification</em> strategy.
-	 *
 	 * @param clazz the class with which the locations are associated
 	 * @param locations the resource locations to be modified
 	 * @return an array of modified application context resource locations
@@ -254,10 +241,12 @@ protected String[] modifyLocations(Class<?> clazz, String... locations) {
 			String path = locations[i];
 			if (path.startsWith(SLASH)) {
 				modifiedLocations[i] = ResourceUtils.CLASSPATH_URL_PREFIX + path;
-			} else if (!ResourcePatternUtils.isUrl(path)) {
-				modifiedLocations[i] = ResourceUtils.CLASSPATH_URL_PREFIX + SLASH
-						+ StringUtils.cleanPath(ClassUtils.classPackageAsResourcePath(clazz) + SLASH + path);
-			} else {
+			}
+			else if (!ResourcePatternUtils.isUrl(path)) {
+				modifiedLocations[i] = ResourceUtils.CLASSPATH_URL_PREFIX + SLASH +
+						StringUtils.cleanPath(ClassUtils.classPackageAsResourcePath(clazz) + SLASH + path);
+			}
+			else {
 				modifiedLocations[i] = StringUtils.cleanPath(path);
 			}
 		}
@@ -268,7 +257,6 @@ protected String[] modifyLocations(Class<?> clazz, String... locations) {
 	 * Determine whether or not <em>default</em> resource locations should be
 	 * generated if the {@code locations} provided to
 	 * {@link #processLocations(Class, String...)} are {@code null} or empty.
-	 *
 	 * <p>As of Spring 3.1, the semantics of this method have been overloaded
 	 * to include detection of either default resource locations or default
 	 * configuration classes. Consequently, this method can also be used to
@@ -277,9 +265,7 @@ protected String[] modifyLocations(Class<?> clazz, String... locations) {
 	 * {@link ContextConfigurationAttributes configuration attributes} supplied
 	 * to {@link #processContextConfiguration(ContextConfigurationAttributes)}
 	 * are {@code null} or empty.
-	 *
 	 * <p>Can be overridden by subclasses to change the default behavior.
-	 *
 	 * @return always {@code true} by default
 	 * @since 2.5
 	 */
@@ -290,9 +276,7 @@ protected boolean isGenerateDefaultLocations() {
 	/**
 	 * Get the suffix to append to {@link ApplicationContext} resource locations
 	 * when generating default locations.
-	 *
 	 * <p>Must be implemented by subclasses.
-	 *
 	 * @return the resource suffix; should not be {@code null} or empty
 	 * @since 2.5
 	 * @see #generateDefaultLocations(Class)
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.java
index 284e80acf0..edf3415813 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@
  * files nor annotated classes and instead declare only {@linkplain
  * ContextConfiguration#initializers application context initializers}. In such
  * cases, an attempt will still be made to detect defaults, but their absence will
- * not result an an exception.
+ * not result in an exception.
  *
  * @author Sam Brannen
  * @since 3.2
@@ -78,6 +78,7 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
 	 */
 	protected abstract SmartContextLoader getAnnotationConfigLoader();
 
+
 	// --- SmartContextLoader --------------------------------------------------
 
 	private static String name(SmartContextLoader loader) {
@@ -94,6 +95,7 @@ private static void delegateProcessing(SmartContextLoader loader, ContextConfigu
 
 	private static ApplicationContext delegateLoading(SmartContextLoader loader, MergedContextConfiguration mergedConfig)
 			throws Exception {
+
 		if (logger.isDebugEnabled()) {
 			logger.debug(String.format("Delegating to %s to load context from %s.", name(loader), mergedConfig));
 		}
@@ -103,7 +105,8 @@ private static ApplicationContext delegateLoading(SmartContextLoader loader, Mer
 	private boolean supports(SmartContextLoader loader, MergedContextConfiguration mergedConfig) {
 		if (loader == getAnnotationConfigLoader()) {
 			return ObjectUtils.isEmpty(mergedConfig.getLocations()) && !ObjectUtils.isEmpty(mergedConfig.getClasses());
-		} else {
+		}
+		else {
 			return !ObjectUtils.isEmpty(mergedConfig.getLocations()) && ObjectUtils.isEmpty(mergedConfig.getClasses());
 		}
 	}
@@ -111,12 +114,10 @@ private boolean supports(SmartContextLoader loader, MergedContextConfiguration m
 	/**
 	 * Delegates to candidate {@code SmartContextLoaders} to process the supplied
 	 * {@link ContextConfigurationAttributes}.
-	 *
 	 * <p>Delegation is based on explicit knowledge of the implementations of the
 	 * default loaders for {@link #getXmlLoader() XML configuration files} and
 	 * {@link #getAnnotationConfigLoader() annotated classes}. Specifically, the
 	 * delegation algorithm is as follows:
-	 *
 	 * <ul>
 	 * <li>If the resource locations or annotated classes in the supplied
 	 * {@code ContextConfigurationAttributes} are not empty, the appropriate
@@ -131,7 +132,6 @@ private boolean supports(SmartContextLoader loader, MergedContextConfiguration m
 	 * If the annotation-based loader detects default configuration
 	 * classes, an {@code info} message will be logged.</li>
 	 * </ul>
-	 *
 	 * @param configAttributes the context configuration attributes to process
 	 * @throws IllegalArgumentException if the supplied configuration attributes are
 	 * {@code null}, or if the supplied configuration attributes include both
@@ -146,17 +146,19 @@ public void processContextConfiguration(final ContextConfigurationAttributes con
 
 		Assert.notNull(configAttributes, "configAttributes must not be null");
 		Assert.isTrue(!(configAttributes.hasLocations() && configAttributes.hasClasses()), String.format(
-			"Cannot process locations AND classes for context "
-					+ "configuration %s; configure one or the other, but not both.", configAttributes));
+				"Cannot process locations AND classes for context configuration %s; configure one or the other, but not both.",
+				configAttributes));
 
 		// If the original locations or classes were not empty, there's no
 		// need to bother with default detection checks; just let the
 		// appropriate loader process the configuration.
 		if (configAttributes.hasLocations()) {
 			delegateProcessing(getXmlLoader(), configAttributes);
-		} else if (configAttributes.hasClasses()) {
+		}
+		else if (configAttributes.hasClasses()) {
 			delegateProcessing(getAnnotationConfigLoader(), configAttributes);
-		} else {
+		}
+		else {
 			// Else attempt to detect defaults...
 
 			// Let the XML loader process the configuration.
@@ -197,15 +199,15 @@ public void processContextConfiguration(final ContextConfigurationAttributes con
 			// throw an exception.
 			if (!configAttributes.hasResources() && ObjectUtils.isEmpty(configAttributes.getInitializers())) {
 				throw new IllegalStateException(String.format(
-					"Neither %s nor %s was able to detect defaults, and no ApplicationContextInitializers "
-							+ "were declared for context configuration %s", name(getXmlLoader()),
+					"Neither %s nor %s was able to detect defaults, and no ApplicationContextInitializers " +
+							"were declared for context configuration %s", name(getXmlLoader()),
 					name(getAnnotationConfigLoader()), configAttributes));
 			}
 
 			if (configAttributes.hasLocations() && configAttributes.hasClasses()) {
 				String message = String.format(
-					"Configuration error: both default locations AND default configuration classes "
-							+ "were detected for context configuration %s; configure one or the other, but not both.",
+					"Configuration error: both default locations AND default configuration classes " +
+							"were detected for context configuration %s; configure one or the other, but not both.",
 					configAttributes);
 				logger.error(message);
 				throw new IllegalStateException(message);
@@ -216,12 +218,10 @@ public void processContextConfiguration(final ContextConfigurationAttributes con
 	/**
 	 * Delegates to an appropriate candidate {@code SmartContextLoader} to load
 	 * an {@link ApplicationContext}.
-	 *
 	 * <p>Delegation is based on explicit knowledge of the implementations of the
 	 * default loaders for {@link #getXmlLoader() XML configuration files} and
 	 * {@link #getAnnotationConfigLoader() annotated classes}. Specifically, the
 	 * delegation algorithm is as follows:
-	 *
 	 * <ul>
 	 * <li>If the resource locations in the supplied {@code MergedContextConfiguration}
 	 * are not empty and the annotated classes are empty,
@@ -230,7 +230,6 @@ public void processContextConfiguration(final ContextConfigurationAttributes con
 	 * are not empty and the resource locations are empty,
 	 * the annotation-based loader will load the {@code ApplicationContext}.</li>
 	 * </ul>
-	 *
 	 * @param mergedConfig the merged context configuration to use to load the application context
 	 * @throws IllegalArgumentException if the supplied merged configuration is {@code null}
 	 * @throws IllegalStateException if neither candidate loader is capable of loading an
@@ -238,7 +237,6 @@ public void processContextConfiguration(final ContextConfigurationAttributes con
 	 */
 	public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) throws Exception {
 		Assert.notNull(mergedConfig, "mergedConfig must not be null");
-
 		List<SmartContextLoader> candidates = Arrays.asList(getXmlLoader(), getAnnotationConfigLoader());
 
 		for (SmartContextLoader loader : candidates) {
@@ -260,6 +258,7 @@ public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) t
 			name(getAnnotationConfigLoader()), mergedConfig));
 	}
 
+
 	// --- ContextLoader -------------------------------------------------------
 
 	/**
@@ -269,8 +268,8 @@ public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) t
 	 * @throws UnsupportedOperationException
 	 */
 	public final String[] processLocations(Class<?> clazz, String... locations) {
-		throw new UnsupportedOperationException("DelegatingSmartContextLoaders do not support the ContextLoader SPI. "
-				+ "Call processContextConfiguration(ContextConfigurationAttributes) instead.");
+		throw new UnsupportedOperationException("DelegatingSmartContextLoaders do not support the ContextLoader SPI. " +
+				"Call processContextConfiguration(ContextConfigurationAttributes) instead.");
 	}
 
 	/**
@@ -280,8 +279,8 @@ public final String[] processLocations(Class<?> clazz, String... locations) {
 	 * @throws UnsupportedOperationException
 	 */
 	public final ApplicationContext loadContext(String... locations) throws Exception {
-		throw new UnsupportedOperationException("DelegatingSmartContextLoaders do not support the ContextLoader SPI. "
-				+ "Call loadContext(MergedContextConfiguration) instead.");
+		throw new UnsupportedOperationException("DelegatingSmartContextLoaders do not support the ContextLoader SPI. " +
+				"Call loadContext(MergedContextConfiguration) instead.");
 	}
 
 }
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java
index f192a194ca..0cdbe30f23 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoaderUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.SmartContextLoader;
 import org.springframework.util.Assert;
@@ -38,22 +39,10 @@ public abstract class AnnotationConfigContextLoaderUtils {
 	private static final Log logger = LogFactory.getLog(AnnotationConfigContextLoaderUtils.class);
 
 
-	private AnnotationConfigContextLoaderUtils() {
-		/* no-op */
-	}
-
-	private static boolean isStaticNonPrivateAndNonFinal(Class<?> clazz) {
-		Assert.notNull(clazz, "Class must not be null");
-		int modifiers = clazz.getModifiers();
-		return (Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) && !Modifier.isFinal(modifiers));
-	}
-
 	/**
 	 * Determine if the supplied {@link Class} meets the criteria for being
 	 * considered a <em>default configuration class</em> candidate.
-	 *
 	 * <p>Specifically, such candidates:
-	 *
 	 * <ul>
 	 * <li>must not be {@code null}</li>
 	 * <li>must not be {@code private}</li>
@@ -61,7 +50,6 @@ private static boolean isStaticNonPrivateAndNonFinal(Class<?> clazz) {
 	 * <li>must be {@code static}</li>
 	 * <li>must be annotated with {@code @Configuration}</li>
 	 * </ul>
-	 *
 	 * @param clazz the class to check
 	 * @return {@code true} if the supplied class meets the candidate criteria
 	 */
@@ -69,38 +57,42 @@ private static boolean isDefaultConfigurationClassCandidate(Class<?> clazz) {
 		return clazz != null && isStaticNonPrivateAndNonFinal(clazz) && clazz.isAnnotationPresent(Configuration.class);
 	}
 
+	private static boolean isStaticNonPrivateAndNonFinal(Class<?> clazz) {
+		Assert.notNull(clazz, "Class must not be null");
+		int modifiers = clazz.getModifiers();
+		return (Modifier.isStatic(modifiers) && !Modifier.isPrivate(modifiers) && !Modifier.isFinal(modifiers));
+	}
+
 	/**
 	 * Detect the default configuration classes for the supplied test class.
-	 *
 	 * <p>The returned class array will contain all static inner classes of
 	 * the supplied class that meet the requirements for {@code @Configuration}
 	 * class implementations as specified in the documentation for
 	 * {@link Configuration @Configuration}.
-	 *
 	 * <p>The implementation of this method adheres to the contract defined in the
 	 * {@link org.springframework.test.context.SmartContextLoader SmartContextLoader}
 	 * SPI. Specifically, this method uses introspection to detect default
 	 * configuration classes that comply with the constraints required of
 	 * {@code @Configuration} class implementations. If a potential candidate
 	 * configuration class does not meet these requirements, this method will log a
-	 * warning, and the potential candidate class will be ignored.
+	 * debug message, and the potential candidate class will be ignored.
 	 * @param declaringClass the test class that declared {@code @ContextConfiguration}
 	 * @return an array of default configuration classes, potentially empty but
 	 * never {@code null}
 	 */
 	public static Class<?>[] detectDefaultConfigurationClasses(Class<?> declaringClass) {
 		Assert.notNull(declaringClass, "Declaring class must not be null");
-
 		List<Class<?>> configClasses = new ArrayList<Class<?>>();
 
 		for (Class<?> candidate : declaringClass.getDeclaredClasses()) {
 			if (isDefaultConfigurationClassCandidate(candidate)) {
 				configClasses.add(candidate);
-			} else {
+			}
+			else {
 				if (logger.isDebugEnabled()) {
 					logger.debug(String.format(
-						"Ignoring class [%s]; it must be static, non-private, non-final, and annotated "
-								+ "with @Configuration to be considered a default configuration class.",
+						"Ignoring class [%s]; it must be static, non-private, non-final, and annotated " +
+								"with @Configuration to be considered a default configuration class.",
 						candidate.getName()));
 				}
 			}
@@ -108,9 +100,9 @@ public static Class<?>[] detectDefaultConfigurationClasses(Class<?> declaringCla
 
 		if (configClasses.isEmpty()) {
 			if (logger.isInfoEnabled()) {
-				logger.info(String.format("Could not detect default configuration classes for test class [%s]: "
-						+ "%s does not declare any static, non-private, non-final, inner classes "
-						+ "annotated with @Configuration.", declaringClass.getName(), declaringClass.getSimpleName()));
+				logger.info(String.format("Could not detect default configuration classes for test class [%s]: " +
+						"%s does not declare any static, non-private, non-final, inner classes " +
+						"annotated with @Configuration.", declaringClass.getName(), declaringClass.getSimpleName()));
 			}
 		}
 
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java
index f865d532da..f2a45a46e3 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java
@@ -20,6 +20,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
@@ -47,8 +48,8 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi
 	 * Marks the {@linkplain ApplicationContext application context} of the supplied
 	 * {@linkplain TestContext test context} as
 	 * {@linkplain TestContext#markApplicationContextDirty() dirty}, and sets the
-	 * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE
-	 * REINJECT_DEPENDENCIES_ATTRIBUTE} in the test context to {@code true}.
+	 * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE}
+	 * in the test context to {@code true}.
 	 * @param testContext the test context whose application context should
 	 * marked as dirty
 	 * @deprecated as of Spring 3.2.2, use {@link #dirtyContext(TestContext, HierarchyMode)} instead.
@@ -61,10 +62,10 @@ protected void dirtyContext(TestContext testContext) {
 
 	/**
 	 * Marks the {@linkplain ApplicationContext application context} of the supplied
-	 * {@linkplain TestContext test context} as {@linkplain
-	 * TestContext#markApplicationContextDirty(HierarchyMode) dirty} and sets the
-	 * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE
-	 * REINJECT_DEPENDENCIES_ATTRIBUTE} in the test context to {@code true}.
+	 * {@linkplain TestContext test context} as
+	 * {@linkplain TestContext#markApplicationContextDirty(DirtiesContext.HierarchyMode) dirty}
+	 * and sets {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE}
+	 * in the test context to {@code true}.
 	 * @param testContext the test context whose application context should
 	 * marked as dirty
 	 * @param hierarchyMode the context cache clearing mode to be applied if the
@@ -85,9 +86,8 @@ protected void dirtyContext(TestContext testContext, HierarchyMode hierarchyMode
 	 * AFTER_EACH_TEST_METHOD}, the {@linkplain ApplicationContext application
 	 * context} of the test context will be
 	 * {@linkplain TestContext#markApplicationContextDirty() marked as dirty} and the
-	 * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE
-	 * REINJECT_DEPENDENCIES_ATTRIBUTE} in the test context will be set to
-	 * {@code true}.
+	 * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE}
+	 * in the test context will be set to {@code true}.
 	 */
 	@Override
 	public void afterTestMethod(TestContext testContext) throws Exception {
diff --git a/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java
index e7964d1eaa..80c74a5bb5 100644
--- a/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
 import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
+import org.springframework.test.context.web.ServletTestExecutionListener;
 
 import org.testng.IHookCallBack;
 import org.testng.IHookable;
@@ -59,16 +60,30 @@
  * {@code super();}.</li>
  * </ul>
  *
+ * <p>The following {@link org.springframework.test.context.TestExecutionListener
+ * TestExecutionListeners} are configured by default:
+ *
+ * <ul>
+ *   <li>{@link org.springframework.test.context.web.ServletTestExecutionListener}
+ *   <li>{@link org.springframework.test.context.support.DependencyInjectionTestExecutionListener}
+ *   <li>{@link org.springframework.test.context.support.DirtiesContextTestExecutionListener}
+ * </ul>
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
+ * @see ContextConfiguration
  * @see TestContext
  * @see TestContextManager
  * @see TestExecutionListeners
+ * @see ServletTestExecutionListener
+ * @see DependencyInjectionTestExecutionListener
+ * @see DirtiesContextTestExecutionListener
  * @see AbstractTransactionalTestNGSpringContextTests
  * @see org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests
  */
-@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class })
+@TestExecutionListeners({ ServletTestExecutionListener.class, DependencyInjectionTestExecutionListener.class,
+	DirtiesContextTestExecutionListener.class })
 public abstract class AbstractTestNGSpringContextTests implements IHookable, ApplicationContextAware {
 
 	/** Logger available to subclasses */
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
index 7858d9201f..5166f8ceeb 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,16 +20,19 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.Conventions;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.test.context.TestContext;
 import org.springframework.test.context.TestExecutionListener;
 import org.springframework.test.context.support.AbstractTestExecutionListener;
+import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
+import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletWebRequest;
@@ -51,20 +54,44 @@
  * #afterTestMethod(TestContext) cleans up} thread-local state.
  *
  * <p>Note that {@code ServletTestExecutionListener} is enabled by default but
- * takes no action if the {@link ApplicationContext} loaded for the current test
- * is not a {@link WebApplicationContext}.
+ * generally takes no action if the {@linkplain TestContext#getTestClass() test
+ * class} is not annotated with {@link WebAppConfiguration @WebAppConfiguration}.
+ * See the Javadoc for individual methods in this class for details.
  *
  * @author Sam Brannen
  * @since 3.2
  */
 public class ServletTestExecutionListener extends AbstractTestExecutionListener {
 
+	/**
+	 * Attribute name for a {@link TestContext} attribute which indicates
+	 * whether or not the {@code ServletTestExecutionListener} should {@linkplain
+	 * RequestContextHolder#resetRequestAttributes() reset} Spring Web's
+	 * {@code RequestContextHolder} in {@link #afterTestMethod(TestContext)}.
+	 *
+	 * <p>Permissible values include {@link Boolean#TRUE} and {@link Boolean#FALSE}.
+	 */
+	public static final String RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE = Conventions.getQualifiedAttributeName(
+		ServletTestExecutionListener.class, "resetRequestContextHolder");
+
+	/**
+	 * Attribute name for a {@link TestContext} attribute which indicates that
+	 * {@code ServletTestExecutionListener} has already populated Spring Web's
+	 * {@code RequestContextHolder}.
+	 *
+	 * <p>Permissible values include {@link Boolean#TRUE} and {@link Boolean#FALSE}.
+	 */
+	public static final String POPULATED_REQUEST_CONTEXT_HOLDER_ATTRIBUTE = Conventions.getQualifiedAttributeName(
+		ServletTestExecutionListener.class, "populatedRequestContextHolder");
+
 	private static final Log logger = LogFactory.getLog(ServletTestExecutionListener.class);
 
 
 	/**
 	 * Sets up thread-local state during the <em>test instance preparation</em>
-	 * callback phase via Spring Web's {@link RequestContextHolder}.
+	 * callback phase via Spring Web's {@link RequestContextHolder}, but only if
+	 * the {@linkplain TestContext#getTestClass() test class} is annotated with
+	 * {@link WebAppConfiguration @WebAppConfiguration}.
 	 *
 	 * @see TestExecutionListener#prepareTestInstance(TestContext)
 	 * @see #setUpRequestContextIfNecessary(TestContext)
@@ -76,7 +103,9 @@ public void prepareTestInstance(TestContext testContext) throws Exception {
 
 	/**
 	 * Sets up thread-local state before each test method via Spring Web's
-	 * {@link RequestContextHolder}.
+	 * {@link RequestContextHolder}, but only if the
+	 * {@linkplain TestContext#getTestClass() test class} is annotated with
+	 * {@link WebAppConfiguration @WebAppConfiguration}.
 	 *
 	 * @see TestExecutionListener#beforeTestMethod(TestContext)
 	 * @see #setUpRequestContextIfNecessary(TestContext)
@@ -87,31 +116,55 @@ public void beforeTestMethod(TestContext testContext) throws Exception {
 	}
 
 	/**
-	 * Cleans up thread-local state after each test method by {@linkplain
+	 * If the {@link #RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE} in the supplied
+	 * {@code TestContext} has a value of {@link Boolean#TRUE}, this method will
+	 * (1) clean up thread-local state after each test method by {@linkplain
 	 * RequestContextHolder#resetRequestAttributes() resetting} Spring Web's
-	 * {@code RequestContextHolder}.
+	 * {@code RequestContextHolder} and (2) ensure that new mocks are injected
+	 * into the test instance for subsequent tests by setting the
+	 * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE}
+	 * in the test context to {@code true}.
+	 *
+	 * <p>The {@link #RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE} and
+	 * {@link #POPULATED_REQUEST_CONTEXT_HOLDER_ATTRIBUTE} will be subsequently
+	 * removed from the test context, regardless of their values.
 	 *
 	 * @see TestExecutionListener#afterTestMethod(TestContext)
 	 */
 	public void afterTestMethod(TestContext testContext) throws Exception {
-		if (logger.isDebugEnabled()) {
-			logger.debug(String.format("Resetting RequestContextHolder for test context %s.", testContext));
+		if (Boolean.TRUE.equals(testContext.getAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE))) {
+			if (logger.isDebugEnabled()) {
+				logger.debug(String.format("Resetting RequestContextHolder for test context %s.", testContext));
+			}
+			RequestContextHolder.resetRequestAttributes();
+			testContext.setAttribute(DependencyInjectionTestExecutionListener.REINJECT_DEPENDENCIES_ATTRIBUTE,
+				Boolean.TRUE);
 		}
-		RequestContextHolder.resetRequestAttributes();
+		testContext.removeAttribute(POPULATED_REQUEST_CONTEXT_HOLDER_ATTRIBUTE);
+		testContext.removeAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE);
+	}
+
+	private boolean notAnnotatedWithWebAppConfiguration(TestContext testContext) {
+		return AnnotationUtils.findAnnotation(testContext.getTestClass(), WebAppConfiguration.class) == null;
+	}
+
+	private boolean alreadyPopulatedRequestContextHolder(TestContext testContext) {
+		return Boolean.TRUE.equals(testContext.getAttribute(POPULATED_REQUEST_CONTEXT_HOLDER_ATTRIBUTE));
 	}
 
 	private void setUpRequestContextIfNecessary(TestContext testContext) {
+		if (notAnnotatedWithWebAppConfiguration(testContext) || alreadyPopulatedRequestContextHolder(testContext)) {
+			return;
+		}
 
 		ApplicationContext context = testContext.getApplicationContext();
 
 		if (context instanceof WebApplicationContext) {
 			WebApplicationContext wac = (WebApplicationContext) context;
 			ServletContext servletContext = wac.getServletContext();
-			if (!(servletContext instanceof MockServletContext)) {
-				throw new IllegalStateException(String.format(
-					"The WebApplicationContext for test context %s must be configured with a MockServletContext.",
-					testContext));
-			}
+			Assert.state(servletContext instanceof MockServletContext, String.format(
+				"The WebApplicationContext for test context %s must be configured with a MockServletContext.",
+				testContext));
 
 			if (logger.isDebugEnabled()) {
 				logger.debug(String.format(
@@ -119,21 +172,21 @@ private void setUpRequestContextIfNecessary(TestContext testContext) {
 					testContext));
 			}
 
-			if (RequestContextHolder.getRequestAttributes() == null) {
-				MockServletContext mockServletContext = (MockServletContext) servletContext;
-				MockHttpServletRequest request = new MockHttpServletRequest(mockServletContext);
-				MockHttpServletResponse response = new MockHttpServletResponse();
-				ServletWebRequest servletWebRequest = new ServletWebRequest(request, response);
-
-				RequestContextHolder.setRequestAttributes(servletWebRequest);
-
-				if (wac instanceof ConfigurableApplicationContext) {
-					@SuppressWarnings("resource")
-					ConfigurableApplicationContext configurableApplicationContext = (ConfigurableApplicationContext) wac;
-					ConfigurableListableBeanFactory bf = configurableApplicationContext.getBeanFactory();
-					bf.registerResolvableDependency(MockHttpServletResponse.class, response);
-					bf.registerResolvableDependency(ServletWebRequest.class, servletWebRequest);
-				}
+			MockServletContext mockServletContext = (MockServletContext) servletContext;
+			MockHttpServletRequest request = new MockHttpServletRequest(mockServletContext);
+			MockHttpServletResponse response = new MockHttpServletResponse();
+			ServletWebRequest servletWebRequest = new ServletWebRequest(request, response);
+
+			RequestContextHolder.setRequestAttributes(servletWebRequest);
+			testContext.setAttribute(POPULATED_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
+			testContext.setAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
+
+			if (wac instanceof ConfigurableApplicationContext) {
+				@SuppressWarnings("resource")
+				ConfigurableApplicationContext configurableApplicationContext = (ConfigurableApplicationContext) wac;
+				ConfigurableListableBeanFactory bf = configurableApplicationContext.getBeanFactory();
+				bf.registerResolvableDependency(MockHttpServletResponse.class, response);
+				bf.registerResolvableDependency(ServletWebRequest.class, servletWebRequest);
 			}
 		}
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java
index ecedda4ddf..9553efc834 100644
--- a/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java
@@ -225,29 +225,6 @@ public void resolveContextHierarchyAttributesForTestClassHierarchyWithMultiLevel
 		assertThat(configAttributesListClassLevel3.get(2).getLocations()[0], equalTo("3-C.xml"));
 	}
 
-	private void assertContextConfigEntriesAreNotUnique(Class<?> testClass) {
-		try {
-			resolveContextHierarchyAttributes(testClass);
-			fail("Should throw an IllegalStateException");
-		}
-		catch (IllegalStateException e) {
-			String msg = String.format(
-				"The @ContextConfiguration elements configured via @ContextHierarchy in test class [%s] must define unique contexts to load.",
-				testClass.getName());
-			assertEquals(msg, e.getMessage());
-		}
-	}
-
-	@Test
-	public void resolveContextHierarchyAttributesForSingleTestClassWithMultiLevelContextHierarchyWithEmptyContextConfig() {
-		assertContextConfigEntriesAreNotUnique(SingleTestClassWithMultiLevelContextHierarchyWithEmptyContextConfig.class);
-	}
-
-	@Test
-	public void resolveContextHierarchyAttributesForSingleTestClassWithMultiLevelContextHierarchyWithDuplicatedContextConfig() {
-		assertContextConfigEntriesAreNotUnique(SingleTestClassWithMultiLevelContextHierarchyWithDuplicatedContextConfig.class);
-	}
-
 	@Test
 	public void buildContextHierarchyMapForTestClassHierarchyWithMultiLevelContextHierarchies() {
 		Map<String, List<ContextConfigurationAttributes>> map = buildContextHierarchyMap(TestClass3WithMultiLevelContextHierarchy.class);
@@ -335,6 +312,58 @@ public void buildContextHierarchyMapForTestClassHierarchyWithMultiLevelContextHi
 		assertThat(level3Config.get(0).getLocations()[0], is("2-C.xml"));
 	}
 
+	private void assertContextConfigEntriesAreNotUnique(Class<?> testClass) {
+		try {
+			buildContextHierarchyMap(testClass);
+			fail("Should throw an IllegalStateException");
+		}
+		catch (IllegalStateException e) {
+			String msg = String.format(
+				"The @ContextConfiguration elements configured via @ContextHierarchy in test class [%s] and its superclasses must define unique contexts per hierarchy level.",
+				testClass.getName());
+			assertEquals(msg, e.getMessage());
+		}
+	}
+
+	@Test
+	public void buildContextHierarchyMapForSingleTestClassWithMultiLevelContextHierarchyWithEmptyContextConfig() {
+		assertContextConfigEntriesAreNotUnique(SingleTestClassWithMultiLevelContextHierarchyWithEmptyContextConfig.class);
+	}
+
+	@Test
+	public void buildContextHierarchyMapForSingleTestClassWithMultiLevelContextHierarchyWithDuplicatedContextConfig() {
+		assertContextConfigEntriesAreNotUnique(SingleTestClassWithMultiLevelContextHierarchyWithDuplicatedContextConfig.class);
+	}
+
+	/**
+	 * Used to reproduce bug reported in https://jira.springsource.org/browse/SPR-10997
+	 */
+	@Test
+	public void buildContextHierarchyMapForTestClassHierarchyWithMultiLevelContextHierarchiesAndOverriddenInitializers() {
+		Map<String, List<ContextConfigurationAttributes>> map = buildContextHierarchyMap(TestClass2WithMultiLevelContextHierarchyWithOverriddenInitializers.class);
+
+		assertThat(map.size(), is(2));
+		assertThat(map.keySet(), hasItems("alpha", "beta"));
+
+		List<ContextConfigurationAttributes> alphaConfig = map.get("alpha");
+		assertThat(alphaConfig.size(), is(2));
+		assertThat(alphaConfig.get(0).getLocations().length, is(1));
+		assertThat(alphaConfig.get(0).getLocations()[0], is("1-A.xml"));
+		assertThat(alphaConfig.get(0).getInitializers().length, is(0));
+		assertThat(alphaConfig.get(1).getLocations().length, is(0));
+		assertThat(alphaConfig.get(1).getInitializers().length, is(1));
+		assertEquals(DummyApplicationContextInitializer.class, alphaConfig.get(1).getInitializers()[0]);
+
+		List<ContextConfigurationAttributes> betaConfig = map.get("beta");
+		assertThat(betaConfig.size(), is(2));
+		assertThat(betaConfig.get(0).getLocations().length, is(1));
+		assertThat(betaConfig.get(0).getLocations()[0], is("1-B.xml"));
+		assertThat(betaConfig.get(0).getInitializers().length, is(0));
+		assertThat(betaConfig.get(1).getLocations().length, is(0));
+		assertThat(betaConfig.get(1).getInitializers().length, is(1));
+		assertEquals(DummyApplicationContextInitializer.class, betaConfig.get(1).getInitializers()[0]);
+	}
+
 	@Test(expected = IllegalStateException.class)
 	public void resolveConfigAttributesWithConflictingLocations() {
 		resolveContextConfigurationAttributes(ConflictingLocations.class);
@@ -843,4 +872,40 @@ private static class SingleTestClassWithMultiLevelContextHierarchyWithEmptyConte
 	private static class SingleTestClassWithMultiLevelContextHierarchyWithDuplicatedContextConfig {
 	}
 
+	/**
+	 * Used to reproduce bug reported in https://jira.springsource.org/browse/SPR-10997
+	 */
+	@ContextHierarchy({//
+	//
+		@ContextConfiguration(name = "alpha", locations = "1-A.xml"),//
+		@ContextConfiguration(name = "beta", locations = "1-B.xml") //
+	})
+	private static class TestClass1WithMultiLevelContextHierarchyWithUniqueContextConfig {
+	}
+
+	/**
+	 * Used to reproduce bug reported in https://jira.springsource.org/browse/SPR-10997
+	 */
+	@ContextHierarchy({//
+	//
+		@ContextConfiguration(name = "alpha", initializers = DummyApplicationContextInitializer.class),//
+		@ContextConfiguration(name = "beta", initializers = DummyApplicationContextInitializer.class) //
+	})
+	private static class TestClass2WithMultiLevelContextHierarchyWithOverriddenInitializers extends
+			TestClass1WithMultiLevelContextHierarchyWithUniqueContextConfig {
+	}
+
+	/**
+	 * Used to reproduce bug reported in https://jira.springsource.org/browse/SPR-10997
+	 */
+	private static class DummyApplicationContextInitializer implements
+			ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+		@Override
+		public void initialize(ConfigurableApplicationContext applicationContext) {
+			/* no-op */
+		}
+
+	}
+
 }
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java
index 5ada9b5c61..1469cc3549 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4;
 
-import org.springframework.jdbc.BadSqlGrammarException;
+import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 import org.springframework.test.annotation.NotTransactional;
 import org.springframework.test.context.ContextConfiguration;
@@ -54,7 +54,7 @@ protected static void createPersonTable(SimpleJdbcTemplate simpleJdbcTemplate) {
 		try {
 			simpleJdbcTemplate.update("CREATE TABLE person (name VARCHAR(20) NOT NULL, PRIMARY KEY(name))");
 		}
-		catch (BadSqlGrammarException bsge) {
+		catch (DataAccessException dae) {
 			// ignore
 		}
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
index c88aed37d1..bd7ce8116e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
@@ -16,31 +16,28 @@
 
 package org.springframework.test.context.junit4;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.test.transaction.TransactionTestUtils.assertInTransaction;
-import static org.springframework.test.transaction.TransactionTestUtils.inTransaction;
-
 import javax.annotation.Resource;
 import javax.sql.DataSource;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.tests.sample.beans.Employee;
-import org.springframework.tests.sample.beans.Pet;
+
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.BadSqlGrammarException;
+import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 import org.springframework.test.annotation.NotTransactional;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
 import org.springframework.test.jdbc.SimpleJdbcTestUtils;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
+
+import static org.junit.Assert.*;
+import static org.springframework.test.transaction.TransactionTestUtils.*;
 
 /**
  * Combined integration test for {@link AbstractJUnit4SpringContextTests} and
@@ -87,7 +84,7 @@ protected static void createPersonTable(final SimpleJdbcTemplate simpleJdbcTempl
 		try {
 			simpleJdbcTemplate.update("CREATE TABLE person (name VARCHAR(20) NOT NULL, PRIMARY KEY(name))");
 		}
-		catch (final BadSqlGrammarException bsge) {
+		catch (DataAccessException dae) {
 			/* ignore */
 		}
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/web/ServletTestExecutionListenerTestNGIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/web/ServletTestExecutionListenerTestNGIntegrationTests.java
new file mode 100644
index 0000000000..55aa29e75e
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/web/ServletTestExecutionListenerTestNGIntegrationTests.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.testng.web;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.springframework.test.context.web.ServletTestExecutionListener;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.testng.annotations.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * TestNG-based integration tests for {@link ServletTestExecutionListener}.
+ *
+ * @author Sam Brannen
+ * @since 3.2.9
+ * @see org.springframework.test.context.web.ServletTestExecutionListenerJUnitIntegrationTests
+ */
+@ContextConfiguration
+@WebAppConfiguration
+public class ServletTestExecutionListenerTestNGIntegrationTests extends AbstractTestNGSpringContextTests {
+
+	@Configuration
+	static class Config {
+		/* no beans required for this test */
+	}
+
+
+	@Autowired
+	private MockHttpServletRequest servletRequest;
+
+
+	/**
+	 * Verifies bug fix for <a href="https://jira.spring.io/browse/SPR-11626">SPR-11626</a>.
+	 *
+	 * @see #ensureMocksAreReinjectedBetweenTests_2
+	 */
+	@Test
+	public void ensureMocksAreReinjectedBetweenTests_1() {
+		assertInjectedServletRequestEqualsRequestInRequestContextHolder();
+	}
+
+	/**
+	 * Verifies bug fix for <a href="https://jira.spring.io/browse/SPR-11626">SPR-11626</a>.
+	 *
+	 * @see #ensureMocksAreReinjectedBetweenTests_1
+	 */
+	@Test
+	public void ensureMocksAreReinjectedBetweenTests_2() {
+		assertInjectedServletRequestEqualsRequestInRequestContextHolder();
+	}
+
+	private void assertInjectedServletRequestEqualsRequestInRequestContextHolder() {
+		assertEquals("Injected ServletRequest must be stored in the RequestContextHolder", servletRequest,
+			((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+	}
+
+}
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/web/TestNGSpringContextWebTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/web/TestNGSpringContextWebTests.java
new file mode 100644
index 0000000000..05f398895e
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/web/TestNGSpringContextWebTests.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.testng.web;
+
+import java.io.File;
+
+import javax.servlet.ServletContext;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.mock.web.MockHttpSession;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.web.context.ServletContextAware;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.request.ServletWebRequest;
+import org.testng.annotations.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * TestNG-based integration tests that verify support for loading a
+ * {@link WebApplicationContext} when extending {@link AbstractTestNGSpringContextTests}.
+ *
+ * @author Sam Brannen
+ * @since 3.2.7
+ */
+@ContextConfiguration
+@WebAppConfiguration
+public class TestNGSpringContextWebTests extends AbstractTestNGSpringContextTests implements ServletContextAware {
+
+	@Configuration
+	static class Config {
+
+		@Bean
+		public String foo() {
+			return "enigma";
+		}
+	}
+
+
+	protected ServletContext servletContext;
+
+	@Autowired
+	protected WebApplicationContext wac;
+
+	@Autowired
+	protected MockServletContext mockServletContext;
+
+	@Autowired
+	protected MockHttpServletRequest request;
+
+	@Autowired
+	protected MockHttpServletResponse response;
+
+	@Autowired
+	protected MockHttpSession session;
+
+	@Autowired
+	protected ServletWebRequest webRequest;
+
+	@Autowired
+	protected String foo;
+
+
+	@Override
+	public void setServletContext(ServletContext servletContext) {
+		this.servletContext = servletContext;
+	}
+
+	@Test
+	public void basicWacFeatures() throws Exception {
+		assertNotNull("ServletContext should be set in the WAC.", wac.getServletContext());
+
+		assertNotNull("ServletContext should have been set via ServletContextAware.", servletContext);
+
+		assertNotNull("ServletContext should have been autowired from the WAC.", mockServletContext);
+		assertNotNull("MockHttpServletRequest should have been autowired from the WAC.", request);
+		assertNotNull("MockHttpServletResponse should have been autowired from the WAC.", response);
+		assertNotNull("MockHttpSession should have been autowired from the WAC.", session);
+		assertNotNull("ServletWebRequest should have been autowired from the WAC.", webRequest);
+
+		Object rootWac = mockServletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
+		assertNotNull("Root WAC must be stored in the ServletContext as: "
+				+ WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, rootWac);
+		assertSame("test WAC and Root WAC in ServletContext must be the same object.", wac, rootWac);
+		assertSame("ServletContext instances must be the same object.", mockServletContext, wac.getServletContext());
+		assertSame("ServletContext in the WAC and in the mock request", mockServletContext, request.getServletContext());
+
+		assertEquals("Getting real path for ServletContext resource.",
+			new File("src/main/webapp/index.jsp").getCanonicalPath(), mockServletContext.getRealPath("index.jsp"));
+
+	}
+
+	@Test
+	public void fooEnigmaAutowired() {
+		assertEquals("enigma", foo);
+	}
+
+}
diff --git a/spring-test/src/test/java/org/springframework/test/context/web/JUnit4SpringContextWebTests.java b/spring-test/src/test/java/org/springframework/test/context/web/JUnit4SpringContextWebTests.java
new file mode 100644
index 0000000000..c1133bdc67
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/web/JUnit4SpringContextWebTests.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.web;
+
+import java.io.File;
+
+import javax.servlet.ServletContext;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.mock.web.MockHttpSession;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import org.springframework.web.context.ServletContextAware;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.request.ServletWebRequest;
+
+import static org.junit.Assert.*;
+
+/**
+ * JUnit-based integration tests that verify support for loading a
+ * {@link WebApplicationContext} when extending {@link AbstractJUnit4SpringContextTests}.
+ *
+ * @author Sam Brannen
+ * @since 3.2.7
+ */
+@ContextConfiguration
+@WebAppConfiguration
+public class JUnit4SpringContextWebTests extends AbstractJUnit4SpringContextTests implements ServletContextAware {
+
+	@Configuration
+	static class Config {
+
+		@Bean
+		public String foo() {
+			return "enigma";
+		}
+	}
+
+
+	protected ServletContext servletContext;
+
+	@Autowired
+	protected WebApplicationContext wac;
+
+	@Autowired
+	protected MockServletContext mockServletContext;
+
+	@Autowired
+	protected MockHttpServletRequest request;
+
+	@Autowired
+	protected MockHttpServletResponse response;
+
+	@Autowired
+	protected MockHttpSession session;
+
+	@Autowired
+	protected ServletWebRequest webRequest;
+
+	@Autowired
+	protected String foo;
+
+
+	@Override
+	public void setServletContext(ServletContext servletContext) {
+		this.servletContext = servletContext;
+	}
+
+	@Test
+	public void basicWacFeatures() throws Exception {
+		assertNotNull("ServletContext should be set in the WAC.", wac.getServletContext());
+
+		assertNotNull("ServletContext should have been set via ServletContextAware.", servletContext);
+
+		assertNotNull("ServletContext should have been autowired from the WAC.", mockServletContext);
+		assertNotNull("MockHttpServletRequest should have been autowired from the WAC.", request);
+		assertNotNull("MockHttpServletResponse should have been autowired from the WAC.", response);
+		assertNotNull("MockHttpSession should have been autowired from the WAC.", session);
+		assertNotNull("ServletWebRequest should have been autowired from the WAC.", webRequest);
+
+		Object rootWac = mockServletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
+		assertNotNull("Root WAC must be stored in the ServletContext as: "
+				+ WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, rootWac);
+		assertSame("test WAC and Root WAC in ServletContext must be the same object.", wac, rootWac);
+		assertSame("ServletContext instances must be the same object.", mockServletContext, wac.getServletContext());
+		assertSame("ServletContext in the WAC and in the mock request", mockServletContext, request.getServletContext());
+
+		assertEquals("Getting real path for ServletContext resource.",
+			new File("src/main/webapp/index.jsp").getCanonicalPath(), mockServletContext.getRealPath("index.jsp"));
+
+	}
+
+	@Test
+	public void fooEnigmaAutowired() {
+		assertEquals("enigma", foo);
+	}
+
+}
diff --git a/spring-test/src/test/java/org/springframework/test/context/web/ServletTestExecutionListenerJUnitIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/web/ServletTestExecutionListenerJUnitIntegrationTests.java
new file mode 100644
index 0000000000..f8dfa2c955
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/web/ServletTestExecutionListenerJUnitIntegrationTests.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.web;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import static org.junit.Assert.*;
+
+/**
+ * JUnit-based integration tests for {@link ServletTestExecutionListener}.
+ *
+ * @author Sam Brannen
+ * @since 3.2.9
+ * @see org.springframework.test.context.testng.web.ServletTestExecutionListenerTestNGIntegrationTests
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+@WebAppConfiguration
+public class ServletTestExecutionListenerJUnitIntegrationTests {
+
+	@Configuration
+	static class Config {
+		/* no beans required for this test */
+	}
+
+
+	@Autowired
+	private MockHttpServletRequest servletRequest;
+
+
+	/**
+	 * Verifies bug fix for <a href="https://jira.spring.io/browse/SPR-11626">SPR-11626</a>.
+	 *
+	 * @see #ensureMocksAreReinjectedBetweenTests_2
+	 */
+	@Test
+	public void ensureMocksAreReinjectedBetweenTests_1() {
+		assertInjectedServletRequestEqualsRequestInRequestContextHolder();
+	}
+
+	/**
+	 * Verifies bug fix for <a href="https://jira.spring.io/browse/SPR-11626">SPR-11626</a>.
+	 *
+	 * @see #ensureMocksAreReinjectedBetweenTests_1
+	 */
+	@Test
+	public void ensureMocksAreReinjectedBetweenTests_2() {
+		assertInjectedServletRequestEqualsRequestInRequestContextHolder();
+	}
+
+	private void assertInjectedServletRequestEqualsRequestInRequestContextHolder() {
+		assertEquals("Injected ServletRequest must be stored in the RequestContextHolder", servletRequest,
+			((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+	}
+
+}
diff --git a/spring-test/src/test/java/org/springframework/test/context/web/ServletTestExecutionListenerTests.java b/spring-test/src/test/java/org/springframework/test/context/web/ServletTestExecutionListenerTests.java
new file mode 100644
index 0000000000..54b23941c9
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/web/ServletTestExecutionListenerTests.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.web;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.test.context.TestContext;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletWebRequest;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+import static org.springframework.test.context.web.ServletTestExecutionListener.*;
+
+/**
+ * Unit tests for {@link ServletTestExecutionListener}.
+ *
+ * @author Sam Brannen
+ * @since 3.2.6
+ */
+public class ServletTestExecutionListenerTests {
+
+	private static final String SET_UP_OUTSIDE_OF_STEL = "SET_UP_OUTSIDE_OF_STEL";
+
+	private final WebApplicationContext wac = mock(WebApplicationContext.class);
+	private final MockServletContext mockServletContext = new MockServletContext();
+	private final TestContext testContext = mock(TestContext.class);
+	private final ServletTestExecutionListener listener = new ServletTestExecutionListener();
+
+
+	private void assertAttributesAvailable() {
+		assertNotNull("request attributes should be available", RequestContextHolder.getRequestAttributes());
+	}
+
+	private void assertAttributesNotAvailable() {
+		assertNull("request attributes should not be available", RequestContextHolder.getRequestAttributes());
+	}
+
+	private void assertAttributeExists() {
+		RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+		assertNotNull("request attributes should exist", requestAttributes);
+		Object setUpOutsideOfStel = requestAttributes.getAttribute(SET_UP_OUTSIDE_OF_STEL,
+			RequestAttributes.SCOPE_REQUEST);
+		assertNotNull(SET_UP_OUTSIDE_OF_STEL + " should exist as a request attribute", setUpOutsideOfStel);
+	}
+
+	private void assertAttributeDoesNotExist() {
+		RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+		assertNotNull("request attributes should exist", requestAttributes);
+		Object setUpOutsideOfStel = requestAttributes.getAttribute(SET_UP_OUTSIDE_OF_STEL,
+			RequestAttributes.SCOPE_REQUEST);
+		assertNull(SET_UP_OUTSIDE_OF_STEL + " should NOT exist as a request attribute", setUpOutsideOfStel);
+	}
+
+	@Before
+	public void setUp() {
+		when(wac.getServletContext()).thenReturn(mockServletContext);
+		when(testContext.getApplicationContext()).thenReturn(wac);
+
+		MockHttpServletRequest request = new MockHttpServletRequest(mockServletContext);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		ServletWebRequest servletWebRequest = new ServletWebRequest(request, response);
+
+		request.setAttribute(SET_UP_OUTSIDE_OF_STEL, "true");
+
+		RequestContextHolder.setRequestAttributes(servletWebRequest);
+		assertAttributeExists();
+	}
+
+	@Test
+	public void standardApplicationContext() throws Exception {
+		Mockito.<Class<?>> when(testContext.getTestClass()).thenReturn(getClass());
+		when(testContext.getApplicationContext()).thenReturn(mock(ApplicationContext.class));
+
+		listener.beforeTestClass(testContext);
+		assertAttributeExists();
+
+		listener.prepareTestInstance(testContext);
+		assertAttributeExists();
+
+		listener.beforeTestMethod(testContext);
+		assertAttributeExists();
+
+		listener.afterTestMethod(testContext);
+		assertAttributeExists();
+	}
+
+	@Test
+	public void legacyWebTestCaseWithoutExistingRequestAttributes() throws Exception {
+		Mockito.<Class<?>> when(testContext.getTestClass()).thenReturn(LegacyWebTestCase.class);
+
+		RequestContextHolder.resetRequestAttributes();
+		assertAttributesNotAvailable();
+
+		listener.beforeTestClass(testContext);
+
+		listener.prepareTestInstance(testContext);
+		assertAttributesNotAvailable();
+		verify(testContext, times(0)).setAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
+		when(testContext.getAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE)).thenReturn(null);
+
+		listener.beforeTestMethod(testContext);
+		assertAttributesNotAvailable();
+		verify(testContext, times(0)).setAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
+
+		listener.afterTestMethod(testContext);
+		verify(testContext, times(1)).removeAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE);
+		assertAttributesNotAvailable();
+	}
+
+	@Test
+	public void legacyWebTestCaseWithPresetRequestAttributes() throws Exception {
+		Mockito.<Class<?>> when(testContext.getTestClass()).thenReturn(LegacyWebTestCase.class);
+
+		listener.beforeTestClass(testContext);
+		assertAttributeExists();
+
+		listener.prepareTestInstance(testContext);
+		assertAttributeExists();
+		verify(testContext, times(0)).setAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
+		when(testContext.getAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE)).thenReturn(null);
+
+		listener.beforeTestMethod(testContext);
+		assertAttributeExists();
+		verify(testContext, times(0)).setAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
+		when(testContext.getAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE)).thenReturn(null);
+
+		listener.afterTestMethod(testContext);
+		verify(testContext, times(1)).removeAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE);
+		assertAttributeExists();
+	}
+
+	@Test
+	public void atWebAppConfigTestCaseWithoutExistingRequestAttributes() throws Exception {
+		Mockito.<Class<?>> when(testContext.getTestClass()).thenReturn(AtWebAppConfigWebTestCase.class);
+
+		RequestContextHolder.resetRequestAttributes();
+		listener.beforeTestClass(testContext);
+		assertAttributesNotAvailable();
+
+		assertWebAppConfigTestCase();
+	}
+
+	@Test
+	public void atWebAppConfigTestCaseWithPresetRequestAttributes() throws Exception {
+		Mockito.<Class<?>> when(testContext.getTestClass()).thenReturn(AtWebAppConfigWebTestCase.class);
+
+		listener.beforeTestClass(testContext);
+		assertAttributesAvailable();
+
+		assertWebAppConfigTestCase();
+	}
+
+	private void assertWebAppConfigTestCase() throws Exception {
+		listener.prepareTestInstance(testContext);
+		assertAttributeDoesNotExist();
+		verify(testContext, times(1)).setAttribute(POPULATED_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
+		verify(testContext, times(1)).setAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
+		when(testContext.getAttribute(POPULATED_REQUEST_CONTEXT_HOLDER_ATTRIBUTE)).thenReturn(Boolean.TRUE);
+		when(testContext.getAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE)).thenReturn(Boolean.TRUE);
+
+		listener.beforeTestMethod(testContext);
+		assertAttributeDoesNotExist();
+		verify(testContext, times(1)).setAttribute(POPULATED_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
+		verify(testContext, times(1)).setAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
+
+		listener.afterTestMethod(testContext);
+		verify(testContext).removeAttribute(POPULATED_REQUEST_CONTEXT_HOLDER_ATTRIBUTE);
+		verify(testContext).removeAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE);
+		assertAttributesNotAvailable();
+	}
+
+
+	static class LegacyWebTestCase {
+	}
+
+	@WebAppConfiguration
+	static class AtWebAppConfigWebTestCase {
+	}
+
+}
diff --git a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java
index e60638b20f..00533c2e7d 100644
--- a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java
+++ b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,13 +40,12 @@
  * candidate exceptions.
  *
 
- * <p>All of Spring's applicable resource factories (e.g. {@link
- * org.springframework.orm.hibernate3.LocalSessionFactoryBean LocalSessionFactoryBean},
- * {@link org.springframework.orm.jpa.LocalEntityManagerFactoryBean
- * LocalEntityManagerFactoryBean}) implement the {@code PersistenceExceptionTranslator}
- * interface out of the box. As a consequence, all that is usually needed to enable
- * automatic exception translation is marking all affected beans (such as Repositories or
- * DAOs) with the {@code @Repository} annotation, along with defining this post-processor
+ * <p>All of Spring's applicable resource factories (e.g.
+ * {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean})
+ * implement the {@code PersistenceExceptionTranslator} interface out of the box.
+ * As a consequence, all that is usually needed to enable automatic exception
+ * translation is marking all affected beans (such as Repositories or DAOs)
+ * with the {@code @Repository} annotation, along with defining this post-processor
  * as a bean in the application context.
  *
  * @author Rod Johnson
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java b/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java
index d4c086695e..1427eb0a5b 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -122,7 +122,7 @@ public static <T> T requiredUniqueResult(Collection<T> results) throws Incorrect
 	/**
 	 * Return a unique result object from the given Collection.
 	 * Throws an exception if 0 or more than 1 result objects found,
-	 * of if the unique result object is not convertable to the
+	 * of if the unique result object is not convertible to the
 	 * specified required type.
 	 * @param results the result Collection (can be {@code null})
 	 * @return the unique result object
@@ -162,7 +162,7 @@ else if (Number.class.isAssignableFrom(requiredType) && Number.class.isInstance(
 	/**
 	 * Return a unique int result from the given Collection.
 	 * Throws an exception if 0 or more than 1 result objects found,
-	 * of if the unique result object is not convertable to an int.
+	 * of if the unique result object is not convertible to an int.
 	 * @param results the result Collection (can be {@code null})
 	 * @return the unique int result
 	 * @throws IncorrectResultSizeDataAccessException if more than one
@@ -170,7 +170,7 @@ else if (Number.class.isAssignableFrom(requiredType) && Number.class.isInstance(
 	 * @throws EmptyResultDataAccessException if no result object
 	 * at all has been found in the given Collection
 	 * @throws TypeMismatchDataAccessException if the unique object
-	 * in the collection is not convertable to an int
+	 * in the collection is not convertible to an int
 	 */
 	public static int intResult(Collection results)
 			throws IncorrectResultSizeDataAccessException, TypeMismatchDataAccessException {
@@ -181,7 +181,7 @@ public static int intResult(Collection results)
 	/**
 	 * Return a unique long result from the given Collection.
 	 * Throws an exception if 0 or more than 1 result objects found,
-	 * of if the unique result object is not convertable to a long.
+	 * of if the unique result object is not convertible to a long.
 	 * @param results the result Collection (can be {@code null})
 	 * @return the unique long result
 	 * @throws IncorrectResultSizeDataAccessException if more than one
@@ -189,7 +189,7 @@ public static int intResult(Collection results)
 	 * @throws EmptyResultDataAccessException if no result object
 	 * at all has been found in the given Collection
 	 * @throws TypeMismatchDataAccessException if the unique object
-	 * in the collection is not convertable to a long
+	 * in the collection is not convertible to a long
 	 */
 	public static long longResult(Collection results)
 			throws IncorrectResultSizeDataAccessException, TypeMismatchDataAccessException {
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java
index aa7d38943d..96d4740142 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@
 import org.springframework.transaction.TransactionSystemException;
 import org.springframework.transaction.support.AbstractPlatformTransactionManager;
 import org.springframework.transaction.support.DefaultTransactionStatus;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.transaction.support.ResourceTransactionManager;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
  * {@link org.springframework.transaction.PlatformTransactionManager} implementation
@@ -124,7 +124,7 @@ public Object getResourceFactory() {
 	protected Object doGetTransaction() {
 		CciLocalTransactionObject txObject = new CciLocalTransactionObject();
 		ConnectionHolder conHolder =
-			(ConnectionHolder) TransactionSynchronizationManager.getResource(getConnectionFactory());
+				(ConnectionHolder) TransactionSynchronizationManager.getResource(getConnectionFactory());
 		txObject.setConnectionHolder(conHolder);
 		return txObject;
 	}
@@ -139,7 +139,6 @@ protected boolean isExistingTransaction(Object transaction) {
 	@Override
 	protected void doBegin(Object transaction, TransactionDefinition definition) {
 		CciLocalTransactionObject txObject = (CciLocalTransactionObject) transaction;
-
 		Connection con = null;
 
 		try {
@@ -158,7 +157,6 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 			}
 			TransactionSynchronizationManager.bindResource(getConnectionFactory(), txObject.getConnectionHolder());
 		}
-
 		catch (NotSupportedException ex) {
 			ConnectionFactoryUtils.releaseConnection(con, getConnectionFactory());
 			throw new CannotCreateTransactionException("CCI Connection does not support local transactions", ex);
@@ -167,7 +165,7 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 			ConnectionFactoryUtils.releaseConnection(con, getConnectionFactory());
 			throw new CannotCreateTransactionException("Could not begin local CCI transaction", ex);
 		}
-		catch (ResourceException ex) {
+		catch (Throwable ex) {
 			ConnectionFactoryUtils.releaseConnection(con, getConnectionFactory());
 			throw new TransactionSystemException("Unexpected failure on begin of CCI local transaction", ex);
 		}
@@ -267,7 +265,7 @@ public void setConnectionHolder(ConnectionHolder connectionHolder) {
 		}
 
 		public ConnectionHolder getConnectionHolder() {
-			return connectionHolder;
+			return this.connectionHolder;
 		}
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/glassfish/GlassFishWorkManagerTaskExecutor.java b/spring-tx/src/main/java/org/springframework/jca/work/glassfish/GlassFishWorkManagerTaskExecutor.java
index 431884514d..a026b11145 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/glassfish/GlassFishWorkManagerTaskExecutor.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/glassfish/GlassFishWorkManagerTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,12 +43,12 @@ public class GlassFishWorkManagerTaskExecutor extends WorkManagerTaskExecutor {
 
 	public GlassFishWorkManagerTaskExecutor() {
 		try {
-			Class wmf = getClass().getClassLoader().loadClass(WORK_MANAGER_FACTORY_CLASS);
-			this.getWorkManagerMethod = wmf.getMethod("getWorkManager", new Class[] {String.class});
+			Class<?> wmf = getClass().getClassLoader().loadClass(WORK_MANAGER_FACTORY_CLASS);
+			this.getWorkManagerMethod = wmf.getMethod("getWorkManager", String.class);
 		}
 		catch (Exception ex) {
 			throw new IllegalStateException(
-					"Could not initialize GlassFishWorkManagerTaskExecutor because GlassFish API is not available: " + ex);
+					"Could not initialize GlassFishWorkManagerTaskExecutor because GlassFish API is not available", ex);
 		}
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerTaskExecutor.java b/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerTaskExecutor.java
index 5abb09231b..cc60566501 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerTaskExecutor.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,10 @@
  * {@link org.springframework.scheduling.commonj.WorkManagerTaskExecutor}
  * adapter for WebLogic and WebSphere.
  *
+ * <p><b>Note: This class does not work on JBoss 7 or higher.</b>
+ * There is no known immediate replacement, since JBoss does not want
+ * its JCA WorkManager to be exposed anymore.
+ *
  * @author Juergen Hoeller
  * @since 2.5.2
  * @see org.jboss.resource.work.JBossWorkManagerMBean
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerUtils.java b/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerUtils.java
index 7c2757b600..c2cddcd798 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerUtils.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/jboss/JBossWorkManagerUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ public static WorkManager getWorkManager(String mbeanName) {
 		}
 		catch (Exception ex) {
 			throw new IllegalStateException(
-					"Could not initialize JBossWorkManagerTaskExecutor because JBoss API is not available: " + ex);
+					"Could not initialize JBossWorkManagerTaskExecutor because JBoss API is not available", ex);
 		}
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java
index 43518ee930..2af9b448ce 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java
@@ -83,7 +83,7 @@ public Throwable getOriginalException() {
 	}
 
 	@Override
-	public boolean contains(Class exType) {
+	public boolean contains(Class<?> exType) {
 		return super.contains(exType) || (exType != null && exType.isInstance(this.applicationException));
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
index d5ea077155..970693f9cc 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 /**
  * Abstract base {@code @Configuration} class providing common structure for enabling
@@ -38,26 +38,30 @@
 public abstract class AbstractTransactionManagementConfiguration implements ImportAware {
 
 	protected AnnotationAttributes enableTx;
+
+	/**
+	 * Default transaction manager, as configured through a {@link TransactionManagementConfigurer}.
+	 */
 	protected PlatformTransactionManager txManager;
 
+
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		this.enableTx = AnnotationAttributes.fromMap(
 				importMetadata.getAnnotationAttributes(EnableTransactionManagement.class.getName(), false));
-		Assert.notNull(this.enableTx,
-				"@EnableTransactionManagement is not present on importing class " +
-				importMetadata.getClassName());
+		if (this.enableTx == null) {
+			throw new IllegalArgumentException(
+					"@EnableTransactionManagement is not present on importing class " + importMetadata.getClassName());
+		}
 	}
 
-	@Autowired(required=false)
+	@Autowired(required = false)
 	void setConfigurers(Collection<TransactionManagementConfigurer> configurers) {
-		if (configurers == null || configurers.isEmpty()) {
+		if (CollectionUtils.isEmpty(configurers)) {
 			return;
 		}
-
 		if (configurers.size() > 1) {
-			throw new IllegalStateException("only one TransactionManagementConfigurer may exist");
+			throw new IllegalStateException("Only one TransactionManagementConfigurer may exist");
 		}
-
 		TransactionManagementConfigurer configurer = configurers.iterator().next();
 		this.txManager = configurer.annotationDrivenTransactionManager();
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
index aa51af07e7..565e857f15 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -145,7 +145,6 @@
 	 * opposed to standard Java interface-based proxies ({@code false}). The default is
 	 * {@code false}. <strong>Applicable only if {@link #mode()} is set to
 	 * {@link AdviceMode#PROXY}</strong>.
-	 *
 	 * <p>Note that setting this attribute to {@code true} will affect <em>all</em>
 	 * Spring-managed beans requiring proxying, not just those marked with
 	 * {@code @Transactional}. For example, other beans marked with Spring's
@@ -168,4 +167,5 @@
 	 * The default is {@link Ordered#LOWEST_PRECEDENCE}.
 	 */
 	int order() default Ordered.LOWEST_PRECEDENCE;
+
 }
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java
index c1602479b4..616551c67b 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 
 /**
- * {@code @Configuration} class that registers the Spring infrastructure beans necessary
- * to enable proxy-based annotation-driven transaction management.
+ * {@code @Configuration} class that registers the Spring infrastructure beans
+ * necessary to enable proxy-based annotation-driven transaction management.
  *
  * @author Chris Beams
  * @since 3.1
@@ -37,11 +37,10 @@
 @Configuration
 public class ProxyTransactionManagementConfiguration extends AbstractTransactionManagementConfiguration {
 
-	@Bean(name=TransactionManagementConfigUtils.TRANSACTION_ADVISOR_BEAN_NAME)
+	@Bean(name = TransactionManagementConfigUtils.TRANSACTION_ADVISOR_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public BeanFactoryTransactionAttributeSourceAdvisor transactionAdvisor() {
-		BeanFactoryTransactionAttributeSourceAdvisor advisor =
-			new BeanFactoryTransactionAttributeSourceAdvisor();
+		BeanFactoryTransactionAttributeSourceAdvisor advisor = new BeanFactoryTransactionAttributeSourceAdvisor();
 		advisor.setTransactionAttributeSource(transactionAttributeSource());
 		advisor.setAdvice(transactionInterceptor());
 		advisor.setOrder(this.enableTx.<Integer>getNumber("order"));
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java
index a12be89d71..145791f7a2 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,8 +32,7 @@
  * @see ProxyTransactionManagementConfiguration
  * @see TransactionManagementConfigUtils#TRANSACTION_ASPECT_CONFIGURATION_CLASS_NAME
  */
-public class TransactionManagementConfigurationSelector
-		extends AdviceModeImportSelector<EnableTransactionManagement> {
+public class TransactionManagementConfigurationSelector extends AdviceModeImportSelector<EnableTransactionManagement> {
 
 	/**
 	 * {@inheritDoc}
@@ -45,13 +44,12 @@ public class TransactionManagementConfigurationSelector
 	protected String[] selectImports(AdviceMode adviceMode) {
 		switch (adviceMode) {
 			case PROXY:
-				return new String[] { AutoProxyRegistrar.class.getName(), ProxyTransactionManagementConfiguration.class.getName() };
+				return new String[] {AutoProxyRegistrar.class.getName(), ProxyTransactionManagementConfiguration.class.getName()};
 			case ASPECTJ:
-				return new String[] { TransactionManagementConfigUtils.TRANSACTION_ASPECT_CONFIGURATION_CLASS_NAME };
+				return new String[] {TransactionManagementConfigUtils.TRANSACTION_ASPECT_CONFIGURATION_CLASS_NAME};
 			default:
 				return null;
 		}
 	}
 
-
 }
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
index 62bbe0ee15..1c7d432960 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,19 +20,21 @@
 
 /**
  * Interface to be implemented by @{@link org.springframework.context.annotation.Configuration
- * Configuration} classes annotated with @{@link EnableTransactionManagement} that wish
- * or need to specify explicitly the {@link PlatformTransactionManager} bean to be used
- * for annotation-driven transaction management, as opposed to the default approach of a
- * by-type lookup. One reason this might be necessary is if there are two
+ * Configuration} classes annotated with @{@link EnableTransactionManagement} that wish to
+ * or need to explicitly specify the default {@link PlatformTransactionManager} bean to be
+ * used for annotation-driven transaction management, as opposed to the default approach
+ * of a by-type lookup. One reason this might be necessary is if there are two
  * {@code PlatformTransactionManager} beans present in the container.
  *
- * <p>See @{@link EnableTransactionManagement} for general examples and context; see
- * {@link #annotationDrivenTransactionManager()} for detailed instructions.
+ * <p>See @{@link EnableTransactionManagement} for general examples and context;
+ * see {@link #annotationDrivenTransactionManager()} for detailed instructions.
  *
  * <p>Note that in by-type lookup disambiguation cases, an alternative approach to
- * implementing this interface is to simply mark one of the offending {@code
- * PlatformTransactionManager} {@code @Bean} methods as @{@link
- * org.springframework.context.annotation.Primary Primary}.
+ * implementing this interface is to simply mark one of the offending
+ * {@code PlatformTransactionManager} {@code @Bean} methods as
+ * @{@link org.springframework.context.annotation.Primary Primary}.
+ * This is even generally preferred since it doesn't lead to early initialization
+ * of the {@code PlatformTransactionManager} bean.
  *
  * @author Chris Beams
  * @since 3.1
@@ -42,9 +44,8 @@
 public interface TransactionManagementConfigurer {
 
 	/**
-	 * Return the transaction manager bean to use for annotation-driven database
+	 * Return the default transaction manager bean to use for annotation-driven database
 	 * transaction management, i.e. when processing {@code @Transactional} methods.
-	 *
 	 * <p>There are two basic approaches to implementing this method:
 	 * <h3>1. Implement the method and annotate it with {@code @Bean}</h3>
 	 * In this case, the implementing {@code @Configuration} class implements this method,
@@ -68,15 +69,13 @@ public interface TransactionManagementConfigurer {
 	 * public PlatformTransactionManager annotationDrivenTransactionManager() {
 	 *     return txManager(); // reference the existing {@code @Bean} method above
 	 * }</pre>
-	 *
-	 * If taking approach #2, be sure that <em>only one</em> of the methods is marked with
-	 * {@code @Bean}!
-	 *
+	 * If taking approach #2, be sure that <em>only one</em> of the methods is marked
+	 * with {@code @Bean}!
 	 * <p>In either scenario #1 or #2, it is important that the
 	 * {@code PlatformTransactionManager} instance is managed as a Spring bean within the
-	 * container as all {@code PlatformTransactionManager} implementations take
-	 * advantage of Spring lifecycle callbacks such as {@code InitializingBean} and {@code
-	 * BeanFactoryAware}.
+	 * container as all {@code PlatformTransactionManager} implementations take advantage
+	 * of Spring lifecycle callbacks such as {@code InitializingBean} and
+	 * {@code BeanFactoryAware}.
 	 */
 	PlatformTransactionManager annotationDrivenTransactionManager();
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java b/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java
index 07bea12ee5..d37e0c8c92 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;
 import org.springframework.transaction.interceptor.BeanFactoryTransactionAttributeSourceAdvisor;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 
@@ -117,7 +116,8 @@ public static void configureAutoProxyCreator(Element element, ParserContext pars
 				Object eleSource = parserContext.extractSource(element);
 
 				// Create the TransactionAttributeSource definition.
-				RootBeanDefinition sourceDef = new RootBeanDefinition(AnnotationTransactionAttributeSource.class);
+				RootBeanDefinition sourceDef = new RootBeanDefinition(
+						"org.springframework.transaction.annotation.AnnotationTransactionAttributeSource");
 				sourceDef.setSource(eleSource);
 				sourceDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 				String sourceName = parserContext.getReaderContext().registerWithGeneratedName(sourceDef);
diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java b/spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java
index 744a57ebf0..ff95d77aa2 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,12 @@
 
 package org.springframework.transaction.config;
 
+/**
+ * Configuration constants for internal sharing across subpackages.
+ *
+ * @author Chris Beams
+ * @since 3.1
+ */
 public abstract class TransactionManagementConfigUtils {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java b/spring-tx/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java
index 7883b719e9..c727c770ab 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;
 import org.springframework.transaction.interceptor.NameMatchTransactionAttributeSource;
 import org.springframework.transaction.interceptor.NoRollbackRuleAttribute;
 import org.springframework.transaction.interceptor.RollbackRuleAttribute;
@@ -90,7 +89,7 @@ else if (txAttributes.size() == 1) {
 		else {
 			// Assume annotations source.
 			builder.addPropertyValue("transactionAttributeSource",
-					new RootBeanDefinition(AnnotationTransactionAttributeSource.class));
+					new RootBeanDefinition("org.springframework.transaction.annotation.AnnotationTransactionAttributeSource"));
 		}
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
index a8762beeb5..c9f9656bb1 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -103,7 +103,9 @@ public TransactionAttribute getTransactionAttribute(Method method, Class<?> targ
 			}
 			else {
 				if (logger.isDebugEnabled()) {
-					logger.debug("Adding transactional method '" + method.getName() + "' with attribute: " + txAtt);
+					Class<?> classToLog = (targetClass != null ? targetClass : method.getDeclaringClass());
+					logger.debug("Adding transactional method '" + classToLog.getSimpleName() + "." +
+							method.getName() + "' with attribute: " + txAtt);
 				}
 				this.attributeCache.put(cacheKey, txAtt);
 			}
@@ -202,9 +204,9 @@ private static class DefaultCacheKey {
 
 		private final Method method;
 
-		private final Class targetClass;
+		private final Class<?> targetClass;
 
-		public DefaultCacheKey(Method method, Class targetClass) {
+		public DefaultCacheKey(Method method, Class<?> targetClass) {
 			this.method = method;
 			this.targetClass = targetClass;
 		}
@@ -224,7 +226,7 @@ public boolean equals(Object other) {
 
 		@Override
 		public int hashCode() {
-			return this.method.hashCode() * 29 + (this.targetClass != null ? this.targetClass.hashCode() : 0);
+			return this.method.hashCode() + (this.targetClass != null ? this.targetClass.hashCode() * 29 : 0);
 		}
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java
index f505b8bf5c..0dbc19e1c1 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,11 @@
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
 /**
- * Transaction attribute that takes the EJB approach to rolling
- * back on runtime, but not checked, exceptions.
+ * Spring's common transaction attribute implementation.
+ * Rolls back on runtime, but not checked, exceptions by default.
  *
  * @author Rod Johnson
+ * @author Juergen Hoeller
  * @since 16.03.2003
  */
 @SuppressWarnings("serial")
@@ -57,7 +58,7 @@ public DefaultTransactionAttribute(TransactionAttribute other) {
 	}
 
 	/**
-	 * Create a new DefaultTransactionAttribute with the the given
+	 * Create a new DefaultTransactionAttribute with the given
 	 * propagation behavior. Can be modified through bean property setters.
 	 * @param propagationBehavior one of the propagation constants in the
 	 * TransactionDefinition interface
@@ -74,6 +75,7 @@ public DefaultTransactionAttribute(int propagationBehavior) {
 	 * Associate a qualifier value with this transaction attribute.
 	 * <p>This may be used for choosing a corresponding transaction manager
 	 * to process this specific transaction.
+	 * @since 3.0
 	 */
 	public void setQualifier(String qualifier) {
 		this.qualifier = qualifier;
@@ -81,6 +83,7 @@ public void setQualifier(String qualifier) {
 
 	/**
 	 * Return a qualifier value associated with this transaction attribute.
+	 * @since 3.0
 	 */
 	public String getQualifier() {
 		return this.qualifier;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
index 0f605308ad..c7267cd9d7 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
 
 package org.springframework.transaction.interceptor;
 
-import org.springframework.util.Assert;
-
 import java.io.Serializable;
 
+import org.springframework.util.Assert;
+
 /**
  * Rule determining whether or not a given exception (and any subclasses)
  * should cause a rollback.
@@ -59,8 +59,8 @@ public class RollbackRuleAttribute implements Serializable{
 	 * @throws IllegalArgumentException if the supplied {@code clazz} is
 	 * not a {@code Throwable} type or is {@code null}
 	 */
-	public RollbackRuleAttribute(Class clazz) {
-		Assert.notNull(clazz, "'clazz' cannot be null.");
+	public RollbackRuleAttribute(Class<?> clazz) {
+		Assert.notNull(clazz, "'clazz' cannot be null");
 		if (!Throwable.class.isAssignableFrom(clazz)) {
 			throw new IllegalArgumentException(
 					"Cannot construct rollback rule from [" + clazz.getName() + "]: it's not a Throwable");
@@ -87,7 +87,7 @@ public RollbackRuleAttribute(Class clazz) {
 	 * {@code exceptionName} is {@code null} or empty
 	 */
 	public RollbackRuleAttribute(String exceptionName) {
-		Assert.hasText(exceptionName, "'exceptionName' cannot be null or empty.");
+		Assert.hasText(exceptionName, "'exceptionName' cannot be null or empty");
 		this.exceptionName = exceptionName;
 	}
 
@@ -110,8 +110,8 @@ public int getDepth(Throwable ex) {
 	}
 
 
-	private int getDepth(Class exceptionClass, int depth) {
-		if (exceptionClass.getName().indexOf(this.exceptionName) != -1) {
+	private int getDepth(Class<?> exceptionClass, int depth) {
+		if (exceptionClass.getName().contains(this.exceptionName)) {
 			// Found it!
 			return depth;
 		}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
index 62b408e155..87bca4fd26 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,9 +69,7 @@
  *
  * <p>The "preInterceptors" and "postInterceptors" properties can be set to add
  * additional interceptors to the mix, like
- * {@link org.springframework.aop.interceptor.PerformanceMonitorInterceptor} or
- * {@link org.springframework.orm.hibernate3.HibernateInterceptor} /
- * {@link org.springframework.orm.jdo.JdoInterceptor}.
+ * {@link org.springframework.aop.interceptor.PerformanceMonitorInterceptor}.
  *
  * <p><b>HINT:</b> This class is often used with parent / child bean definitions.
  * Typically, you will define the transaction manager and default transaction
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java
index 35f30be7f7..967eb2fc29 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@
 import org.springframework.transaction.support.DefaultTransactionStatus;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -80,29 +81,28 @@
  * Almost all Java EE servers expose it, but do so as extension to EE. There might be some
  * issues with compatibility, despite the TransactionManager interface being part of JTA.
  * As a consequence, Spring provides various vendor-specific PlatformTransactionManagers,
- * which are recommended to be used if appropriate: {@link WebLogicJtaTransactionManager},
- * {@link WebSphereUowTransactionManager} and {@link OC4JJtaTransactionManager}.
- * For all other Java EE servers, the standard JtaTransactionManager is sufficient.
+ * which are recommended to be used if appropriate: {@link WebLogicJtaTransactionManager}
+ * and {@link WebSphereUowTransactionManager}. For all other Java EE servers, the
+ * standard JtaTransactionManager is sufficient.
  *
  * <p>This pure JtaTransactionManager class supports timeouts but not per-transaction
  * isolation levels. Custom subclasses may override the {@link #doJtaBegin} method for
- * specific JTA extensions in order to provide this functionality; Spring includes
- * corresponding {@link WebLogicJtaTransactionManager} and {@link OC4JJtaTransactionManager}
- * classes, for BEA's WebLogic Server and Oracle's OC4J, respectively. Such adapters
- * for specific Java EE transaction coordinators may also expose transaction names for
- * monitoring; with standard JTA, transaction names will simply be ignored.
+ * specific JTA extensions in order to provide this functionality; Spring includes a
+ * corresponding {@link WebLogicJtaTransactionManager} class for WebLogic Server. Such
+ * adapters for specific Java EE transaction coordinators may also expose transaction
+ * names for monitoring; with standard JTA, transaction names will simply be ignored.
  *
  * <p><b>Consider using Spring's {@code tx:jta-transaction-manager} configuration
  * element for automatically picking the appropriate JTA platform transaction manager
- * (automatically detecting WebLogic, WebSphere and OC4J).</b>
+ * (automatically detecting WebLogic and WebSphere).</b>
  *
  * <p>JTA 1.1 adds the TransactionSynchronizationRegistry facility, as public Java EE 5
  * API in addition to the standard JTA UserTransaction handle. As of Spring 2.5, this
  * JtaTransactionManager autodetects the TransactionSynchronizationRegistry and uses
  * it for registering Spring-managed synchronizations when participating in an existing
  * JTA transaction (e.g. controlled by EJB CMT). If no TransactionSynchronizationRegistry
- * is available (or the JTA 1.1 API isn't available), then such synchronizations
- * will be registered via the (non-EE) JTA TransactionManager handle.
+ * is available (or the JTA 1.1 API isn't available), then such synchronizations will be
+ * registered via the (non-EE) JTA TransactionManager handle.
  *
  * <p>This class is serializable. However, active synchronizations do not survive serialization.
  *
@@ -154,9 +154,9 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 	private static Class<?> transactionSynchronizationRegistryClass;
 
 	static {
-		ClassLoader cl = JtaTransactionManager.class.getClassLoader();
 		try {
-			transactionSynchronizationRegistryClass = cl.loadClass(TRANSACTION_SYNCHRONIZATION_REGISTRY_CLASS_NAME);
+			transactionSynchronizationRegistryClass = ClassUtils.forName(
+					TRANSACTION_SYNCHRONIZATION_REGISTRY_CLASS_NAME, JtaTransactionManager.class.getClassLoader());
 		}
 		catch (ClassNotFoundException ex) {
 			// JTA 1.1 API not available... simply proceed the JTA 1.0 way.
@@ -345,7 +345,7 @@ public void setTransactionManager(TransactionManager transactionManager) {
 	}
 
 	/**
-	 * Return the JTA TransactionManager that this transaction manager uses.
+	 * Return the JTA TransactionManager that this transaction manager uses, if any.
 	 */
 	public TransactionManager getTransactionManager() {
 		return this.transactionManager;
@@ -448,7 +448,7 @@ protected void initUserTransactionAndTransactionManager() throws TransactionSyst
 		}
 
 		// Autodetect UserTransaction object that implements TransactionManager,
-		// and check fallback JNDI locations else.
+		// and check fallback JNDI locations otherwise.
 		if (this.transactionManager == null && this.autodetectTransactionManager) {
 			this.transactionManager = findTransactionManager(this.userTransaction);
 		}
@@ -737,8 +737,7 @@ protected Object findTransactionSynchronizationRegistry(UserTransaction ut, Tran
 			}
 			catch (NamingException ex) {
 				if (logger.isDebugEnabled()) {
-					logger.debug(
-							"No JTA TransactionSynchronizationRegistry found at default JNDI location [" + jndiName + "]", ex);
+					logger.debug("No JTA TransactionSynchronizationRegistry found at default JNDI location [" + jndiName + "]", ex);
 				}
 			}
 		}
@@ -824,12 +823,12 @@ protected void doBegin(Object transaction, TransactionDefinition definition) {
 		catch (NotSupportedException ex) {
 			// assume nested transaction not supported
 			throw new NestedTransactionNotSupportedException(
-				"JTA implementation does not support nested transactions", ex);
+					"JTA implementation does not support nested transactions", ex);
 		}
 		catch (UnsupportedOperationException ex) {
 			// assume nested transaction not supported
 			throw new NestedTransactionNotSupportedException(
-				"JTA implementation does not support nested transactions", ex);
+					"JTA implementation does not support nested transactions", ex);
 		}
 		catch (SystemException ex) {
 			throw new CannotCreateTransactionException("JTA failure on begin", ex);
@@ -884,8 +883,8 @@ protected void applyIsolationLevel(JtaTransactionObject txObject, int isolationL
 
 		if (!this.allowCustomIsolationLevels && isolationLevel != TransactionDefinition.ISOLATION_DEFAULT) {
 			throw new InvalidIsolationLevelException(
-				"JtaTransactionManager does not support custom isolation levels by default - " +
-				"switch 'allowCustomIsolationLevels' to 'true'");
+					"JtaTransactionManager does not support custom isolation levels by default - " +
+					"switch 'allowCustomIsolationLevels' to 'true'");
 		}
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java
index d493e950b4..b9d9474388 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,6 +56,11 @@
  * "transactionManager"/"transactionManagerName", passing in existing handles
  * or specifying corresponding JNDI locations to look up.
  *
+ * <p><b>NOTE: This JtaTransactionManager is intended to refine specific transaction
+ * demarcation behavior on Spring's side. It will happily co-exist with independently
+ * configured WebLogic transaction strategies in your persistence provider, with no
+ * need to specifically connect those setups in any way.</b>
+ *
  * @author Juergen Hoeller
  * @since 1.1
  * @see org.springframework.transaction.TransactionDefinition#getName
@@ -136,11 +141,10 @@ protected TransactionManager retrieveTransactionManager() throws TransactionSyst
 		}
 	}
 
-
 	private void loadWebLogicTransactionHelper() throws TransactionSystemException {
 		if (this.transactionHelper == null) {
 			try {
-				Class transactionHelperClass = getClass().getClassLoader().loadClass(TRANSACTION_HELPER_CLASS_NAME);
+				Class<?> transactionHelperClass = getClass().getClassLoader().loadClass(TRANSACTION_HELPER_CLASS_NAME);
 				Method getTransactionHelperMethod = transactionHelperClass.getMethod("getTransactionHelper");
 				this.transactionHelper = getTransactionHelperMethod.invoke(null);
 				logger.debug("WebLogic TransactionHelper found");
@@ -159,7 +163,7 @@ private void loadWebLogicTransactionHelper() throws TransactionSystemException {
 
 	private void loadWebLogicTransactionClasses() throws TransactionSystemException {
 		try {
-			Class userTransactionClass = getClass().getClassLoader().loadClass(USER_TRANSACTION_CLASS_NAME);
+			Class<?> userTransactionClass = getClass().getClassLoader().loadClass(USER_TRANSACTION_CLASS_NAME);
 			this.weblogicUserTransactionAvailable = userTransactionClass.isInstance(getUserTransaction());
 			if (this.weblogicUserTransactionAvailable) {
 				this.beginWithNameMethod = userTransactionClass.getMethod("begin", String.class);
@@ -171,13 +175,13 @@ private void loadWebLogicTransactionClasses() throws TransactionSystemException
 			}
 
 			// Obtain WebLogic ClientTransactionManager interface.
-			Class transactionManagerClass =
+			Class<?> transactionManagerClass =
 					getClass().getClassLoader().loadClass(CLIENT_TRANSACTION_MANAGER_CLASS_NAME);
 			logger.debug("WebLogic ClientTransactionManager found");
 
 			this.weblogicTransactionManagerAvailable = transactionManagerClass.isInstance(getTransactionManager());
 			if (this.weblogicTransactionManagerAvailable) {
-				Class transactionClass = getClass().getClassLoader().loadClass(TRANSACTION_CLASS_NAME);
+				Class<?> transactionClass = getClass().getClassLoader().loadClass(TRANSACTION_CLASS_NAME);
 				this.forceResumeMethod = transactionManagerClass.getMethod("forceResume", Transaction.class);
 				this.setPropertyMethod = transactionClass.getMethod("setProperty", String.class, Serializable.class);
 				logger.debug("Support for WebLogic forceResume available");
@@ -296,7 +300,6 @@ protected void doJtaResume(JtaTransactionObject txObject, Object suspendedTransa
 		}
 	}
 
-
 	@Override
 	public Transaction createTransaction(String name, int timeout) throws NotSupportedException, SystemException {
 		if (this.weblogicUserTransactionAvailable && name != null) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java
index de51a5425c..cb5759d929 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,9 +35,11 @@
 import org.springframework.transaction.support.CallbackPreferringPlatformTransactionManager;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.transaction.support.DefaultTransactionStatus;
+import org.springframework.transaction.support.SmartTransactionObject;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.transaction.support.TransactionSynchronizationUtils;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -71,6 +73,11 @@
  * simply specify the actual location through this transaction manager's
  * "uowManagerName" bean property.
  *
+ * <p><b>NOTE: This JtaTransactionManager is intended to refine specific transaction
+ * demarcation behavior on Spring's side. It will happily co-exist with independently
+ * configured WebSphere transaction strategies in your persistence provider, with no
+ * need to specifically connect those setups in any way.</b>
+ *
  * @author Juergen Hoeller
  * @since 2.5
  * @see #setUowManager
@@ -302,7 +309,7 @@ else if (pb == TransactionDefinition.PROPAGATION_NOT_SUPPORTED) {
 	/**
 	 * Adapter that executes the given Spring transaction within the WebSphere UOWAction shape.
 	 */
-	private class UOWActionAdapter<T> implements UOWAction {
+	private class UOWActionAdapter<T> implements UOWAction, SmartTransactionObject {
 
 		private final TransactionDefinition definition;
 
@@ -366,6 +373,16 @@ public T getResult() {
 			}
 			return this.result;
 		}
+
+		@Override
+		public boolean isRollbackOnly() {
+			return uowManager.getRollbackOnly();
+		}
+
+		@Override
+		public void flush() {
+			TransactionSynchronizationUtils.triggerFlush();
+		}
 	}
 
 }
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java
index ef30ce0af4..a917ad43bd 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1269,6 +1269,7 @@ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFound
 		this.logger = LogFactory.getLog(getClass());
 	}
 
+
 	/**
 	 * Holder for suspended resources.
 	 * Used internally by {@code suspend} and {@code resume}.
@@ -1276,10 +1277,15 @@ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFound
 	protected static class SuspendedResourcesHolder {
 
 		private final Object suspendedResources;
+
 		private List<TransactionSynchronization> suspendedSynchronizations;
+
 		private String name;
+
 		private boolean readOnly;
+
 		private Integer isolationLevel;
+
 		private boolean wasActive;
 
 		private SuspendedResourcesHolder(Object suspendedResources) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java
index bfb35698bc..3374863689 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@
  * @see TransactionSynchronizationManager
  * @see AbstractPlatformTransactionManager
  * @see org.springframework.jdbc.datasource.DataSourceUtils#CONNECTION_SYNCHRONIZATION_ORDER
- * @see org.springframework.orm.hibernate3.SessionFactoryUtils#SESSION_SYNCHRONIZATION_ORDER
  */
 public interface TransactionSynchronization {
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
index 7b20382104..9c978dd690 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 import org.springframework.util.Assert;
 
 /**
- * Central helper that manages resources and transaction synchronizations per thread.
+ * Central delegate that manages resources and transaction synchronizations per thread.
  * To be used by resource management code but not by typical application code.
  *
  * <p>Supports one resource per key without overwriting, that is, a resource needs
@@ -284,7 +284,7 @@ public static void initSynchronization() throws IllegalStateException {
 	 * @see org.springframework.core.Ordered
 	 */
 	public static void registerSynchronization(TransactionSynchronization synchronization)
-		throws IllegalStateException {
+			throws IllegalStateException {
 
 		Assert.notNull(synchronization, "TransactionSynchronization must not be null");
 		if (!isSynchronizationActive()) {
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java
index 92f1ed6514..311038d750 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ protected void tearDown() {
 	public void testIsProxy() throws Exception {
 		TransactionalTestBean bean = getTestBean();
 		assertTrue("testBean is not a proxy", AopUtils.isAopProxy(bean));
-		Map services = this.context.getBeansWithAnnotation(Service.class);
+		Map<String, Object> services = this.context.getBeansWithAnnotation(Service.class);
 		assertTrue("Stereotype annotation not visible", services.containsKey("testBean"));
 	}
 
@@ -110,7 +110,7 @@ private TransactionalTestBean getTestBean() {
 	public static class TransactionalTestBean {
 
 		@Transactional(readOnly = true)
-		public Collection findAllFoos() {
+		public Collection<?> findAllFoos() {
 			return null;
 		}
 
@@ -118,6 +118,10 @@ public Collection findAllFoos() {
 		public void saveFoo() {
 		}
 
+		@Transactional("qualifiedTransactionManager")
+		public void saveQualifiedFoo() {
+		}
+
 		@Transactional
 		public void exceptional(Throwable t) throws Throwable {
 			throw t;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
index 5c11e26d5d..3ad212dabc 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,13 @@
 
 package org.springframework.transaction.annotation;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
 import java.util.Map;
 
 import org.junit.Test;
+
 import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -33,10 +32,16 @@
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.AnnotationTransactionNamespaceHandlerTests.TransactionalTestBean;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import javax.annotation.PostConstruct;
+
 /**
  * Tests demonstrating use of @EnableTransactionManagement @Configuration classes.
  *
  * @author Chris Beams
+ * @author Stephane Nicoll
  * @since 3.1
  */
 public class EnableTransactionManagementTests {
@@ -52,6 +57,17 @@ public void transactionProxyIsCreated() {
 		assertThat("Stereotype annotation not visible", services.containsKey("testBean"), is(true));
 	}
 
+	@Test
+	public void transactionProxyIsCreatedWithEnableOnSuperclass() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(InheritedEnableTxConfig.class, TxManagerConfig.class);
+		ctx.refresh();
+		TransactionalTestBean bean = ctx.getBean(TransactionalTestBean.class);
+		assertThat("testBean is not a proxy", AopUtils.isAopProxy(bean), is(true));
+		Map<?,?> services = ctx.getBeansWithAnnotation(Service.class);
+		assertThat("Stereotype annotation not visible", services.containsKey("testBean"), is(true));
+	}
+
 	@Test
 	public void txManagerIsResolvedOnInvocationOfTransactionalMethod() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
@@ -84,10 +100,25 @@ public void proxyTypeAspectJCausesRegistrationOfAnnotationTransactionAspect() {
 			new AnnotationConfigApplicationContext(EnableAspectJTxConfig.class, TxManagerConfig.class);
 			fail("should have thrown CNFE when trying to load AnnotationTransactionAspect. " +
 					"Do you actually have org.springframework.aspects on the classpath?");
-		} catch (Exception ex) {
-			System.out.println(ex);
-			assertThat(ex.getMessage().endsWith("AspectJTransactionManagementConfiguration.class] cannot be opened because it does not exist"), is(true));
 		}
+		catch (Exception ex) {
+			assertThat(ex.getMessage().contains("AspectJTransactionManagementConfiguration"), is(true));
+		}
+	}
+
+	@Test
+	public void spr11915() {
+		AnnotationConfigApplicationContext ctx =
+				new AnnotationConfigApplicationContext(Spr11915Config.class);
+
+		TransactionalTestBean bean = ctx.getBean(TransactionalTestBean.class);
+		bean.saveQualifiedFoo();
+
+		CallCountingTransactionManager txManager = ctx
+				.getBean("qualifiedTransactionManager", CallCountingTransactionManager.class);
+		assertThat(txManager.begun, equalTo(1));
+		assertThat(txManager.commits, equalTo(1));
+		assertThat(txManager.rollbacks, equalTo(0));
 	}
 
 
@@ -97,11 +128,35 @@ static class EnableTxConfig {
 	}
 
 
+	@Configuration
+	static class InheritedEnableTxConfig extends EnableTxConfig {
+	}
+
+
 	@Configuration
 	@EnableTransactionManagement(mode=AdviceMode.ASPECTJ)
 	static class EnableAspectJTxConfig {
 	}
 
+	@Configuration
+	@EnableTransactionManagement
+	static class Spr11915Config {
+
+		@Autowired
+		private ConfigurableApplicationContext applicationContext;
+
+		@PostConstruct
+		public void initializeApp() {
+			applicationContext.getBeanFactory().registerSingleton(
+					"qualifiedTransactionManager", new CallCountingTransactionManager());
+		}
+
+		@Bean
+		public TransactionalTestBean testBean() {
+			return new TransactionalTestBean();
+		}
+	}
+
 
 	@Configuration
 	static class TxManagerConfig {
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
index 268cee7bb7..84fc439bdf 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,11 @@
 import java.lang.reflect.Proxy;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
+import org.junit.Before;
+import org.junit.Test;
+
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.StaticMethodMatcherPointcut;
 import org.springframework.aop.target.HotSwappableTargetSource;
@@ -40,31 +41,38 @@
 import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.TransactionStatus;
 
+import static org.junit.Assert.*;
 import static org.mockito.BDDMockito.*;
 
+
 /**
  * Test cases for AOP transaction management.
  *
  * @author Rod Johnson
+ * @author Juergen Hoeller
  * @since 23.04.2003
  */
-public class BeanFactoryTransactionTests extends TestCase {
+public class BeanFactoryTransactionTests {
 
 	private DefaultListableBeanFactory factory;
 
-	@Override
+
+	@Before
 	public void setUp() {
 		this.factory = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(this.factory).loadBeanDefinitions(
 				new ClassPathResource("transactionalBeanFactory.xml", getClass()));
 	}
 
+
+	@Test
 	public void testGetsAreNotTransactionalWithProxyFactory1() throws NoSuchMethodException {
 		ITestBean testBean = (ITestBean) factory.getBean("proxyFactory1");
 		assertTrue("testBean is a dynamic proxy", Proxy.isProxyClass(testBean.getClass()));
 		doTestGetsAreNotTransactional(testBean);
 	}
 
+	@Test
 	public void testGetsAreNotTransactionalWithProxyFactory2DynamicProxy() throws NoSuchMethodException {
 		this.factory.preInstantiateSingletons();
 		ITestBean testBean = (ITestBean) factory.getBean("proxyFactory2DynamicProxy");
@@ -72,12 +80,14 @@ public void testGetsAreNotTransactionalWithProxyFactory2DynamicProxy() throws No
 		doTestGetsAreNotTransactional(testBean);
 	}
 
+	@Test
 	public void testGetsAreNotTransactionalWithProxyFactory2Cglib() throws NoSuchMethodException {
 		ITestBean testBean = (ITestBean) factory.getBean("proxyFactory2Cglib");
 		assertTrue("testBean is CGLIB advised", AopUtils.isCglibProxy(testBean));
 		doTestGetsAreNotTransactional(testBean);
 	}
 
+	@Test
 	public void testProxyFactory2Lazy() throws NoSuchMethodException {
 		ITestBean testBean = (ITestBean) factory.getBean("proxyFactory2Lazy");
 		assertFalse(factory.containsSingleton("target"));
@@ -85,6 +95,7 @@ public void testProxyFactory2Lazy() throws NoSuchMethodException {
 		assertTrue(factory.containsSingleton("target"));
 	}
 
+	@Test
 	public void testCglibTransactionProxyImplementsNoInterfaces() throws NoSuchMethodException {
 		ImplementsNoInterfaces ini = (ImplementsNoInterfaces) factory.getBean("cglibNoInterfaces");
 		assertTrue("testBean is CGLIB advised", AopUtils.isCglibProxy(ini));
@@ -99,6 +110,7 @@ public void testCglibTransactionProxyImplementsNoInterfaces() throws NoSuchMetho
 		assertEquals(2, ptm.commits);
 	}
 
+	@Test
 	public void testGetsAreNotTransactionalWithProxyFactory3() throws NoSuchMethodException {
 		ITestBean testBean = (ITestBean) factory.getBean("proxyFactory3");
 		assertTrue("testBean is a full proxy", testBean instanceof DerivedTestBean);
@@ -158,14 +170,16 @@ public void rollback(TransactionStatus status) throws TransactionException {
 		assertTrue(testBean.getAge() == age);
 	}
 
+	@Test
 	public void testGetBeansOfTypeWithAbstract() {
-		Map beansOfType = factory.getBeansOfType(ITestBean.class, true, true);
+		Map<String, ITestBean> beansOfType = factory.getBeansOfType(ITestBean.class, true, true);
 		assertNotNull(beansOfType);
 	}
 
 	/**
 	 * Check that we fail gracefully if the user doesn't set any transaction attributes.
 	 */
+	@Test
 	public void testNoTransactionAttributeSource() {
 		try {
 			DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
@@ -181,6 +195,7 @@ public void testNoTransactionAttributeSource() {
 	/**
 	 * Test that we can set the target to a dynamic TargetSource.
 	 */
+	@Test
 	public void testDynamicTargetSource() throws NoSuchMethodException {
 		// Install facade
 		CallCountingTransactionManager txMan = new CallCountingTransactionManager();
@@ -211,7 +226,7 @@ public static class InvocationCounterPointcut extends StaticMethodMatcherPointcu
 		int counter = 0;
 
 		@Override
-		public boolean matches(Method method, Class clazz) {
+		public boolean matches(Method method, Class<?> clazz) {
 			counter++;
 			return true;
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/HttpEntity.java b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
index c876d8fe70..436a2b6337 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpEntity.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -138,20 +138,20 @@ public boolean equals(Object other) {
 
 	@Override
 	public int hashCode() {
-		return ObjectUtils.nullSafeHashCode(this.headers) * 29 + ObjectUtils.nullSafeHashCode(this.body);
+		return (ObjectUtils.nullSafeHashCode(this.headers) * 29 + ObjectUtils.nullSafeHashCode(this.body));
 	}
 
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder("<");
-		if (body != null) {
-			builder.append(body);
-			if (headers != null) {
+		if (this.body != null) {
+			builder.append(this.body);
+			if (this.headers != null) {
 				builder.append(',');
 			}
 		}
-		if (headers != null) {
-			builder.append(headers);
+		if (this.headers != null) {
+			builder.append(this.headers);
 		}
 		builder.append('>');
 		return builder.toString();
diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
index 5d480d5e4b..70d6ec3eb8 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
@@ -1,11 +1,11 @@
 /*
-	 * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,14 +17,10 @@
 package org.springframework.http;
 
 import java.io.Serializable;
-
 import java.net.URI;
-
 import java.nio.charset.Charset;
-
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -47,7 +43,8 @@
 /**
  * Represents HTTP request and response headers, mapping string header names to list of string values.
  *
- * <p>In addition to the normal methods defined by {@link Map}, this class offers the following convenience methods:
+ * <p>In addition to the normal methods defined by {@link Map}, this class offers the following
+ * convenience methods:
  * <ul>
  * <li>{@link #getFirst(String)} returns the first value associated with a given header name</li>
  * <li>{@link #add(String, String)} adds a header value to the list of values for a header name</li>
@@ -138,35 +135,39 @@ public static HttpHeaders readOnlyHttpHeaders(HttpHeaders headers) {
 		return new HttpHeaders(headers, true);
 	}
 
+
 	/**
-	 * Set the list of acceptable {@linkplain MediaType media types}, as specified by the {@code Accept} header.
-	 * @param acceptableMediaTypes the acceptable media types
+	 * Set the list of acceptable {@linkplain MediaType media types},
+	 * as specified by the {@code Accept} header.
 	 */
 	public void setAccept(List<MediaType> acceptableMediaTypes) {
 		set(ACCEPT, MediaType.toString(acceptableMediaTypes));
 	}
 
 	/**
-	 * Return the list of acceptable {@linkplain MediaType media types}, as specified by the {@code Accept} header.
+	 * Return the list of acceptable {@linkplain MediaType media types},
+	 * as specified by the {@code Accept} header.
 	 * <p>Returns an empty list when the acceptable media types are unspecified.
-	 * @return the acceptable media types
 	 */
 	public List<MediaType> getAccept() {
 		String value = getFirst(ACCEPT);
-		List<MediaType> result = (value != null) ? MediaType.parseMediaTypes(value) : Collections.<MediaType>emptyList();
+		List<MediaType> result = (value != null ? MediaType.parseMediaTypes(value) : Collections.<MediaType>emptyList());
 
 		// Some containers parse 'Accept' into multiple values
-		if ((result.size() == 1) && (headers.get(ACCEPT).size() > 1)) {
-			value = StringUtils.collectionToCommaDelimitedString(headers.get(ACCEPT));
-			result = MediaType.parseMediaTypes(value);
+		if (result.size() == 1) {
+			List<String> acceptHeader = get(ACCEPT);
+			if (acceptHeader.size() > 1) {
+				value = StringUtils.collectionToCommaDelimitedString(acceptHeader);
+				result = MediaType.parseMediaTypes(value);
+			}
 		}
 
 		return result;
 	}
 
 	/**
-	 * Set the list of acceptable {@linkplain Charset charsets}, as specified by the {@code Accept-Charset} header.
-	 * @param acceptableCharsets the acceptable charsets
+	 * Set the list of acceptable {@linkplain Charset charsets},
+	 * as specified by the {@code Accept-Charset} header.
 	 */
 	public void setAcceptCharset(List<Charset> acceptableCharsets) {
 		StringBuilder builder = new StringBuilder();
@@ -181,9 +182,8 @@ public void setAcceptCharset(List<Charset> acceptableCharsets) {
 	}
 
 	/**
-	 * Return the list of acceptable {@linkplain Charset charsets}, as specified by the {@code Accept-Charset}
-	 * header.
-	 * @return the acceptable charsets
+	 * Return the list of acceptable {@linkplain Charset charsets},
+	 * as specified by the {@code Accept-Charset} header.
 	 */
 	public List<Charset> getAcceptCharset() {
 		List<Charset> result = new ArrayList<Charset>();
@@ -208,27 +208,27 @@ public List<Charset> getAcceptCharset() {
 	}
 
 	/**
-	 * Set the set of allowed {@link HttpMethod HTTP methods}, as specified by the {@code Allow} header.
-	 * @param allowedMethods the allowed methods
+	 * Set the set of allowed {@link HttpMethod HTTP methods},
+	 * as specified by the {@code Allow} header.
 	 */
 	public void setAllow(Set<HttpMethod> allowedMethods) {
 		set(ALLOW, StringUtils.collectionToCommaDelimitedString(allowedMethods));
 	}
 
 	/**
-	 * Return the set of allowed {@link HttpMethod HTTP methods}, as specified by the {@code Allow} header.
+	 * Return the set of allowed {@link HttpMethod HTTP methods},
+	 * as specified by the {@code Allow} header.
 	 * <p>Returns an empty set when the allowed methods are unspecified.
-	 * @return the allowed methods
 	 */
 	public Set<HttpMethod> getAllow() {
 		String value = getFirst(ALLOW);
-		if (value != null) {
-			List<HttpMethod> allowedMethod = new ArrayList<HttpMethod>(5);
+		if (!StringUtils.isEmpty(value)) {
+			List<HttpMethod> result = new LinkedList<HttpMethod>();
 			String[] tokens = value.split(",\\s*");
 			for (String token : tokens) {
-				allowedMethod.add(HttpMethod.valueOf(token));
+				result.add(HttpMethod.valueOf(token));
 			}
-			return EnumSet.copyOf(allowedMethod);
+			return EnumSet.copyOf(result);
 		}
 		else {
 			return EnumSet.noneOf(HttpMethod.class);
@@ -236,25 +236,24 @@ public Set<HttpMethod> getAllow() {
 	}
 
 	/**
-	 * Sets the (new) value of the {@code Cache-Control} header.
-	 * @param cacheControl the value of the header
+	 * Set the (new) value of the {@code Cache-Control} header.
 	 */
 	public void setCacheControl(String cacheControl) {
 		set(CACHE_CONTROL, cacheControl);
 	}
 
 	/**
-	 * Returns the value of the {@code Cache-Control} header.
-	 * @return the value of the header
+	 * Return the value of the {@code Cache-Control} header.
 	 */
 	public String getCacheControl() {
 		return getFirst(CACHE_CONTROL);
 	}
 
 	/**
-	 * Sets the (new) value of the {@code Content-Disposition} header for {@code form-data}.
+	 * Set the (new) value of the {@code Content-Disposition} header
+	 * for {@code form-data}.
 	 * @param name the control name
-	 * @param filename the filename, may be {@code null}
+	 * @param filename the filename (may be {@code null})
 	 */
 	public void setContentDispositionFormData(String name, String filename) {
 		Assert.notNull(name, "'name' must not be null");
@@ -268,17 +267,17 @@ public void setContentDispositionFormData(String name, String filename) {
 	}
 
 	/**
-	 * Set the length of the body in bytes, as specified by the {@code Content-Length} header.
-	 * @param contentLength the content length
+	 * Set the length of the body in bytes, as specified by the
+	 * {@code Content-Length} header.
 	 */
 	public void setContentLength(long contentLength) {
 		set(CONTENT_LENGTH, Long.toString(contentLength));
 	}
 
 	/**
-	 * Return the length of the body in bytes, as specified by the {@code Content-Length} header.
+	 * Return the length of the body in bytes, as specified by the
+	 * {@code Content-Length} header.
 	 * <p>Returns -1 when the content-length is unknown.
-	 * @return the content length
 	 */
 	public long getContentLength() {
 		String value = getFirst(CONTENT_LENGTH);
@@ -286,8 +285,8 @@ public long getContentLength() {
 	}
 
 	/**
-	 * Set the {@linkplain MediaType media type} of the body, as specified by the {@code Content-Type} header.
-	 * @param mediaType the media type
+	 * Set the {@linkplain MediaType media type} of the body,
+	 * as specified by the {@code Content-Type} header.
 	 */
 	public void setContentType(MediaType mediaType) {
 		Assert.isTrue(!mediaType.isWildcardType(), "'Content-Type' cannot contain wildcard type '*'");
@@ -296,28 +295,30 @@ public void setContentType(MediaType mediaType) {
 	}
 
 	/**
-	 * Return the {@linkplain MediaType media type} of the body, as specified by the {@code Content-Type} header.
+	 * Return the {@linkplain MediaType media type} of the body, as specified
+	 * by the {@code Content-Type} header.
 	 * <p>Returns {@code null} when the content-type is unknown.
-	 * @return the content type
 	 */
 	public MediaType getContentType() {
 		String value = getFirst(CONTENT_TYPE);
-		return (value != null ? MediaType.parseMediaType(value) : null);
+		return (StringUtils.hasLength(value) ? MediaType.parseMediaType(value) : null);
 	}
 
 	/**
-	 * Sets the date and time at which the message was created, as specified by the {@code Date} header.
-	 * <p>The date should be specified as the number of milliseconds since January 1, 1970 GMT.
-	 * @param date the date
+	 * Set the date and time at which the message was created, as specified
+	 * by the {@code Date} header.
+	 * <p>The date should be specified as the number of milliseconds since
+	 * January 1, 1970 GMT.
 	 */
 	public void setDate(long date) {
 		setDate(DATE, date);
 	}
 
 	/**
-	 * Returns the date and time at which the message was created, as specified by the {@code Date} header.
-	 * <p>The date is returned as the number of milliseconds since January 1, 1970 GMT. Returns -1 when the date is unknown.
-	 * @return the creation date/time
+	 * Return the date and time at which the message was created, as specified
+	 * by the {@code Date} header.
+	 * <p>The date is returned as the number of milliseconds since
+	 * January 1, 1970 GMT. Returns -1 when the date is unknown.
 	 * @throws IllegalArgumentException if the value can't be converted to a date
 	 */
 	public long getDate() {
@@ -325,72 +326,87 @@ public long getDate() {
 	}
 
 	/**
-	 * Sets the (new) entity tag of the body, as specified by the {@code ETag} header.
-	 * @param eTag the new entity tag
+	 * Set the (new) entity tag of the body, as specified by the {@code ETag} header.
 	 */
 	public void setETag(String eTag) {
 		if (eTag != null) {
-			Assert.isTrue(eTag.startsWith("\"") || eTag.startsWith("W/"), "Invalid eTag, does not start with W/ or \"");
+			Assert.isTrue(eTag.startsWith("\"") || eTag.startsWith("W/"),
+					"Invalid eTag, does not start with W/ or \"");
 			Assert.isTrue(eTag.endsWith("\""), "Invalid eTag, does not end with \"");
 		}
 		set(ETAG, eTag);
 	}
 
 	/**
-	 * Returns the entity tag of the body, as specified by the {@code ETag} header.
-	 * @return the entity tag
+	 * Return the entity tag of the body, as specified by the {@code ETag} header.
 	 */
 	public String getETag() {
 		return getFirst(ETAG);
 	}
 
 	/**
-	 * Sets the date and time at which the message is no longer valid, as specified by the {@code Expires} header.
-	 * <p>The date should be specified as the number of milliseconds since January 1, 1970 GMT.
-	 * @param expires the new expires header value
+	 * Set the date and time at which the message is no longer valid,
+	 * as specified by the {@code Expires} header.
+	 * <p>The date should be specified as the number of milliseconds since
+	 * January 1, 1970 GMT.
 	 */
 	public void setExpires(long expires) {
 		setDate(EXPIRES, expires);
 	}
 
 	/**
-	 * Returns the date and time at which the message is no longer valid, as specified by the {@code Expires} header.
-	 * <p>The date is returned as the number of milliseconds since January 1, 1970 GMT. Returns -1 when the date is unknown.
-	 * @return the expires value
+	 * Return the date and time at which the message is no longer valid,
+	 * as specified by the {@code Expires} header.
+	 * <p>The date is returned as the number of milliseconds since
+	 * January 1, 1970 GMT. Returns -1 when the date is unknown.
 	 */
 	public long getExpires() {
-		return getFirstDate(EXPIRES);
+		try {
+			return getFirstDate(EXPIRES);
+		}
+		catch (IllegalArgumentException ex) {
+			return -1;
+		}
 	}
 
 	/**
-	 * Sets the (new) value of the {@code If-Modified-Since} header.
-	 * <p>The date should be specified as the number of milliseconds since January 1, 1970 GMT.
-	 * @param ifModifiedSince the new value of the header
+	 * Set the (new) value of the {@code If-Modified-Since} header.
+	 * <p>The date should be specified as the number of milliseconds since
+	 * January 1, 1970 GMT.
 	 */
 	public void setIfModifiedSince(long ifModifiedSince) {
 		setDate(IF_MODIFIED_SINCE, ifModifiedSince);
 	}
 
 	/**
-	 * Returns the value of the {@code IfModifiedSince} header.
-	 * <p>The date is returned as the number of milliseconds since January 1, 1970 GMT. Returns -1 when the date is unknown.
-	 * @return the header value
+	 * Return the value of the {@code IfModifiedSince} header.
+	 * <p>The date is returned as the number of milliseconds since
+	 * January 1, 1970 GMT. Returns -1 when the date is unknown.
+	 * @deprecated use {@link #getIfModifiedSince()}
 	 */
+	@Deprecated
 	public long getIfNotModifiedSince() {
+		return getIfModifiedSince();
+	}
+
+	/**
+	 * Return the value of the {@code If-Modified-Since} header.
+	 * <p>The date is returned as the number of milliseconds since
+	 * January 1, 1970 GMT. Returns -1 when the date is unknown.
+	 */
+	public long getIfModifiedSince() {
 		return getFirstDate(IF_MODIFIED_SINCE);
 	}
 
 	/**
-	 * Sets the (new) value of the {@code If-None-Match} header.
-	 * @param ifNoneMatch the new value of the header
+	 * Set the (new) value of the {@code If-None-Match} header.
 	 */
 	public void setIfNoneMatch(String ifNoneMatch) {
 		set(IF_NONE_MATCH, ifNoneMatch);
 	}
 
 	/**
-	 * Sets the (new) values of the {@code If-None-Match} header.
-	 * @param ifNoneMatchList the new value of the header
+	 * Set the (new) values of the {@code If-None-Match} header.
 	 */
 	public void setIfNoneMatch(List<String> ifNoneMatchList) {
 		StringBuilder builder = new StringBuilder();
@@ -405,12 +421,10 @@ public void setIfNoneMatch(List<String> ifNoneMatchList) {
 	}
 
 	/**
-	 * Returns the value of the {@code If-None-Match} header.
-	 * @return the header value
+	 * Return the value of the {@code If-None-Match} header.
 	 */
 	public List<String> getIfNoneMatch() {
 		List<String> result = new ArrayList<String>();
-
 		String value = getFirst(IF_NONE_MATCH);
 		if (value != null) {
 			String[] tokens = value.split(",\\s*");
@@ -422,35 +436,37 @@ public List<String> getIfNoneMatch() {
 	}
 
 	/**
-	 * Sets the time the resource was last changed, as specified by the {@code Last-Modified} header.
-	 * <p>The date should be specified as the number of milliseconds since January 1, 1970 GMT.
-	 * @param lastModified the last modified date
+	 * Set the time the resource was last changed, as specified by the
+	 * {@code Last-Modified} header.
+	 * <p>The date should be specified as the number of milliseconds since
+	 * January 1, 1970 GMT.
 	 */
 	public void setLastModified(long lastModified) {
 		setDate(LAST_MODIFIED, lastModified);
 	}
 
 	/**
-	 * Returns the time the resource was last changed, as specified by the {@code Last-Modified} header.
-	 * <p>The date is returned as the number of milliseconds since January 1, 1970 GMT. Returns -1 when the date is unknown.
-	 * @return the last modified date
+	 * Return the time the resource was last changed, as specified by the
+	 * {@code Last-Modified} header.
+	 * <p>The date is returned as the number of milliseconds since
+	 * January 1, 1970 GMT. Returns -1 when the date is unknown.
 	 */
 	public long getLastModified() {
 		return getFirstDate(LAST_MODIFIED);
 	}
 
 	/**
-	 * Set the (new) location of a resource, as specified by the {@code Location} header.
-	 * @param location the location
+	 * Set the (new) location of a resource,
+	 * as specified by the {@code Location} header.
 	 */
 	public void setLocation(URI location) {
 		set(LOCATION, location.toASCIIString());
 	}
 
 	/**
-	 * Return the (new) location of a resource, as specified by the {@code Location} header.
+	 * Return the (new) location of a resource
+	 * as specified by the {@code Location} header.
 	 * <p>Returns {@code null} when the location is unknown.
-	 * @return the location
 	 */
 	public URI getLocation() {
 		String value = getFirst(LOCATION);
@@ -458,24 +474,27 @@ public URI getLocation() {
 	}
 
 	/**
-	 * Sets the (new) value of the {@code Pragma} header.
-	 * @param pragma the value of the header
+	 * Set the (new) value of the {@code Pragma} header.
 	 */
 	public void setPragma(String pragma) {
 		set(PRAGMA, pragma);
 	}
 
 	/**
-	 * Returns the value of the {@code Pragma} header.
-	 * @return the value of the header
+	 * Return the value of the {@code Pragma} header.
 	 */
 	public String getPragma() {
 		return getFirst(PRAGMA);
 	}
 
-	// Utility methods
+	// Date methods
 
-	private long getFirstDate(String headerName) {
+	/**
+	 * Parse the first header value for the given header name as a date,
+	 * return -1 if there is no value, or raise {@link IllegalArgumentException}
+	 * if the value cannot be parsed as a date.
+	 */
+	public long getFirstDate(String headerName) {
 		String headerValue = getFirst(headerName);
 		if (headerValue == null) {
 			return -1;
@@ -486,7 +505,7 @@ private long getFirstDate(String headerName) {
 			try {
 				return simpleDateFormat.parse(headerValue).getTime();
 			}
-			catch (ParseException e) {
+			catch (ParseException ex) {
 				// ignore
 			}
 		}
@@ -494,7 +513,12 @@ private long getFirstDate(String headerName) {
 				"\" for \"" + headerName + "\" header");
 	}
 
-	private void setDate(String headerName, long date) {
+	/**
+	 * Set the given date under the given header name after formatting it as a string
+	 * using the pattern {@code "EEE, dd MMM yyyy HH:mm:ss zzz"}. The equivalent of
+	 * {@link #set(String, String)} but for date headers.
+	 */
+	public void setDate(String headerName, long date) {
 		SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMATS[0], Locale.US);
 		dateFormat.setTimeZone(GMT);
 		set(headerName, dateFormat.format(new Date(date)));
@@ -505,23 +529,23 @@ private void setDate(String headerName, long date) {
 	/**
 	 * Return the first header value for the given header name, if any.
 	 * @param headerName the header name
-	 * @return the first header value; or {@code null}
+	 * @return the first header value, or {@code null} if none
 	 */
 	public String getFirst(String headerName) {
-		List<String> headerValues = headers.get(headerName);
-		return headerValues != null ? headerValues.get(0) : null;
+		List<String> headerValues = this.headers.get(headerName);
+		return (headerValues != null ? headerValues.get(0) : null);
 	}
 
 	/**
 	 * Add the given, single header value under the given name.
-	 * @param headerName  the header name
+	 * @param headerName the header name
 	 * @param headerValue the header value
 	 * @throws UnsupportedOperationException if adding headers is not supported
 	 * @see #put(String, List)
 	 * @see #set(String, String)
 	 */
 	public void add(String headerName, String headerValue) {
-		List<String> headerValues = headers.get(headerName);
+		List<String> headerValues = this.headers.get(headerName);
 		if (headerValues == null) {
 			headerValues = new LinkedList<String>();
 			this.headers.put(headerName, headerValues);
@@ -531,7 +555,7 @@ public void add(String headerName, String headerValue) {
 
 	/**
 	 * Set the given, single header value under the given name.
-	 * @param headerName  the header name
+	 * @param headerName the header name
 	 * @param headerValue the header value
 	 * @throws UnsupportedOperationException if adding headers is not supported
 	 * @see #put(String, List)
@@ -540,7 +564,7 @@ public void add(String headerName, String headerValue) {
 	public void set(String headerName, String headerValue) {
 		List<String> headerValues = new LinkedList<String>();
 		headerValues.add(headerValue);
-		headers.put(headerName, headerValues);
+		this.headers.put(headerName, headerValues);
 	}
 
 	public void setAll(Map<String, String> values) {
@@ -551,7 +575,7 @@ public void setAll(Map<String, String> values) {
 
 	public Map<String, String> toSingleValueMap() {
 		LinkedHashMap<String, String> singleValueMap = new LinkedHashMap<String,String>(this.headers.size());
-		for (Entry<String, List<String>> entry : headers.entrySet()) {
+		for (Entry<String, List<String>> entry : this.headers.entrySet()) {
 			singleValueMap.put(entry.getKey(), entry.getValue().get(0));
 		}
 		return singleValueMap;
@@ -587,8 +611,8 @@ public List<String> remove(Object key) {
 		return this.headers.remove(key);
 	}
 
-	public void putAll(Map<? extends String, ? extends List<String>> m) {
-		this.headers.putAll(m);
+	public void putAll(Map<? extends String, ? extends List<String>> map) {
+		this.headers.putAll(map);
 	}
 
 	public void clear() {
diff --git a/spring-web/src/main/java/org/springframework/http/HttpInputMessage.java b/spring-web/src/main/java/org/springframework/http/HttpInputMessage.java
index ddc1ebd55d..9aeab46b9a 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpInputMessage.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpInputMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@
  * Represents an HTTP input message, consisting of {@linkplain #getHeaders() headers}
  * and a readable {@linkplain #getBody() body}.
  *
- * <p>Typically implemented by an HTTP request on the server-side, or a response on the client-side.
+ * <p>Typically implemented by an HTTP request handle on the server side,
+ * or an HTTP response handle on the client side.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -32,7 +33,7 @@ public interface HttpInputMessage extends HttpMessage {
 
 	/**
 	 * Return the body of the message as an input stream.
-	 * @return the input stream body
+	 * @return the input stream body (never {@code null})
 	 * @throws IOException in case of I/O Errors
 	 */
 	InputStream getBody() throws IOException;
diff --git a/spring-web/src/main/java/org/springframework/http/HttpMessage.java b/spring-web/src/main/java/org/springframework/http/HttpMessage.java
index 80f7ca292d..1855c44f52 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpMessage.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 package org.springframework.http;
 
 /**
- * Represents the base interface for HTTP request and response messages. Consists of {@link HttpHeaders}, retrievable
- * via {@link #getHeaders()}.
+ * Represents the base interface for HTTP request and response messages.
+ * Consists of {@link HttpHeaders}, retrievable via {@link #getHeaders()}.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -27,7 +27,7 @@ public interface HttpMessage {
 
 	/**
 	 * Return the headers of this message.
-	 * @return a corresponding HttpHeaders object
+	 * @return a corresponding HttpHeaders object (never {@code null})
 	 */
 	HttpHeaders getHeaders();
 
diff --git a/spring-web/src/main/java/org/springframework/http/HttpMethod.java b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
index f006c703cc..2f1bcd2b50 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpMethod.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,6 @@
  */
 public enum HttpMethod {
 
-	GET, POST, HEAD, OPTIONS, PUT, PATCH, DELETE, TRACE
+	GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE;
 
 }
diff --git a/spring-web/src/main/java/org/springframework/http/HttpOutputMessage.java b/spring-web/src/main/java/org/springframework/http/HttpOutputMessage.java
index 3dae007465..fdee15b0c9 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpOutputMessage.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpOutputMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@
  * Represents an HTTP output message, consisting of {@linkplain #getHeaders() headers}
  * and a writable {@linkplain #getBody() body}.
  *
- * <p>Typically implemented by an HTTP request on the client-side, or a response on the server-side.
+ * <p>Typically implemented by an HTTP request handle on the client side,
+ * or an HTTP response handle on the server side.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -32,7 +33,7 @@ public interface HttpOutputMessage extends HttpMessage {
 
 	/**
 	 * Return the body of the message as an output stream.
-	 * @return the output stream body
+	 * @return the output stream body (never {@code null})
 	 * @throws IOException in case of I/O Errors
 	 */
 	OutputStream getBody() throws IOException;
diff --git a/spring-web/src/main/java/org/springframework/http/HttpStatus.java b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
index 225fbccd9f..b2fc80ace8 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpStatus.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,12 @@
 package org.springframework.http;
 
 /**
- * Java 5 enumeration of HTTP status codes.
+ * Enumeration of HTTP status codes.
  *
  * <p>The HTTP status code series can be retrieved via {@link #series()}.
  *
  * @author Arjen Poutsma
+ * @since 3.0
  * @see HttpStatus.Series
  * @see <a href="http://www.iana.org/assignments/http-status-codes">HTTP Status Code Registry</a>
  * @see <a href="http://en.wikipedia.org/wiki/List_of_HTTP_status_codes">List of HTTP status codes - Wikipedia</a>
@@ -364,17 +365,17 @@ public enum HttpStatus {
 	NETWORK_AUTHENTICATION_REQUIRED(511, "Network Authentication Required");
 
 
-
 	private final int value;
 
 	private final String reasonPhrase;
 
 
-	private HttpStatus(int value, String reasonPhrase) {
+	HttpStatus(int value, String reasonPhrase) {
 		this.value = value;
 		this.reasonPhrase = reasonPhrase;
 	}
 
+
 	/**
 	 * Return the integer value of this status code.
 	 */
@@ -386,7 +387,7 @@ public int value() {
 	 * Return the reason phrase of this status code.
 	 */
 	public String getReasonPhrase() {
-		return reasonPhrase;
+		return this.reasonPhrase;
 	}
 
 	/**
@@ -402,7 +403,7 @@ public Series series() {
 	 */
 	@Override
 	public String toString() {
-		return Integer.toString(value);
+		return Integer.toString(this.value);
 	}
 
 
@@ -423,10 +424,10 @@ public static HttpStatus valueOf(int statusCode) {
 
 
 	/**
-	 * Java 5 enumeration of HTTP status series.
+	 * Enumeration of HTTP status series.
 	 * <p>Retrievable via {@link HttpStatus#series()}.
 	 */
-	public static enum Series {
+	public enum Series {
 
 		INFORMATIONAL(1),
 		SUCCESSFUL(2),
@@ -436,7 +437,7 @@ public static enum Series {
 
 		private final int value;
 
-		private Series(int value) {
+		Series(int value) {
 			this.value = value;
 		}
 
@@ -460,7 +461,6 @@ public static Series valueOf(int status) {
 		public static Series valueOf(HttpStatus status) {
 			return valueOf(status.value);
 		}
-
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/http/MediaType.java b/spring-web/src/main/java/org/springframework/http/MediaType.java
index 9f527c7c8c..173b883d95 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -284,16 +284,15 @@ public MediaType(String type, String subtype) {
 	 * Create a new {@code MediaType} for the given type, subtype, and character set.
 	 * @param type the primary type
 	 * @param subtype the subtype
-	 * @param charSet the character set
+	 * @param charset the character set
 	 * @throws IllegalArgumentException if any of the parameters contain illegal characters
 	 */
-	public MediaType(String type, String subtype, Charset charSet) {
-		this(type, subtype, Collections.singletonMap(PARAM_CHARSET, charSet.name()));
+	public MediaType(String type, String subtype, Charset charset) {
+		this(type, subtype, Collections.singletonMap(PARAM_CHARSET, charset.name()));
 	}
 
 	/**
 	 * Create a new {@code MediaType} for the given type, subtype, and quality value.
-	 *
 	 * @param type the primary type
 	 * @param subtype the subtype
 	 * @param qualityValue the quality value
@@ -774,18 +773,18 @@ public static String toString(Collection<MediaType> mediaTypes) {
 	 * Sorts the given list of {@code MediaType} objects by specificity.
 	 * <p>Given two media types:
 	 * <ol>
-	 *   <li>if either media type has a {@linkplain #isWildcardType() wildcard type}, then the media type without the
-	 *   wildcard is ordered before the other.</li>
-	 *   <li>if the two media types have different {@linkplain #getType() types}, then they are considered equal and
-	 *   remain their current order.</li>
-	 *   <li>if either media type has a {@linkplain #isWildcardSubtype() wildcard subtype}, then the media type without
-	 *   the wildcard is sorted before the other.</li>
-	 *   <li>if the two media types have different {@linkplain #getSubtype() subtypes}, then they are considered equal
-	 *   and remain their current order.</li>
-	 *   <li>if the two media types have different {@linkplain #getQualityValue() quality value}, then the media type
-	 *   with the highest quality value is ordered before the other.</li>
-	 *   <li>if the two media types have a different amount of {@linkplain #getParameter(String) parameters}, then the
-	 *   media type with the most parameters is ordered before the other.</li>
+	 * <li>if either media type has a {@linkplain #isWildcardType() wildcard type}, then the media type without the
+	 * wildcard is ordered before the other.</li>
+	 * <li>if the two media types have different {@linkplain #getType() types}, then they are considered equal and
+	 * remain their current order.</li>
+	 * <li>if either media type has a {@linkplain #isWildcardSubtype() wildcard subtype}, then the media type without
+	 * the wildcard is sorted before the other.</li>
+	 * <li>if the two media types have different {@linkplain #getSubtype() subtypes}, then they are considered equal
+	 * and remain their current order.</li>
+	 * <li>if the two media types have different {@linkplain #getQualityValue() quality value}, then the media type
+	 * with the highest quality value is ordered before the other.</li>
+	 * <li>if the two media types have a different amount of {@linkplain #getParameter(String) parameters}, then the
+	 * media type with the most parameters is ordered before the other.</li>
 	 * </ol>
 	 * <p>For example:
 	 * <blockquote>audio/basic &lt; audio/* &lt; *&#047;*</blockquote>
@@ -807,18 +806,18 @@ public static void sortBySpecificity(List<MediaType> mediaTypes) {
 	 * Sorts the given list of {@code MediaType} objects by quality value.
 	 * <p>Given two media types:
 	 * <ol>
-	 *   <li>if the two media types have different {@linkplain #getQualityValue() quality value}, then the media type
-	 *   with the highest quality value is ordered before the other.</li>
-	 *   <li>if either media type has a {@linkplain #isWildcardType() wildcard type}, then the media type without the
-	 *   wildcard is ordered before the other.</li>
-	 *   <li>if the two media types have different {@linkplain #getType() types}, then they are considered equal and
-	 *   remain their current order.</li>
-	 *   <li>if either media type has a {@linkplain #isWildcardSubtype() wildcard subtype}, then the media type without
-	 *   the wildcard is sorted before the other.</li>
-	 *   <li>if the two media types have different {@linkplain #getSubtype() subtypes}, then they are considered equal
-	 *   and remain their current order.</li>
-	 *   <li>if the two media types have a different amount of {@linkplain #getParameter(String) parameters}, then the
-	 *   media type with the most parameters is ordered before the other.</li>
+	 * <li>if the two media types have different {@linkplain #getQualityValue() quality value}, then the media type
+	 * with the highest quality value is ordered before the other.</li>
+	 * <li>if either media type has a {@linkplain #isWildcardType() wildcard type}, then the media type without the
+	 * wildcard is ordered before the other.</li>
+	 * <li>if the two media types have different {@linkplain #getType() types}, then they are considered equal and
+	 * remain their current order.</li>
+	 * <li>if either media type has a {@linkplain #isWildcardSubtype() wildcard subtype}, then the media type without
+	 * the wildcard is sorted before the other.</li>
+	 * <li>if the two media types have different {@linkplain #getSubtype() subtypes}, then they are considered equal
+	 * and remain their current order.</li>
+	 * <li>if the two media types have a different amount of {@linkplain #getParameter(String) parameters}, then the
+	 * media type with the most parameters is ordered before the other.</li>
 	 * </ol>
 	 * @param mediaTypes the list of media types to be sorted
 	 * @see #getQualityValue()
diff --git a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
index 56fa4c1ba5..69c2a31e27 100644
--- a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
+++ b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,15 +21,19 @@
 
 /**
  * Extension of {@link HttpEntity} that adds a {@link HttpStatus} status code.
+ * Used in {@code RestTemplate} as well {@code @Controller} methods.
  *
- * <p>Returned by {@link org.springframework.web.client.RestTemplate#getForEntity}:
+ * <p>In {@code RestTemplate}, this class is returned by
+ * {@link org.springframework.web.client.RestTemplate#getForEntity getForEntity()} and
+ * {@link org.springframework.web.client.RestTemplate#exchange exchange()}:
  * <pre class="code">
  * ResponseEntity&lt;String&gt; entity = template.getForEntity("http://example.com", String.class);
  * String body = entity.getBody();
  * MediaType contentType = entity.getHeaders().getContentType();
  * HttpStatus statusCode = entity.getStatusCode();
  * </pre>
- * <p>Can also be used in Spring MVC, as a return value from a @Controller method:
+ *
+ * <p>Can also be used in Spring MVC, as the return value from a @Controller method:
  * <pre class="code">
  * &#64;RequestMapping("/handle")
  * public ResponseEntity&lt;String&gt; handle() {
@@ -102,16 +106,16 @@ public boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ResponseEntity)) {
+		if (!(other instanceof ResponseEntity) || !super.equals(other)) {
 			return false;
 		}
 		ResponseEntity<?> otherEntity = (ResponseEntity<?>) other;
-		return (ObjectUtils.nullSafeEquals(this.statusCode, otherEntity.statusCode) && super.equals(other));
+		return ObjectUtils.nullSafeEquals(this.statusCode, otherEntity.statusCode);
 	}
 
 	@Override
 	public int hashCode() {
-		return super.hashCode() * 29 + ObjectUtils.nullSafeHashCode(this.statusCode);
+		return (super.hashCode() * 29 + ObjectUtils.nullSafeHashCode(this.statusCode));
 	}
 
 	@Override
diff --git a/spring-web/src/main/java/org/springframework/http/client/AbstractBufferingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/AbstractBufferingClientHttpRequest.java
index 3048b76009..4af7348798 100644
--- a/spring-web/src/main/java/org/springframework/http/client/AbstractBufferingClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/AbstractBufferingClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,14 +23,16 @@
 import org.springframework.http.HttpHeaders;
 
 /**
- * Abstract base for {@link ClientHttpRequest} that buffers output in a byte array before sending it over the wire.
+ * Base implementation of {@link ClientHttpRequest} that buffers output
+ * in a byte array before sending it over the wire.
  *
  * @author Arjen Poutsma
  * @since 3.0.6
  */
 abstract class AbstractBufferingClientHttpRequest extends AbstractClientHttpRequest {
 
-	private ByteArrayOutputStream bufferedOutput = new ByteArrayOutputStream();
+	private ByteArrayOutputStream bufferedOutput = new ByteArrayOutputStream(1024);
+
 
 	@Override
 	protected OutputStream getBodyInternal(HttpHeaders headers) throws IOException {
diff --git a/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequest.java
index bf73ff61ef..2ad7cb0438 100644
--- a/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@
 import org.springframework.util.Assert;
 
 /**
- * Abstract base for {@link ClientHttpRequest} that makes sure that headers and body are not written multiple times.
+ * Abstract base for {@link ClientHttpRequest} that makes sure that headers
+ * and body are not written multiple times.
  *
  * @author Arjen Poutsma
  * @since 3.0
diff --git a/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java
index 8c493d312d..f3dfe98abf 100644
--- a/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java
+++ b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@
 import org.springframework.util.Assert;
 
 /**
- * Abstract base class for {@link ClientHttpRequestFactory} implementations that decorate another request factory.
+ * Abstract base class for {@link ClientHttpRequestFactory} implementations
+ * that decorate another request factory.
  *
  * @author Arjen Poutsma
  * @since 3.1
@@ -34,11 +35,11 @@ public abstract class AbstractClientHttpRequestFactoryWrapper implements ClientH
 
 
 	/**
-	 * Creates a {@code AbstractClientHttpRequestFactoryWrapper} wrapping the given request factory.
+	 * Create a {@code AbstractClientHttpRequestFactoryWrapper} wrapping the given request factory.
 	 * @param requestFactory the request factory to be wrapped
 	 */
 	protected AbstractClientHttpRequestFactoryWrapper(ClientHttpRequestFactory requestFactory) {
-		Assert.notNull(requestFactory, "'requestFactory' must not be null");
+		Assert.notNull(requestFactory, "ClientHttpRequestFactory must not be null");
 		this.requestFactory = requestFactory;
 	}
 
@@ -49,12 +50,12 @@ protected AbstractClientHttpRequestFactoryWrapper(ClientHttpRequestFactory reque
 	 * {@linkplain #AbstractClientHttpRequestFactoryWrapper(ClientHttpRequestFactory) constructor}.
 	 */
 	public final ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
-		return createRequest(uri, httpMethod, requestFactory);
+		return createRequest(uri, httpMethod, this.requestFactory);
 	}
 
 	/**
-	 * Create a new {@link ClientHttpRequest} for the specified URI and HTTP method by using the
-	 * passed-on request factory.
+	 * Create a new {@link ClientHttpRequest} for the specified URI and HTTP method
+	 * by using the passed-on request factory.
 	 * <p>Called from {@link #createRequest(URI, HttpMethod)}.
 	 * @param uri the URI to create a request for
 	 * @param httpMethod the HTTP method to execute
diff --git a/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequest.java
index 7137365507..66319033b2 100644
--- a/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,11 @@
 import org.springframework.http.HttpRequest;
 
 /**
- * Represents a client-side HTTP request. Created via an implementation of the {@link ClientHttpRequestFactory}.
+ * Represents a client-side HTTP request.
+ * Created via an implementation of the {@link ClientHttpRequestFactory}.
  *
- * <p>A {@code HttpRequest} can be {@linkplain #execute() executed}, getting a {@link ClientHttpResponse}
- * which can be read from.
+ * <p>A {@code ClientHttpRequest} can be {@linkplain #execute() executed},
+ * receiving a {@link ClientHttpResponse} which can be read from.
  *
  * @author Arjen Poutsma
  * @since 3.0
diff --git a/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java
index 438f8035bd..7ec5be9bd2 100644
--- a/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,11 @@
 import org.springframework.http.HttpStatus;
 
 /**
- * Represents a client-side HTTP response. Obtained via an calling of the {@link ClientHttpRequest#execute()}.
+ * Represents a client-side HTTP response.
+ * Obtained via an calling of the {@link ClientHttpRequest#execute()}.
  *
- * <p>A {@code ClientHttpResponse} must be {@linkplain #close() closed}, typically in a
- * {@code finally} block.
+ * <p>A {@code ClientHttpResponse} must be {@linkplain #close() closed},
+ * typically in a {@code finally} block.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -55,7 +56,7 @@ public interface ClientHttpResponse extends HttpInputMessage, Closeable {
 	String getStatusText() throws IOException;
 
 	/**
-	 * Closes this response, freeing any resources created.
+	 * Close this response, freeing any resources created.
 	 */
 	void close();
 
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
index 3e833d4459..57fb84eaab 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpResponse;
@@ -33,6 +30,10 @@
 import org.apache.http.protocol.HTTP;
 import org.apache.http.protocol.HttpContext;
 
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.util.StringUtils;
+
 /**
  * {@link org.springframework.http.client.ClientHttpRequest} implementation that uses
  * Apache HttpComponents HttpClient to execute requests.
@@ -53,7 +54,7 @@ final class HttpComponentsClientHttpRequest extends AbstractBufferingClientHttpR
 	private final HttpContext httpContext;
 
 
-	public HttpComponentsClientHttpRequest(HttpClient httpClient, HttpUriRequest httpRequest, HttpContext httpContext) {
+	HttpComponentsClientHttpRequest(HttpClient httpClient, HttpUriRequest httpRequest, HttpContext httpContext) {
 		this.httpClient = httpClient;
 		this.httpRequest = httpRequest;
 		this.httpContext = httpContext;
@@ -71,15 +72,8 @@ public URI getURI() {
 
 	@Override
 	protected ClientHttpResponse executeInternal(HttpHeaders headers, byte[] bufferedOutput) throws IOException {
-		for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
-			String headerName = entry.getKey();
-			if (!headerName.equalsIgnoreCase(HTTP.CONTENT_LEN) &&
-					!headerName.equalsIgnoreCase(HTTP.TRANSFER_ENCODING)) {
-				for (String headerValue : entry.getValue()) {
-					this.httpRequest.addHeader(headerName, headerValue);
-				}
-			}
-		}
+		addHeaders(this.httpRequest, headers);
+
 		if (this.httpRequest instanceof HttpEntityEnclosingRequest) {
 			HttpEntityEnclosingRequest entityEnclosingRequest = (HttpEntityEnclosingRequest) this.httpRequest;
 			HttpEntity requestEntity = new ByteArrayEntity(bufferedOutput);
@@ -89,4 +83,26 @@ protected ClientHttpResponse executeInternal(HttpHeaders headers, byte[] buffere
 		return new HttpComponentsClientHttpResponse(httpResponse);
 	}
 
+
+	/**
+	 * Add the given headers to the given HTTP request.
+	 * @param httpRequest the request to add the headers to
+	 * @param headers the headers to add
+	 */
+	static void addHeaders(HttpUriRequest httpRequest, HttpHeaders headers) {
+		for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+			String headerName = entry.getKey();
+			if ("Cookie".equalsIgnoreCase(headerName)) {  // RFC 6265
+				String headerValue = StringUtils.collectionToDelimitedString(entry.getValue(), "; ");
+				httpRequest.addHeader(headerName, headerValue);
+			}
+			else if (!HTTP.CONTENT_LEN.equalsIgnoreCase(headerName) &&
+					!HTTP.TRANSFER_ENCODING.equalsIgnoreCase(headerName)) {
+				for (String headerValue : entry.getValue()) {
+					httpRequest.addHeader(headerName, headerValue);
+				}
+			}
+		}
+	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
index 0131cfa50f..abbd16c00a 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,9 +43,9 @@
 import org.springframework.util.Assert;
 
 /**
- * {@link org.springframework.http.client.ClientHttpRequestFactory} implementation that uses
- * <a href="http://hc.apache.org/httpcomponents-client-ga/httpclient/">Apache HttpComponents HttpClient</a>
- * to create requests.
+ * {@link org.springframework.http.client.ClientHttpRequestFactory} implementation that
+ * uses <a href="http://hc.apache.org/httpcomponents-client-ga/">Apache HttpComponents
+ * HttpClient</a> to create requests.
  *
  * <p>Allows to use a pre-configured {@link HttpClient} instance -
  * potentially with authentication, HTTP connection pooling, etc.
@@ -144,20 +144,20 @@ protected HttpUriRequest createHttpUriRequest(HttpMethod httpMethod, URI uri) {
 		switch (httpMethod) {
 			case GET:
 				return new HttpGet(uri);
-			case DELETE:
-				return new HttpDelete(uri);
 			case HEAD:
 				return new HttpHead(uri);
-			case OPTIONS:
-				return new HttpOptions(uri);
 			case POST:
 				return new HttpPost(uri);
 			case PUT:
 				return new HttpPut(uri);
-			case TRACE:
-				return new HttpTrace(uri);
 			case PATCH:
 				return new HttpPatch(uri);
+			case DELETE:
+				return new HttpDelete(uri);
+			case OPTIONS:
+				return new HttpOptions(uri);
+			case TRACE:
+				return new HttpTrace(uri);
 			default:
 				throw new IllegalArgumentException("Invalid HTTP method: " + httpMethod);
 		}
@@ -183,6 +183,7 @@ protected HttpContext createHttpContext(HttpMethod httpMethod, URI uri) {
 		return null;
 	}
 
+
 	/**
 	 * Shutdown hook that closes the underlying
 	 * {@link org.apache.http.conn.ClientConnectionManager ClientConnectionManager}'s
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java
index d4033e4216..2a2753df09 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.http.client;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -69,7 +70,7 @@ public HttpHeaders getHeaders() {
 
 	public InputStream getBody() throws IOException {
 		HttpEntity entity = this.httpResponse.getEntity();
-		return entity != null ? entity.getContent() : null;
+		return (entity != null ? entity.getContent() : new ByteArrayInputStream(new byte[0]));
 	}
 
 	public void close() {
diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
index a422614fe9..f10f5d512c 100644
--- a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,49 +42,48 @@ class InterceptingClientHttpRequest extends AbstractBufferingClientHttpRequest {
 
 	private URI uri;
 
+
 	protected InterceptingClientHttpRequest(ClientHttpRequestFactory requestFactory,
-			List<ClientHttpRequestInterceptor> interceptors,
-			URI uri,
-			HttpMethod method) {
+			List<ClientHttpRequestInterceptor> interceptors, URI uri, HttpMethod method) {
+
 		this.requestFactory = requestFactory;
 		this.interceptors = interceptors;
 		this.method = method;
 		this.uri = uri;
 	}
 
+
 	public HttpMethod getMethod() {
-		return method;
+		return this.method;
 	}
 
 	public URI getURI() {
-		return uri;
+		return this.uri;
 	}
 
 	@Override
 	protected final ClientHttpResponse executeInternal(HttpHeaders headers, byte[] bufferedOutput) throws IOException {
-		RequestExecution requestExecution = new RequestExecution();
-
+		InterceptingRequestExecution requestExecution = new InterceptingRequestExecution();
 		return requestExecution.execute(this, bufferedOutput);
 	}
 
-	private class RequestExecution implements ClientHttpRequestExecution {
+
+	private class InterceptingRequestExecution implements ClientHttpRequestExecution {
 
 		private final Iterator<ClientHttpRequestInterceptor> iterator;
 
-		private RequestExecution() {
+		public InterceptingRequestExecution() {
 			this.iterator = interceptors.iterator();
 		}
 
 		public ClientHttpResponse execute(HttpRequest request, byte[] body) throws IOException {
-			if (iterator.hasNext()) {
-				ClientHttpRequestInterceptor nextInterceptor = iterator.next();
+			if (this.iterator.hasNext()) {
+				ClientHttpRequestInterceptor nextInterceptor = this.iterator.next();
 				return nextInterceptor.intercept(request, body, this);
 			}
 			else {
 				ClientHttpRequest delegate = requestFactory.createRequest(request.getURI(), request.getMethod());
-
 				delegate.getHeaders().putAll(request.getHeaders());
-
 				if (body.length > 0) {
 					StreamUtils.copy(body, delegate.getBody());
 				}
diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java
index 6e797c2bb1..aadab06951 100644
--- a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,20 +32,22 @@ public class InterceptingClientHttpRequestFactory extends AbstractClientHttpRequ
 
 	private final List<ClientHttpRequestInterceptor> interceptors;
 
+
 	/**
-	 * Creates a new instance of the {@code InterceptingClientHttpRequestFactory} with the given parameters.
-	 *
+	 * Create a new instance of the {@code InterceptingClientHttpRequestFactory} with the given parameters.
 	 * @param requestFactory the request factory to wrap
-	 * @param interceptors the interceptors that are to be applied. Can be {@code null}.
+	 * @param interceptors the interceptors that are to be applied (can be {@code null})
 	 */
 	public InterceptingClientHttpRequestFactory(ClientHttpRequestFactory requestFactory,
 			List<ClientHttpRequestInterceptor> interceptors) {
+
 		super(requestFactory);
-		this.interceptors = interceptors != null ? interceptors : Collections.<ClientHttpRequestInterceptor>emptyList();
+		this.interceptors = (interceptors != null ? interceptors : Collections.<ClientHttpRequestInterceptor>emptyList());
 	}
 
 	@Override
 	protected ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod, ClientHttpRequestFactory requestFactory) {
-		return new InterceptingClientHttpRequest(requestFactory, interceptors, uri, httpMethod);
+		return new InterceptingClientHttpRequest(requestFactory, this.interceptors, uri, httpMethod);
 	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
index c2a7864296..5456a8ea3c 100644
--- a/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,12 +26,14 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.util.FileCopyUtils;
+import org.springframework.util.StringUtils;
 
 /**
- * {@link ClientHttpRequest} implementation that uses standard J2SE facilities to execute buffered requests.
- * Created via the {@link SimpleClientHttpRequestFactory}.
+ * {@link ClientHttpRequest} implementation that uses standard JDK facilities to
+ * execute buffered requests. Created via the {@link SimpleClientHttpRequestFactory}.
  *
  * @author Arjen Poutsma
+ * @author Juergen Hoeller
  * @since 3.0
  * @see SimpleClientHttpRequestFactory#createRequest(java.net.URI, HttpMethod)
  */
@@ -63,12 +65,7 @@ public URI getURI() {
 
 	@Override
 	protected ClientHttpResponse executeInternal(HttpHeaders headers, byte[] bufferedOutput) throws IOException {
-		for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
-			String headerName = entry.getKey();
-			for (String headerValue : entry.getValue()) {
-				this.connection.addRequestProperty(headerName, headerValue);
-			}
-		}
+		addHeaders(this.connection, headers);
 
 		if (this.connection.getDoOutput() && this.outputStreaming) {
 			this.connection.setFixedLengthStreamingMode(bufferedOutput.length);
@@ -81,4 +78,25 @@ protected ClientHttpResponse executeInternal(HttpHeaders headers, byte[] buffere
 		return new SimpleClientHttpResponse(this.connection);
 	}
 
+
+	/**
+	 * Add the given headers to the given HTTP connection.
+	 * @param connection the connection to add the headers to
+	 * @param headers the headers to add
+	 */
+	static void addHeaders(HttpURLConnection connection, HttpHeaders headers) {
+		for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+			String headerName = entry.getKey();
+			if ("Cookie".equalsIgnoreCase(headerName)) {  // RFC 6265
+				String headerValue = StringUtils.collectionToDelimitedString(entry.getValue(), "; ");
+				connection.setRequestProperty(headerName, headerValue);
+			}
+			else {
+				for (String headerValue : entry.getValue()) {
+					connection.addRequestProperty(headerName, headerValue);
+				}
+			}
+		}
+	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
index 3aa31d9b83..92b38dc681 100644
--- a/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,13 +27,13 @@
 import org.springframework.util.Assert;
 
 /**
- * {@link ClientHttpRequestFactory} implementation that uses standard J2SE facilities.
+ * {@link ClientHttpRequestFactory} implementation that uses standard JDK facilities.
  *
  * @author Arjen Poutsma
  * @author Juergen Hoeller
  * @since 3.0
  * @see java.net.HttpURLConnection
- * @see CommonsClientHttpRequestFactory
+ * @see HttpComponentsClientHttpRequestFactory
  */
 public class SimpleClientHttpRequestFactory implements ClientHttpRequestFactory {
 
@@ -107,14 +107,12 @@ public void setReadTimeout(int readTimeout) {
 	}
 
 	/**
-	 * Set if the underlying URLConnection can be set to 'output streaming' mode. When
-	 * output streaming is enabled, authentication and redirection cannot be handled
-	 * automatically. If output streaming is disabled the
-	 * {@link HttpURLConnection#setFixedLengthStreamingMode(int)
-	 * setFixedLengthStreamingMode} and
-	 * {@link HttpURLConnection#setChunkedStreamingMode(int) setChunkedStreamingMode}
-	 * methods of the underlying connection will never be called.
-	 * <p>Default is {@code true}.
+	 * Set if the underlying URLConnection can be set to 'output streaming' mode.
+	 * Default is {@code true}.
+	 * <p>When output streaming is enabled, authentication and redirection cannot be handled automatically.
+	 * If output streaming is disabled, the {@link HttpURLConnection#setFixedLengthStreamingMode} and
+	 * {@link HttpURLConnection#setChunkedStreamingMode} methods of the underlying connection will never
+	 * be called.
 	 * @param outputStreaming if output streaming is enabled
 	 */
 	public void setOutputStreaming(boolean outputStreaming) {
@@ -129,8 +127,7 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IO
 			return new SimpleBufferingClientHttpRequest(connection, this.outputStreaming);
 		}
 		else {
-			return new SimpleStreamingClientHttpRequest(connection, this.chunkSize,
-					this.outputStreaming);
+			return new SimpleStreamingClientHttpRequest(connection, this.chunkSize, this.outputStreaming);
 		}
 	}
 
@@ -163,19 +160,23 @@ protected void prepareConnection(HttpURLConnection connection, String httpMethod
 		if (this.readTimeout >= 0) {
 			connection.setReadTimeout(this.readTimeout);
 		}
+
 		connection.setDoInput(true);
+
 		if ("GET".equals(httpMethod)) {
 			connection.setInstanceFollowRedirects(true);
 		}
 		else {
 			connection.setInstanceFollowRedirects(false);
 		}
-		if ("PUT".equals(httpMethod) || "POST".equals(httpMethod) || "PATCH".equals(httpMethod)) {
+
+		if ("POST".equals(httpMethod) || "PUT".equals(httpMethod) || "PATCH".equals(httpMethod)) {
 			connection.setDoOutput(true);
 		}
 		else {
 			connection.setDoOutput(false);
 		}
+
 		connection.setRequestMethod(httpMethod);
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java
index 1fc33f0b69..9ef130d9d7 100644
--- a/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * {@link ClientHttpResponse} implementation that uses standard J2SE facilities.
+ * {@link ClientHttpResponse} implementation that uses standard JDK facilities.
  * Obtained via {@link SimpleBufferingClientHttpRequest#execute()} and
  * {@link SimpleStreamingClientHttpRequest#execute()}.
  *
diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java
index f14f7e9025..be1a0bf412 100644
--- a/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/SimpleStreamingClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,16 +21,14 @@
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.List;
-import java.util.Map;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.util.StreamUtils;
 
 /**
- * {@link ClientHttpRequest} implementation that uses standard J2SE facilities to execute streaming requests.
- * Created via the {@link SimpleClientHttpRequestFactory}.
+ * {@link ClientHttpRequest} implementation that uses standard JDK facilities to
+ * execute streaming requests. Created via the {@link SimpleClientHttpRequestFactory}.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -47,13 +45,13 @@ final class SimpleStreamingClientHttpRequest extends AbstractClientHttpRequest {
 	private final boolean outputStreaming;
 
 
-	SimpleStreamingClientHttpRequest(HttpURLConnection connection, int chunkSize,
-			boolean outputStreaming) {
+	SimpleStreamingClientHttpRequest(HttpURLConnection connection, int chunkSize, boolean outputStreaming) {
 		this.connection = connection;
 		this.chunkSize = chunkSize;
 		this.outputStreaming = outputStreaming;
 	}
 
+
 	public HttpMethod getMethod() {
 		return HttpMethod.valueOf(this.connection.getRequestMethod());
 	}
@@ -70,7 +68,7 @@ public URI getURI() {
 	@Override
 	protected OutputStream getBodyInternal(HttpHeaders headers) throws IOException {
 		if (this.body == null) {
-			if(this.outputStreaming) {
+			if (this.outputStreaming) {
 				int contentLength = (int) headers.getContentLength();
 				if (contentLength >= 0) {
 					this.connection.setFixedLengthStreamingMode(contentLength);
@@ -79,22 +77,13 @@ protected OutputStream getBodyInternal(HttpHeaders headers) throws IOException {
 					this.connection.setChunkedStreamingMode(this.chunkSize);
 				}
 			}
-			writeHeaders(headers);
+			SimpleBufferingClientHttpRequest.addHeaders(this.connection, headers);
 			this.connection.connect();
 			this.body = this.connection.getOutputStream();
 		}
 		return StreamUtils.nonClosing(this.body);
 	}
 
-	private void writeHeaders(HttpHeaders headers) {
-		for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
-			String headerName = entry.getKey();
-			for (String headerValue : entry.getValue()) {
-				this.connection.addRequestProperty(headerName, headerValue);
-			}
-		}
-	}
-
 	@Override
 	protected ClientHttpResponse executeInternal(HttpHeaders headers) throws IOException {
 		try {
@@ -102,7 +91,7 @@ protected ClientHttpResponse executeInternal(HttpHeaders headers) throws IOExcep
 				this.body.close();
 			}
 			else {
-				writeHeaders(headers);
+				SimpleBufferingClientHttpRequest.addHeaders(this.connection, headers);
 				this.connection.connect();
 			}
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java b/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
index 969feefda5..61b894533f 100644
--- a/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
+++ b/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,10 @@
 import org.springframework.util.Assert;
 
 /**
- * Provides a convenient implementation of the {@link HttpRequest} interface that can be overridden to adapt the
- * request. Methods default to calling through to the wrapped request object.
+ * Provides a convenient implementation of the {@link HttpRequest} interface
+ * that can be overridden to adapt the request.
+ *
+ * <p>These methods default to calling through to the wrapped request object.
  *
  * @author Arjen Poutsma
  * @since 3.1
@@ -36,38 +38,38 @@ public class HttpRequestWrapper implements HttpRequest {
 
 
 	/**
-	 * Creates a new {@code HttpRequest} wrapping the given request object.
-	 *
+	 * Create a new {@code HttpRequest} wrapping the given request object.
 	 * @param request the request object to be wrapped
 	 */
 	public HttpRequestWrapper(HttpRequest request) {
-		Assert.notNull(request, "'request' must not be null");
+		Assert.notNull(request, "HttpRequest must not be null");
 		this.request = request;
 	}
 
+
 	/**
-	 * Returns the wrapped request.
+	 * Return the wrapped request.
 	 */
 	public HttpRequest getRequest() {
-		return request;
+		return this.request;
 	}
 
 	/**
-	 * Returns the method of the wrapped request.
+	 * Return the method of the wrapped request.
 	 */
 	public HttpMethod getMethod() {
 		return this.request.getMethod();
 	}
 
 	/**
-	 * Returns the URI of the wrapped request.
+	 * Return the URI of the wrapped request.
 	 */
 	public URI getURI() {
 		return this.request.getURI();
 	}
 
 	/**
-	 * Returns the headers of the wrapped request.
+	 * Return the headers of the wrapped request.
 	 */
 	public HttpHeaders getHeaders() {
 		return this.request.getHeaders();
diff --git a/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java
index 680225e928..3f3f3a8341 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -163,11 +163,12 @@ public final void write(T t, MediaType contentType, HttpOutputMessage outputMess
 
 		HttpHeaders headers = outputMessage.getHeaders();
 		if (headers.getContentType() == null) {
+			MediaType contentTypeToUse = contentType;
 			if (contentType == null || contentType.isWildcardType() || contentType.isWildcardSubtype()) {
-				contentType = getDefaultContentType(t);
+				contentTypeToUse = getDefaultContentType(t);
 			}
-			if (contentType != null) {
-				headers.setContentType(contentType);
+			if (contentTypeToUse != null) {
+				headers.setContentType(contentTypeToUse);
 			}
 		}
 		if (headers.getContentLength() == -1) {
@@ -227,7 +228,7 @@ protected abstract T readInternal(Class<? extends T> clazz, HttpInputMessage inp
 	/**
 	 * Abstract template method that writes the actual body. Invoked from {@link #write}.
 	 * @param t the object to write to the output message
-	 * @param outputMessage the message to write to
+	 * @param outputMessage the HTTP output message to write to
 	 * @throws IOException in case of I/O errors
 	 * @throws HttpMessageNotWritableException in case of conversion errors
 	 */
diff --git a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
index 74c1772558..0c8f2abb37 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,20 +42,24 @@
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
- * Implementation of {@link HttpMessageConverter} that can read and write {@link BufferedImage BufferedImages}.
+ * Implementation of {@link HttpMessageConverter} that can read and write
+ * {@link BufferedImage BufferedImages}.
  *
- * <p>By default, this converter can read all media types that are supported by the {@linkplain
- * ImageIO#getReaderMIMETypes() registered image readers}, and writes using the media type of the first available
- * {@linkplain javax.imageio.ImageIO#getWriterMIMETypes() registered image writer}. This behavior can be overriden by
- * setting the #setContentType(org.springframework.http.MediaType) contentType} properties.
+ * <p>By default, this converter can read all media types that are supported
+ * by the {@linkplain ImageIO#getReaderMIMETypes() registered image readers},
+ * and writes using the media type of the first available
+ * {@linkplain javax.imageio.ImageIO#getWriterMIMETypes() registered image writer}.
+ * The latter can be overridden by setting the
+ * {@link #setDefaultContentType defaultContentType} property.
  *
- * <p>If the {@link #setCacheDir(java.io.File) cacheDir} property is set to an existing directory, this converter will
- * cache image data.
+ * <p>If the {@link #setCacheDir cacheDir} property is set, this converter
+ * will cache image data.
  *
- * <p>The {@link #process(ImageReadParam)} and {@link #process(ImageWriteParam)} template methods allow subclasses to
- * override Image I/O parameters.
+ * <p>The {@link #process(ImageReadParam)} and {@link #process(ImageWriteParam)}
+ * template methods allow subclasses to override Image I/O parameters.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -72,15 +76,21 @@ public class BufferedImageHttpMessageConverter implements HttpMessageConverter<B
 	public BufferedImageHttpMessageConverter() {
 		String[] readerMediaTypes = ImageIO.getReaderMIMETypes();
 		for (String mediaType : readerMediaTypes) {
-			this.readableMediaTypes.add(MediaType.parseMediaType(mediaType));
+			if (StringUtils.hasText(mediaType)) {
+				this.readableMediaTypes.add(MediaType.parseMediaType(mediaType));
+			}
 		}
 
 		String[] writerMediaTypes = ImageIO.getWriterMIMETypes();
-		if (writerMediaTypes.length > 0) {
-			this.defaultContentType = MediaType.parseMediaType(writerMediaTypes[0]);
+		for (String mediaType : writerMediaTypes) {
+			if (StringUtils.hasText(mediaType)) {
+				this.defaultContentType = MediaType.parseMediaType(mediaType);
+				break;
+			}
 		}
 	}
 
+
 	/**
 	 * Sets the default {@code Content-Type} to be used for writing.
 	 * @throws IllegalArgumentException if the given content type is not supported by the Java Image I/O API
@@ -90,7 +100,7 @@ public void setDefaultContentType(MediaType defaultContentType) {
 		Iterator<ImageWriter> imageWriters = ImageIO.getImageWritersByMIMEType(defaultContentType.toString());
 		if (!imageWriters.hasNext()) {
 			throw new IllegalArgumentException(
-					"ContentType [" + defaultContentType + "] is not supported by the Java Image I/O API");
+					"Content-Type [" + defaultContentType + "] is not supported by the Java Image I/O API");
 		}
 
 		this.defaultContentType = defaultContentType;
@@ -240,15 +250,17 @@ private ImageOutputStream createImageOutputStream(OutputStream os) throws IOExce
 
 
 	/**
-	 * Template method that allows for manipulating the {@link ImageReadParam} before it is used to read an image.
-	 * <p>Default implementation is empty.
+	 * Template method that allows for manipulating the {@link ImageReadParam}
+	 * before it is used to read an image.
+	 * <p>The default implementation is empty.
 	 */
 	protected void process(ImageReadParam irp) {
 	}
 
 	/**
-	 * Template method that allows for manipulating the {@link ImageWriteParam} before it is used to write an image.
-	 * <p>Default implementation is empty.
+	 * Template method that allows for manipulating the {@link ImageWriteParam}
+	 * before it is used to write an image.
+	 * <p>The default implementation is empty.
 	 */
 	protected void process(ImageWriteParam iwp) {
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java
index d1b25f7c35..800a9febaa 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,9 @@
 /**
  * Implementation of {@link HttpMessageConverter} that can read and write byte arrays.
  *
- * <p>By default, this converter supports all media types ({@code &#42;&#47;&#42;}), and writes with a {@code
- * Content-Type} of {@code application/octet-stream}. This can be overridden by setting the {@link
- * #setSupportedMediaTypes(java.util.List) supportedMediaTypes} property.
+ * <p>By default, this converter supports all media types ({@code &#42;&#47;&#42;}), and
+ * writes with a {@code Content-Type} of {@code application/octet-stream}. This can be
+ * overridden by setting the {@link #setSupportedMediaTypes supportedMediaTypes} property.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -47,9 +47,10 @@ public boolean supports(Class<?> clazz) {
 	}
 
 	@Override
-	public byte[] readInternal(Class clazz, HttpInputMessage inputMessage) throws IOException {
+	public byte[] readInternal(Class<? extends byte[]> clazz, HttpInputMessage inputMessage) throws IOException {
 		long contentLength = inputMessage.getHeaders().getContentLength();
-		ByteArrayOutputStream bos = new ByteArrayOutputStream(contentLength >= 0 ? (int) contentLength : StreamUtils.BUFFER_SIZE);
+		ByteArrayOutputStream bos =
+				new ByteArrayOutputStream(contentLength >= 0 ? (int) contentLength : StreamUtils.BUFFER_SIZE);
 		StreamUtils.copy(inputMessage.getBody(), bos);
 		return bos.toByteArray();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java
index a27bef02c4..413f3075b9 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 import org.springframework.core.NestedRuntimeException;
 
 /**
- * Thrown by {@link HttpMessageConverter} implementations when the conversion fails.
+ * Thrown by {@link HttpMessageConverter} implementations when a conversion attempt fails.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -29,7 +29,6 @@ public class HttpMessageConversionException extends NestedRuntimeException {
 
 	/**
 	 * Create a new HttpMessageConversionException.
-	 *
 	 * @param msg the detail message
 	 */
 	public HttpMessageConversionException(String msg) {
@@ -38,7 +37,6 @@ public HttpMessageConversionException(String msg) {
 
 	/**
 	 * Create a new HttpMessageConversionException.
-	 *
 	 * @param msg the detail message
 	 * @param cause the root cause (if any)
 	 */
diff --git a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java
index 6271a198da..8d35ac90c3 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 
 /**
  * Thrown by {@link HttpMessageConverter} implementations when the
- * {@link HttpMessageConverter#read(Class, org.springframework.http.HttpInputMessage) read} method fails.
+ * {@link HttpMessageConverter#read} method fails.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -28,7 +28,6 @@ public class HttpMessageNotReadableException extends HttpMessageConversionExcept
 
 	/**
 	 * Create a new HttpMessageNotReadableException.
-	 *
 	 * @param msg the detail message
 	 */
 	public HttpMessageNotReadableException(String msg) {
@@ -37,11 +36,11 @@ public HttpMessageNotReadableException(String msg) {
 
 	/**
 	 * Create a new HttpMessageNotReadableException.
-	 *
 	 * @param msg the detail message
 	 * @param cause the root cause (if any)
 	 */
 	public HttpMessageNotReadableException(String msg, Throwable cause) {
 		super(msg, cause);
 	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java
index d8f8f33f97..5eb5fa7117 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,8 @@
 package org.springframework.http.converter;
 
 /**
- * Thrown by {@link org.springframework.http.converter.HttpMessageConverter} implementations when the
- * {@link org.springframework.http.converter.HttpMessageConverter#write(Object, org.springframework.http.MediaType,
- * org.springframework.http.HttpOutputMessage) write} method fails.
+ * Thrown by {@link HttpMessageConverter} implementations when the
+ * {@link HttpMessageConverter#write} method fails.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -29,7 +28,6 @@ public class HttpMessageNotWritableException extends HttpMessageConversionExcept
 
 	/**
 	 * Create a new HttpMessageNotWritableException.
-	 *
 	 * @param msg the detail message
 	 */
 	public HttpMessageNotWritableException(String msg) {
@@ -38,11 +36,11 @@ public HttpMessageNotWritableException(String msg) {
 
 	/**
 	 * Create a new HttpMessageNotWritableException.
-	 *
 	 * @param msg the detail message
 	 * @param cause the root cause (if any)
 	 */
 	public HttpMessageNotWritableException(String msg, Throwable cause) {
 		super(msg, cause);
 	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
index 69f22a92e1..9575b6e5cb 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-
 import javax.activation.FileTypeMap;
 import javax.activation.MimetypesFileTypeMap;
 
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
@@ -78,14 +78,26 @@ protected MediaType getDefaultContentType(Resource resource) {
 
 	@Override
 	protected Long getContentLength(Resource resource, MediaType contentType) throws IOException {
-		return resource.contentLength();
+		// Don't try to determine contentLength on InputStreamResource - cannot be read afterwards...
+		// Note: custom InputStreamResource subclasses could provide a pre-calculated content length!
+		return (InputStreamResource.class.equals(resource.getClass()) ? null : resource.contentLength());
 	}
 
 	@Override
 	protected void writeInternal(Resource resource, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
 
-		StreamUtils.copy(resource.getInputStream(), outputMessage.getBody());
+		InputStream in = resource.getInputStream();
+		try {
+			StreamUtils.copy(in, outputMessage.getBody());
+		}
+		finally {
+			try {
+				in.close();
+			}
+			catch (IOException ex) {
+			}
+		}
 		outputMessage.getBody().flush();
 	}
 
@@ -128,6 +140,9 @@ private static FileTypeMap loadFileTypeMapFromContextSupportModule() {
 		}
 
 		public static MediaType getMediaType(Resource resource) {
+			if (resource.getFilename() == null) {
+				return null;
+			}
 			String mediaType = fileTypeMap.getContentType(resource.getFilename());
 			return (StringUtils.hasText(mediaType) ? MediaType.parseMediaType(mediaType) : null);
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
index 686ec93767..4e78c3c78d 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
 
 	public static final Charset DEFAULT_CHARSET = Charset.forName("ISO-8859-1");
 
+
 	private final Charset defaultCharset;
 
 	private final List<Charset> availableCharsets;
@@ -66,6 +67,7 @@ public StringHttpMessageConverter(Charset defaultCharset) {
 		this.availableCharsets = new ArrayList<Charset>(Charset.availableCharsets().values());
 	}
 
+
 	/**
 	 * Indicates whether the {@code Accept-Charset} should be written to any outgoing request.
 	 * <p>Default is {@code true}.
@@ -74,6 +76,7 @@ public void setWriteAcceptCharset(boolean writeAcceptCharset) {
 		this.writeAcceptCharset = writeAcceptCharset;
 	}
 
+
 	@Override
 	public boolean supports(Class<?> clazz) {
 		return String.class.equals(clazz);
@@ -86,10 +89,10 @@ protected String readInternal(Class<? extends String> clazz, HttpInputMessage in
 	}
 
 	@Override
-	protected Long getContentLength(String s, MediaType contentType) {
+	protected Long getContentLength(String str, MediaType contentType) {
 		Charset charset = getContentTypeCharset(contentType);
 		try {
-			return (long) s.getBytes(charset.name()).length;
+			return (long) str.getBytes(charset.name()).length;
 		}
 		catch (UnsupportedEncodingException ex) {
 			// should not occur
@@ -98,17 +101,19 @@ protected Long getContentLength(String s, MediaType contentType) {
 	}
 
 	@Override
-	protected void writeInternal(String s, HttpOutputMessage outputMessage) throws IOException {
+	protected void writeInternal(String str, HttpOutputMessage outputMessage) throws IOException {
 		if (this.writeAcceptCharset) {
 			outputMessage.getHeaders().setAcceptCharset(getAcceptedCharsets());
 		}
 		Charset charset = getContentTypeCharset(outputMessage.getHeaders().getContentType());
-		StreamUtils.copy(s, charset, outputMessage.getBody());
+		StreamUtils.copy(str, charset, outputMessage.getBody());
 	}
 
+
 	/**
-	 * Return the list of supported {@link Charset}.
-	 * <p>By default, returns {@link Charset#availableCharsets()}. Can be overridden in subclasses.
+	 * Return the list of supported {@link Charset}s.
+	 * <p>By default, returns {@link Charset#availableCharsets()}.
+	 * Can be overridden in subclasses.
 	 * @return the list of accepted charsets
 	 */
 	protected List<Charset> getAcceptedCharsets() {
@@ -123,4 +128,5 @@ private Charset getContentTypeCharset(MediaType contentType) {
 			return this.defaultCharset;
 		}
 	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
index afd98288ad..eab30f1bb6 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
 
 /**
  * Abstract base class for Atom and RSS Feed message converters, using the
- * <a href="http://rometools.org/">ROME tools</a> project.
+ * <a href="https://rome.dev.java.net">ROME tools</a> project.
  *
  * @author Arjen Poutsma
  * @since 3.0.2
@@ -49,22 +49,21 @@ public abstract class AbstractWireFeedHttpMessageConverter<T extends WireFeed> e
 
 	public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
 
+
 	protected AbstractWireFeedHttpMessageConverter(MediaType supportedMediaType) {
 		super(supportedMediaType);
 	}
 
+
 	@Override
 	@SuppressWarnings("unchecked")
 	protected T readInternal(Class<? extends T> clazz, HttpInputMessage inputMessage)
 			throws IOException, HttpMessageNotReadableException {
+
 		WireFeedInput feedInput = new WireFeedInput();
 		MediaType contentType = inputMessage.getHeaders().getContentType();
-		Charset charset;
-		if (contentType != null && contentType.getCharSet() != null) {
-			charset = contentType.getCharSet();
-		} else {
-			charset = DEFAULT_CHARSET;
-		}
+		Charset charset =
+				(contentType != null && contentType.getCharSet() != null? contentType.getCharSet() : DEFAULT_CHARSET);
 		try {
 			Reader reader = new InputStreamReader(inputMessage.getBody(), charset);
 			return (T) feedInput.build(reader);
@@ -77,6 +76,7 @@ protected T readInternal(Class<? extends T> clazz, HttpInputMessage inputMessage
 	@Override
 	protected void writeInternal(T wireFeed, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
+
 		String wireFeedEncoding = wireFeed.getEncoding();
 		if (!StringUtils.hasLength(wireFeedEncoding)) {
 			wireFeedEncoding = DEFAULT_CHARSET.name();
@@ -89,13 +89,13 @@ protected void writeInternal(T wireFeed, HttpOutputMessage outputMessage)
 		}
 
 		WireFeedOutput feedOutput = new WireFeedOutput();
-
 		try {
 			Writer writer = new OutputStreamWriter(outputMessage.getBody(), wireFeedEncoding);
 			feedOutput.output(wireFeed, writer);
 		}
 		catch (FeedException ex) {
-			throw new HttpMessageNotWritableException("Could not write WiredFeed: " + ex.getMessage(), ex);
+			throw new HttpMessageNotWritableException("Could not write WireFeed: " + ex.getMessage(), ex);
 		}
 	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
index e8a4e43c7b..adfbfc8dca 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,16 +21,16 @@
 import org.springframework.http.MediaType;
 
 /**
- * Implementation of {@link org.springframework.http.converter.HttpMessageConverter} that can read and write Atom feeds.
- * Specifically, this converter can handle {@link Feed} objects, from the <a href="https://rome.dev.java.net/">ROME</a>
- * project.
+ * Implementation of {@link org.springframework.http.converter.HttpMessageConverter}
+ * that can read and write Atom feeds. Specifically, this converter can handle {@link Feed}
+ * objects from the <a href="https://rome.dev.java.net/">ROME</a> project.
  *
- * <p>By default, this converter reads and writes the media type ({@code application/atom+xml}). This can
- * be overridden by setting the {@link #setSupportedMediaTypes(java.util.List) supportedMediaTypes} property.
+ * <p>By default, this converter reads and writes the media type ({@code application/atom+xml}).
+ * This can be overridden through the {@link #setSupportedMediaTypes supportedMediaTypes} property.
  *
  * @author Arjen Poutsma
- * @see Feed
  * @since 3.0.2
+ * @see Feed
  */
 public class AtomFeedHttpMessageConverter extends AbstractWireFeedHttpMessageConverter<Feed> {
 
@@ -43,5 +43,4 @@ protected boolean supports(Class<?> clazz) {
 		return Feed.class.isAssignableFrom(clazz);
 	}
 
-
 }
diff --git a/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
index 08091984d9..b318c01746 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,16 +21,16 @@
 import org.springframework.http.MediaType;
 
 /**
- * Implementation of {@link org.springframework.http.converter.HttpMessageConverter} that can read and write RSS feeds.
- * Specifically, this converter can handle {@link Channel} objects, from the <a href="https://rome.dev.java.net/">ROME</a>
- * project.
+ * Implementation of {@link org.springframework.http.converter.HttpMessageConverter}
+ * that can read and write RSS feeds. Specifically, this converter can handle {@link Channel}
+ * objects from the <a href="https://rome.dev.java.net/">ROME</a> project.
  *
- * <p>By default, this converter reads and writes the media type ({@code application/rss+xml}). This can
- * be overridden by setting the {@link #setSupportedMediaTypes(java.util.List) supportedMediaTypes} property.
+ * <p>By default, this converter reads and writes the media type ({@code application/rss+xml}).
+ * This can be overridden through the {@link #setSupportedMediaTypes supportedMediaTypes} property.
  *
  * @author Arjen Poutsma
- * @see Channel
  * @since 3.0.2
+ * @see Channel
  */
 public class RssChannelHttpMessageConverter extends AbstractWireFeedHttpMessageConverter<Channel> {
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/feed/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/feed/package-info.java
index 919e6eaf1e..fd1393e424 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/package-info.java
@@ -1,23 +1,8 @@
-/*
- * Copyright 2002-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 /**
  *
  * Provides HttpMessageConverter implementations for handling Atom and RSS feeds.
+ * Based on the <a href="https://rome.dev.java.net/">ROME tools</a> project.
  *
  */
 package org.springframework.http.converter.feed;
-
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
index 4114aed3b3..fdc28468c3 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,6 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.Assert;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.AnnotationIntrospector;
@@ -38,17 +33,22 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
+import org.springframework.beans.FatalBeanException;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.Assert;
+
 /**
- * A FactoryBean for creating a Jackson {@link ObjectMapper} with setters to
- * enable or disable Jackson features from within XML configuration.
+ * A {@link FactoryBean} for creating a Jackson 2.x {@link ObjectMapper} with setters
+ * to enable or disable Jackson features from within XML configuration.
  *
  * <p>Example usage with
  * {@link org.springframework.http.converter.json.MappingJackson2HttpMessageConverter}:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
  *   &lt;property name="objectMapper">
- *     &lt;bean class="org.springframework.web.context.support.Jackson2ObjectMapperFactoryBean"
+ *     &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
  *       p:autoDetectFields="false"
  *       p:autoDetectGettersSetters="false"
  *       p:annotationIntrospector-ref="jaxbAnnotationIntrospector" />
@@ -56,12 +56,12 @@
  * &lt;/bean>
  * </pre>
  *
- * <p>Example usage with {@link org.springframework.web.servlet.view.json.MappingJackson2JsonView}:
+ * <p>Example usage with MappingJackson2JsonView:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
  *   &lt;property name="objectMapper">
- *     &lt;bean class="org.springframework.web.context.support.Jackson2ObjectMapperFactoryBean"
+ *     &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean"
  *       p:failOnEmptyBeans="false"
  *       p:indentOutput="true">
  *       &lt;property name="serializers">
@@ -74,40 +74,34 @@
  * &lt;/bean>
  * </pre>
  *
- * <p>In case there are no specific setters provided (for some rarely used
- * options), you can still use the more general methods
- * {@link #setFeaturesToEnable(Object[])} and {@link #setFeaturesToDisable(Object[])}.
+ * <p>In case there are no specific setters provided (for some rarely used options),
+ * you can still use the more general methods  {@link #setFeaturesToEnable} and
+ * {@link #setFeaturesToDisable}.
  *
- * <pre>
- * &lt;bean class="org.springframework.web.context.support.Jackson2ObjectMapperFactoryBean">
+ * <pre class="code">
+ * &lt;bean class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
  *   &lt;property name="featuresToEnable">
  *     &lt;array>
- *       &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature$WRAP_ROOT_VALUE"/>
- *       &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature$CLOSE_CLOSEABLE"/>
+ *       &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.WRAP_ROOT_VALUE"/>
+ *       &lt;util:constant static-field="com.fasterxml.jackson.databind.SerializationFeature.CLOSE_CLOSEABLE"/>
  *     &lt;/array>
  *   &lt;/property>
  *   &lt;property name="featuresToDisable">
  *     &lt;array>
- *       &lt;util:constant static-field="com.fasterxml.jackson.databind.MapperFeature$USE_ANNOTATIONS"/>
+ *       &lt;util:constant static-field="com.fasterxml.jackson.databind.MapperFeature.USE_ANNOTATIONS"/>
  *     &lt;/array>
  *   &lt;/property>
  * &lt;/bean>
  * </pre>
  *
- * <p>Note: This BeanFctory is singleton, so if you need more than one you'll need
- * to configure multiple instances.
- *
  * @author <a href="mailto:dmitry.katsubo@gmail.com">Dmitry Katsubo</a>
  * @author Rossen Stoyanchev
- *
  * @since 3.2
  */
 public class Jackson2ObjectMapperFactoryBean implements FactoryBean<ObjectMapper>, InitializingBean {
 
 	private ObjectMapper objectMapper;
 
-	private Map<Object, Boolean> features = new HashMap<Object, Boolean>();
-
 	private DateFormat dateFormat;
 
 	private AnnotationIntrospector annotationIntrospector;
@@ -116,6 +110,8 @@ public class Jackson2ObjectMapperFactoryBean implements FactoryBean<ObjectMapper
 
 	private final Map<Class<?>, JsonDeserializer<?>> deserializers = new LinkedHashMap<Class<?>, JsonDeserializer<?>>();
 
+	private final Map<Object, Boolean> features = new HashMap<Object, Boolean>();
+
 
 	/**
 	 * Set the ObjectMapper instance to use. If not set, the ObjectMapper will
@@ -127,6 +123,8 @@ public void setObjectMapper(ObjectMapper objectMapper) {
 
 	/**
 	 * Define the format for date/time with the given {@link DateFormat}.
+	 * <p>Note: Setting this property makes the exposed {@link ObjectMapper}
+	 * non-thread-safe, according to Jackson's thread safety rules.
 	 * @see #setSimpleDateFormat(String)
 	 */
 	public void setDateFormat(DateFormat dateFormat) {
@@ -135,6 +133,8 @@ public void setDateFormat(DateFormat dateFormat) {
 
 	/**
 	 * Define the date/time format with a {@link SimpleDateFormat}.
+	 * <p>Note: Setting this property makes the exposed {@link ObjectMapper}
+	 * non-thread-safe, according to Jackson's thread safety rules.
 	 * @see #setDateFormat(DateFormat)
 	 */
 	public void setSimpleDateFormat(String format) {
@@ -142,8 +142,7 @@ public void setSimpleDateFormat(String format) {
 	}
 
 	/**
-	 * Set the {@link AnnotationIntrospector} for both serialization and
-	 * deserialization.
+	 * Set an {@link AnnotationIntrospector} for both serialization and deserialization.
 	 */
 	public void setAnnotationIntrospector(AnnotationIntrospector annotationIntrospector) {
 		this.annotationIntrospector = annotationIntrospector;
@@ -197,8 +196,8 @@ public void setAutoDetectFields(boolean autoDetectFields) {
 	 * {@link MapperFeature#AUTO_DETECT_GETTERS} option.
 	 */
 	public void setAutoDetectGettersSetters(boolean autoDetectGettersSetters) {
-		this.features.put(MapperFeature.AUTO_DETECT_SETTERS, autoDetectGettersSetters);
 		this.features.put(MapperFeature.AUTO_DETECT_GETTERS, autoDetectGettersSetters);
+		this.features.put(MapperFeature.AUTO_DETECT_SETTERS, autoDetectGettersSetters);
 	}
 
 	/**
@@ -217,12 +216,11 @@ public void setIndentOutput(boolean indentOutput) {
 
 	/**
 	 * Specify features to enable.
-	 *
-	 * @see MapperFeature
-	 * @see SerializationFeature
-	 * @see DeserializationFeature
-	 * @see org.codehaus.jackson.map.JsonParser.Feature
-	 * @see org.codehaus.jackson.map.JsonGenerator.Feature
+	 * @see com.fasterxml.jackson.core.JsonParser.Feature
+	 * @see com.fasterxml.jackson.core.JsonGenerator.Feature
+	 * @see com.fasterxml.jackson.databind.SerializationFeature
+	 * @see com.fasterxml.jackson.databind.DeserializationFeature
+	 * @see com.fasterxml.jackson.databind.MapperFeature
 	 */
 	public void setFeaturesToEnable(Object... featuresToEnable) {
 		if (featuresToEnable != null) {
@@ -234,12 +232,11 @@ public void setFeaturesToEnable(Object... featuresToEnable) {
 
 	/**
 	 * Specify features to disable.
-	 *
-	 * @see MapperFeature
-	 * @see SerializationFeature
-	 * @see DeserializationFeature
-	 * @see org.codehaus.jackson.map.JsonParser.Feature
-	 * @see org.codehaus.jackson.map.JsonGenerator.Feature
+	 * @see com.fasterxml.jackson.core.JsonParser.Feature
+	 * @see com.fasterxml.jackson.core.JsonGenerator.Feature
+	 * @see com.fasterxml.jackson.databind.SerializationFeature
+	 * @see com.fasterxml.jackson.databind.DeserializationFeature
+	 * @see com.fasterxml.jackson.databind.MapperFeature
 	 */
 	public void setFeaturesToDisable(Object... featuresToDisable) {
 		if (featuresToDisable != null) {
@@ -249,7 +246,8 @@ public void setFeaturesToDisable(Object... featuresToDisable) {
 		}
 	}
 
-	public void afterPropertiesSet() throws FatalBeanException {
+
+	public void afterPropertiesSet() {
 		if (this.objectMapper == null) {
 			this.objectMapper = new ObjectMapper();
 		}
@@ -258,17 +256,17 @@ public void afterPropertiesSet() throws FatalBeanException {
 			this.objectMapper.setDateFormat(this.dateFormat);
 		}
 
-		if (this.serializers != null || this.deserializers != null) {
+		if (this.annotationIntrospector != null) {
+			this.objectMapper.setAnnotationIntrospector(this.annotationIntrospector);
+		}
+
+		if (!this.serializers.isEmpty() || !this.deserializers.isEmpty()) {
 			SimpleModule module = new SimpleModule();
 			addSerializers(module);
 			addDeserializers(module);
 			this.objectMapper.registerModule(module);
 		}
 
-		if (this.annotationIntrospector != null) {
-			this.objectMapper.setAnnotationIntrospector(this.annotationIntrospector);
-		}
-
 		for (Object feature : this.features.keySet()) {
 			configureFeature(feature, this.features.get(feature));
 		}
@@ -289,26 +287,27 @@ private <T> void addDeserializers(SimpleModule module) {
 	}
 
 	private void configureFeature(Object feature, boolean enabled) {
-		if (feature instanceof MapperFeature) {
-			this.objectMapper.configure((MapperFeature) feature, enabled);
+		if (feature instanceof JsonParser.Feature) {
+			this.objectMapper.configure((JsonParser.Feature) feature, enabled);
 		}
-		else if (feature instanceof DeserializationFeature) {
-			this.objectMapper.configure((DeserializationFeature) feature, enabled);
+		else if (feature instanceof JsonGenerator.Feature) {
+			this.objectMapper.configure((JsonGenerator.Feature) feature, enabled);
 		}
 		else if (feature instanceof SerializationFeature) {
 			this.objectMapper.configure((SerializationFeature) feature, enabled);
 		}
-		else if (feature instanceof JsonParser.Feature) {
-			this.objectMapper.configure((JsonParser.Feature) feature, enabled);
+		else if (feature instanceof DeserializationFeature) {
+			this.objectMapper.configure((DeserializationFeature) feature, enabled);
 		}
-		else if (feature instanceof JsonGenerator.Feature) {
-			this.objectMapper.configure((JsonGenerator.Feature) feature, enabled);
+		else if (feature instanceof MapperFeature) {
+			this.objectMapper.configure((MapperFeature) feature, enabled);
 		}
 		else {
-			throw new FatalBeanException("Unknown feature class " + feature.getClass().getName());
+			throw new FatalBeanException("Unknown feature class: " + feature.getClass().getName());
 		}
 	}
 
+
 	/**
 	 * Return the singleton ObjectMapper.
 	 */
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java
index 42c9bc122d..173250fcdd 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/JacksonObjectMapperFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,8 +32,8 @@
 import org.springframework.beans.factory.InitializingBean;
 
 /**
- * A FactoryBean for creating a Jackson {@link ObjectMapper} with setters to
- * enable or disable Jackson features from within XML configuration.
+ * A {@link FactoryBean} for creating a Jackson {@link ObjectMapper} with setters
+ * to enable or disable Jackson features from within XML configuration.
  *
  * <p>Example usage with MappingJacksonHttpMessageConverter:
  * <pre>
@@ -67,13 +67,13 @@
  * &lt;bean class="org.springframework.web.context.support.JacksonObjectMapperFactoryBean">
  * 	&lt;property name="featuresToEnable">
  * 		&lt;array>
- * 			&lt;util:constant static-field="org.codehaus.jackson.map.SerializationConfig$Feature.WRAP_ROOT_VALUE"/>
- * 			&lt;util:constant static-field="org.codehaus.jackson.map.SerializationConfig$Feature.CLOSE_CLOSEABLE"/>
+ * 			&lt;util:constant static-field="org.codehaus.jackson.map.SerializationConfig.Feature.WRAP_ROOT_VALUE"/>
+ * 			&lt;util:constant static-field="org.codehaus.jackson.map.SerializationConfig.Feature.CLOSE_CLOSEABLE"/>
  * 		&lt;/array>
  * 	&lt;/property>
  * 	&lt;property name="featuresToDisable">
  * 		&lt;array>
- * 			&lt;util:constant static-field="org.codehaus.jackson.map.DeserializationConfig$Feature.USE_ANNOTATIONS"/>
+ * 			&lt;util:constant static-field="org.codehaus.jackson.map.DeserializationConfig.Feature.USE_ANNOTATIONS"/>
  * 		&lt;/array>
  * 	&lt;/property>
  * &lt;/bean>
@@ -104,6 +104,8 @@ public void setObjectMapper(ObjectMapper objectMapper) {
 
 	/**
 	 * Define the format for date/time with the given {@link DateFormat}.
+	 * <p>Note: Setting this property makes the exposed {@link ObjectMapper}
+	 * non-thread-safe, according to Jackson's thread safety rules.
 	 * @see #setSimpleDateFormat(String)
 	 */
 	public void setDateFormat(DateFormat dateFormat) {
@@ -112,6 +114,8 @@ public void setDateFormat(DateFormat dateFormat) {
 
 	/**
 	 * Define the date/time format with a {@link SimpleDateFormat}.
+	 * <p>Note: Setting this property makes the exposed {@link ObjectMapper}
+	 * non-thread-safe, according to Jackson's thread safety rules.
 	 * @see #setDateFormat(DateFormat)
 	 */
 	public void setSimpleDateFormat(String format) {
@@ -132,8 +136,8 @@ public void setAnnotationIntrospector(AnnotationIntrospector annotationIntrospec
 	 * {@link org.codehaus.jackson.map.DeserializationConfig.Feature#AUTO_DETECT_FIELDS}.
 	 */
 	public void setAutoDetectFields(boolean autoDetectFields) {
-		this.features.put(DeserializationConfig.Feature.AUTO_DETECT_FIELDS, autoDetectFields);
 		this.features.put(SerializationConfig.Feature.AUTO_DETECT_FIELDS, autoDetectFields);
+		this.features.put(DeserializationConfig.Feature.AUTO_DETECT_FIELDS, autoDetectFields);
 	}
 
 	/**
@@ -161,11 +165,10 @@ public void setIndentOutput(boolean indentOutput) {
 
 	/**
 	 * Specify features to enable.
-	 *
+	 * @see org.codehaus.jackson.JsonParser.Feature
+	 * @see org.codehaus.jackson.JsonGenerator.Feature
 	 * @see org.codehaus.jackson.map.SerializationConfig.Feature
 	 * @see org.codehaus.jackson.map.DeserializationConfig.Feature
-	 * @see org.codehaus.jackson.map.JsonParser.Feature
-	 * @see org.codehaus.jackson.map.JsonGenerator.Feature
 	 */
 	public void setFeaturesToEnable(Object[] featuresToEnable) {
 		if (featuresToEnable != null) {
@@ -177,11 +180,10 @@ public void setFeaturesToEnable(Object[] featuresToEnable) {
 
 	/**
 	 * Specify features to disable.
-	 *
+	 * @see org.codehaus.jackson.JsonParser.Feature
+	 * @see org.codehaus.jackson.JsonGenerator.Feature
 	 * @see org.codehaus.jackson.map.SerializationConfig.Feature
 	 * @see org.codehaus.jackson.map.DeserializationConfig.Feature
-	 * @see org.codehaus.jackson.map.JsonParser.Feature
-	 * @see org.codehaus.jackson.map.JsonGenerator.Feature
 	 */
 	public void setFeaturesToDisable(Object[] featuresToDisable) {
 		if (featuresToDisable != null) {
@@ -191,6 +193,7 @@ public void setFeaturesToDisable(Object[] featuresToDisable) {
 		}
 	}
 
+
 	public void afterPropertiesSet() {
 		if (this.objectMapper == null) {
 			this.objectMapper = new ObjectMapper();
@@ -204,28 +207,29 @@ public void afterPropertiesSet() {
 			this.objectMapper.getSerializationConfig().setDateFormat(this.dateFormat);
 		}
 		for (Map.Entry<Object, Boolean> entry : this.features.entrySet()) {
-			configureFeature(entry.getKey(), entry.getValue().booleanValue());
+			configureFeature(entry.getKey(), entry.getValue());
 		}
 	}
 
 	private void configureFeature(Object feature, boolean enabled) {
-		if (feature instanceof DeserializationConfig.Feature) {
-			this.objectMapper.configure((DeserializationConfig.Feature) feature, enabled);
-		}
-		else if (feature instanceof SerializationConfig.Feature) {
-			this.objectMapper.configure((SerializationConfig.Feature) feature, enabled);
-		}
-		else if (feature instanceof JsonParser.Feature) {
+		if (feature instanceof JsonParser.Feature) {
 			this.objectMapper.configure((JsonParser.Feature) feature, enabled);
 		}
 		else if (feature instanceof JsonGenerator.Feature) {
 			this.objectMapper.configure((JsonGenerator.Feature) feature, enabled);
 		}
+		else if (feature instanceof SerializationConfig.Feature) {
+			this.objectMapper.configure((SerializationConfig.Feature) feature, enabled);
+		}
+		else if (feature instanceof DeserializationConfig.Feature) {
+			this.objectMapper.configure((DeserializationConfig.Feature) feature, enabled);
+		}
 		else {
 			throw new IllegalArgumentException("Unknown feature class: " + feature.getClass().getName());
 		}
 	}
 
+
 	/**
 	 * Return the singleton ObjectMapper.
 	 */
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
index a0b0a2a5b5..3ed2053332 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,14 +21,6 @@
 import java.nio.charset.Charset;
 import java.util.List;
 
-import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
@@ -38,6 +30,14 @@
 import org.springframework.http.converter.HttpMessageNotWritableException;
 import org.springframework.util.Assert;
 
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
 /**
  * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter}
  * that can read and write JSON using <a href="http://jackson.codehaus.org/">Jackson 2's</a> {@link ObjectMapper}.
@@ -61,7 +61,7 @@ public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConv
 
 	private ObjectMapper objectMapper = new ObjectMapper();
 
-	private boolean prefixJson = false;
+	private String jsonPrefix;
 
 	private Boolean prettyPrint;
 
@@ -101,15 +101,25 @@ public ObjectMapper getObjectMapper() {
 		return this.objectMapper;
 	}
 
+	/**
+	 * Specify a custom prefix to use for this view's JSON output.
+	 * Default is none.
+	 * @see #setPrefixJson
+	 */
+	public void setJsonPrefix(String jsonPrefix) {
+		this.jsonPrefix = jsonPrefix;
+	}
+
 	/**
 	 * Indicate whether the JSON output by this view should be prefixed with "{} &&". Default is false.
 	 * <p>Prefixing the JSON string in this manner is used to help prevent JSON Hijacking.
 	 * The prefix renders the string syntactically invalid as a script so that it cannot be hijacked.
 	 * This prefix does not affect the evaluation of JSON, but if JSON validation is performed on the
 	 * string, the prefix would need to be ignored.
+	 * @see #setJsonPrefix
 	 */
 	public void setPrefixJson(boolean prefixJson) {
-		this.prefixJson = prefixJson;
+		this.jsonPrefix = (prefixJson ? "{} && " : null);
 	}
 
 	/**
@@ -188,8 +198,8 @@ protected void writeInternal(Object object, HttpOutputMessage outputMessage)
 		}
 
 		try {
-			if (this.prefixJson) {
-				jsonGenerator.writeRaw("{} && ");
+			if (this.jsonPrefix != null) {
+				jsonGenerator.writeRaw(this.jsonPrefix);
 			}
 			this.objectMapper.writeValue(jsonGenerator, object);
 		}
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
index 448b3be8e8..f517160434 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.nio.charset.Charset;
-import java.util.List;
 
 import org.codehaus.jackson.JsonEncoding;
 import org.codehaus.jackson.JsonGenerator;
@@ -39,13 +38,13 @@
 import org.springframework.util.Assert;
 
 /**
- * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter}
- * that can read and write JSON using <a href="http://jackson.codehaus.org/">Jackson's</a> {@link ObjectMapper}.
+ * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter} that
+ * can read and write JSON using <a href="http://jackson.codehaus.org/">Jackson 1.x's</a> {@link ObjectMapper}.
  *
  * <p>This converter can be used to bind to typed beans, or untyped {@link java.util.HashMap HashMap} instances.
  *
  * <p>By default, this converter supports {@code application/json}. This can be overridden by setting the
- * {@link #setSupportedMediaTypes(List) supportedMediaTypes} property.
+ * {@link #setSupportedMediaTypes supportedMediaTypes} property.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -59,7 +58,7 @@ public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConve
 
 	private ObjectMapper objectMapper = new ObjectMapper();
 
-	private boolean prefixJson = false;
+	private String jsonPrefix;
 
 	private Boolean prettyPrint;
 
@@ -68,12 +67,14 @@ public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConve
 	 * Construct a new {@code MappingJacksonHttpMessageConverter}.
 	 */
 	public MappingJacksonHttpMessageConverter() {
-		super(new MediaType("application", "json", DEFAULT_CHARSET), new MediaType("application", "*+json", DEFAULT_CHARSET));
+		super(new MediaType("application", "json", DEFAULT_CHARSET),
+				new MediaType("application", "*+json", DEFAULT_CHARSET));
 	}
 
+
 	/**
-	 * Set the {@code ObjectMapper} for this view. If not set, a default
-	 * {@link ObjectMapper#ObjectMapper() ObjectMapper} is used.
+	 * Set the {@code ObjectMapper} for this view.
+	 * If not set, a default {@link ObjectMapper#ObjectMapper() ObjectMapper} is used.
 	 * <p>Setting a custom-configured {@code ObjectMapper} is one way to take further control of the JSON
 	 * serialization process. For example, an extended {@link org.codehaus.jackson.map.SerializerFactory}
 	 * can be configured that provides custom serializers for specific types. The other option for refining
@@ -86,12 +87,6 @@ public void setObjectMapper(ObjectMapper objectMapper) {
 		configurePrettyPrint();
 	}
 
-	private void configurePrettyPrint() {
-		if (this.prettyPrint != null) {
-			this.objectMapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, this.prettyPrint);
-		}
-	}
-
 	/**
 	 * Return the underlying {@code ObjectMapper} for this view.
 	 */
@@ -99,21 +94,31 @@ public ObjectMapper getObjectMapper() {
 		return this.objectMapper;
 	}
 
+	/**
+	 * Specify a custom prefix to use for this view's JSON output.
+	 * Default is none.
+	 * @see #setPrefixJson
+	 */
+	public void setJsonPrefix(String jsonPrefix) {
+		this.jsonPrefix = jsonPrefix;
+	}
+
 	/**
 	 * Indicate whether the JSON output by this view should be prefixed with "{} &&". Default is false.
 	 * <p>Prefixing the JSON string in this manner is used to help prevent JSON Hijacking.
 	 * The prefix renders the string syntactically invalid as a script so that it cannot be hijacked.
 	 * This prefix does not affect the evaluation of JSON, but if JSON validation is performed on the
 	 * string, the prefix would need to be ignored.
+	 * @see #setJsonPrefix
 	 */
 	public void setPrefixJson(boolean prefixJson) {
-		this.prefixJson = prefixJson;
+		this.jsonPrefix = (prefixJson ? "{} && " : null);
 	}
 
 	/**
 	 * Whether to use the {@link org.codehaus.jackson.impl.DefaultPrettyPrinter} when writing JSON.
 	 * This is a shortcut for setting up an {@code ObjectMapper} as follows:
-	 * <pre>
+	 * <pre class="code">
 	 * ObjectMapper mapper = new ObjectMapper();
 	 * mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
 	 * converter.setObjectMapper(mapper);
@@ -125,6 +130,13 @@ public void setPrettyPrint(boolean prettyPrint) {
 		configurePrettyPrint();
 	}
 
+	private void configurePrettyPrint() {
+		if (this.prettyPrint != null) {
+			this.objectMapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, this.prettyPrint);
+		}
+	}
+
+
 	@Override
 	public boolean canRead(Class<?> clazz, MediaType mediaType) {
 		return canRead(clazz, null, mediaType);
@@ -185,8 +197,8 @@ protected void writeInternal(Object object, HttpOutputMessage outputMessage)
 		}
 
 		try {
-			if (this.prefixJson) {
-				jsonGenerator.writeRaw("{} && ");
+			if (this.jsonPrefix != null) {
+				jsonGenerator.writeRaw(this.jsonPrefix);
 			}
 			this.objectMapper.writeValue(jsonGenerator, object);
 		}
@@ -217,8 +229,7 @@ protected void writeInternal(Object object, HttpOutputMessage outputMessage)
 	 */
 	protected JavaType getJavaType(Type type, Class<?> contextClass) {
 		return (contextClass != null) ?
-			TypeFactory.type(type, TypeFactory.type(contextClass)) :
-			TypeFactory.type(type);
+			TypeFactory.type(type, TypeFactory.type(contextClass)) : TypeFactory.type(type);
 	}
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
index cfe402e2f6..acae401a81 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.converter.support;
 
 import org.springframework.http.converter.FormHttpMessageConverter;
@@ -31,6 +32,9 @@
  */
 public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConverter {
 
+	private static final boolean jaxb2Present =
+			ClassUtils.isPresent("javax.xml.bind.Binder", AllEncompassingFormHttpMessageConverter.class.getClassLoader());
+
 	private static final boolean jackson2Present =
 			ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", AllEncompassingFormHttpMessageConverter.class.getClassLoader()) &&
 					ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", AllEncompassingFormHttpMessageConverter.class.getClassLoader());
@@ -39,9 +43,6 @@ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv
 			ClassUtils.isPresent("org.codehaus.jackson.map.ObjectMapper", AllEncompassingFormHttpMessageConverter.class.getClassLoader()) &&
 					ClassUtils.isPresent("org.codehaus.jackson.JsonGenerator", AllEncompassingFormHttpMessageConverter.class.getClassLoader());
 
-	private static final boolean jaxb2Present =
-			ClassUtils.isPresent("javax.xml.bind.Binder", AllEncompassingFormHttpMessageConverter.class.getClassLoader());
-
 
 	public AllEncompassingFormHttpMessageConverter() {
 		addPartConverter(new SourceHttpMessageConverter());
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
index af65ee275c..07a4b7d13f 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.http.converter.xml;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -25,13 +26,13 @@
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
-
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.UnmarshalException;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLResolver;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Result;
@@ -52,6 +53,7 @@
  * does not support writing.
  *
  * @author Arjen Poutsma
+ * @author Rossen Stoyanchev
  * @since 3.2
  */
 public class Jaxb2CollectionHttpMessageConverter<T extends Collection>
@@ -59,6 +61,7 @@ public class Jaxb2CollectionHttpMessageConverter<T extends Collection>
 
 	private final XMLInputFactory inputFactory = createXmlInputFactory();
 
+
 	/**
 	 * Always returns {@code false} since Jaxb2CollectionHttpMessageConverter
 	 * required generic type information in order to read a Collection.
@@ -119,6 +122,7 @@ protected T readFromSource(Class<? extends T> clazz, HttpHeaders headers, Source
 		throw new UnsupportedOperationException();
 	}
 
+	@SuppressWarnings("unchecked")
 	public T read(Type type, Class<?> contextClass, HttpInputMessage inputMessage)
 			throws IOException, HttpMessageNotReadableException {
 
@@ -160,7 +164,6 @@ else if (elementClass.isAnnotationPresent(XmlType.class)) {
 	/**
 	 * Create a Collection of the given type, with the given initial capacity
 	 * (if supported by the Collection type).
-	 *
 	 * @param collectionClass the type of Collection to instantiate
 	 * @return the created Collection instance
 	 */
@@ -218,13 +221,23 @@ protected void writeToResult(T t, HttpHeaders headers, Result result) throws IOE
 	/**
 	 * Create a {@code XMLInputFactory} that this converter will use to create {@link
 	 * javax.xml.stream.XMLStreamReader} and {@link javax.xml.stream.XMLEventReader} objects.
-	 * <p/> Can be overridden in subclasses, adding further initialization of the factory.
+	 * <p>Can be overridden in subclasses, adding further initialization of the factory.
 	 * The resulting factory is cached, so this method will only be called once.
-	 *
-	 * @return the created factory
 	 */
 	protected XMLInputFactory createXmlInputFactory() {
-		return XMLInputFactory.newInstance();
+		XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+		inputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
+		inputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
+		inputFactory.setXMLResolver(NO_OP_XML_RESOLVER);
+		return inputFactory;
 	}
 
+
+	private static final XMLResolver NO_OP_XML_RESOLVER = new XMLResolver() {
+		@Override
+		public Object resolveEntity(String publicID, String systemID, String base, String ns) {
+			return new ByteArrayInputStream(new byte[0]);
+		}
+	};
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
index 89d5bd0bd2..2decf67bd9 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.http.converter.xml;
 
 import java.io.IOException;
+import java.io.StringReader;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.MarshalException;
@@ -28,6 +29,14 @@
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamSource;
+
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
 
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.http.HttpHeaders;
@@ -38,17 +47,60 @@
 import org.springframework.util.ClassUtils;
 
 /**
- * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter} that can read
- * and write XML using JAXB2.
+ * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter}
+ * that can read and write XML using JAXB2.
  *
- * <p>This converter can read classes annotated with {@link XmlRootElement} and {@link XmlType}, and write classes
- * annotated with with {@link XmlRootElement}, or subclasses thereof.
+ * <p>This converter can read classes annotated with {@link XmlRootElement} and {@link XmlType},
+ * and write classes annotated with with {@link XmlRootElement}, or subclasses thereof.
  *
  * @author Arjen Poutsma
+ * @author Sebastien Deleuze
+ * @author Rossen Stoyanchev
  * @since 3.0
  */
 public class Jaxb2RootElementHttpMessageConverter extends AbstractJaxb2HttpMessageConverter<Object> {
 
+	private boolean supportDtd = false;
+
+	private boolean processExternalEntities = false;
+
+
+	/**
+	 * Indicates whether DTD parsing should be supported.
+	 * <p>Default is {@code false} meaning that DTD is disabled.
+	 */
+	public void setSupportDtd(boolean supportDtd) {
+		this.supportDtd = supportDtd;
+	}
+
+	/**
+	 * Whether DTD parsing is supported.
+	 */
+	public boolean isSupportDtd() {
+		return this.supportDtd;
+	}
+
+	/**
+	 * Indicates whether external XML entities are processed when converting to a Source.
+	 * <p>Default is {@code false}, meaning that external entities are not resolved.
+	 * <p><strong>Note:</strong> setting this option to {@code true} also
+	 * automatically sets {@link #setSupportDtd} to {@code true}.
+	 */
+	public void setProcessExternalEntities(boolean processExternalEntities) {
+		this.processExternalEntities = processExternalEntities;
+		if (processExternalEntities) {
+			setSupportDtd(true);
+		}
+	}
+
+	/**
+	 * Returns the configured value for whether XML external entities are allowed.
+	 */
+	public boolean isProcessExternalEntities() {
+		return this.processExternalEntities;
+	}
+
+
 	@Override
 	public boolean canRead(Class<?> clazz, MediaType mediaType) {
 		return (clazz.isAnnotationPresent(XmlRootElement.class) || clazz.isAnnotationPresent(XmlType.class)) &&
@@ -57,7 +109,7 @@ public boolean canRead(Class<?> clazz, MediaType mediaType) {
 
 	@Override
 	public boolean canWrite(Class<?> clazz, MediaType mediaType) {
-		return AnnotationUtils.findAnnotation(clazz, XmlRootElement.class) != null && canWrite(mediaType);
+		return (AnnotationUtils.findAnnotation(clazz, XmlRootElement.class) != null && canWrite(mediaType));
 	}
 
 	@Override
@@ -69,15 +121,24 @@ protected boolean supports(Class<?> clazz) {
 	@Override
 	protected Object readFromSource(Class<?> clazz, HttpHeaders headers, Source source) throws IOException {
 		try {
+			source = processSource(source);
 			Unmarshaller unmarshaller = createUnmarshaller(clazz);
 			if (clazz.isAnnotationPresent(XmlRootElement.class)) {
 				return unmarshaller.unmarshal(source);
 			}
 			else {
-				JAXBElement jaxbElement = unmarshaller.unmarshal(source, clazz);
+				JAXBElement<?> jaxbElement = unmarshaller.unmarshal(source, clazz);
 				return jaxbElement.getValue();
 			}
 		}
+		catch (NullPointerException ex) {
+			if (!isSupportDtd()) {
+				throw new HttpMessageNotReadableException("NPE while unmarshalling. " +
+						"This can happen on JDK 1.6 due to the presence of DTD " +
+						"declarations, which are disabled.", ex);
+			}
+			throw ex;
+		}
 		catch (UnmarshalException ex) {
 			throw new HttpMessageNotReadableException("Could not unmarshal to [" + clazz + "]: " + ex.getMessage(), ex);
 
@@ -87,10 +148,34 @@ protected Object readFromSource(Class<?> clazz, HttpHeaders headers, Source sour
 		}
 	}
 
+	protected Source processSource(Source source) {
+		if (source instanceof StreamSource) {
+			StreamSource streamSource = (StreamSource) source;
+			InputSource inputSource = new InputSource(streamSource.getInputStream());
+			try {
+				XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+				xmlReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+				String featureName = "http://xml.org/sax/features/external-general-entities";
+				xmlReader.setFeature(featureName, isProcessExternalEntities());
+				if (!isProcessExternalEntities()) {
+					xmlReader.setEntityResolver(NO_OP_ENTITY_RESOLVER);
+				}
+				return new SAXSource(xmlReader, inputSource);
+			}
+			catch (SAXException ex) {
+				logger.warn("Processing of external entities could not be disabled", ex);
+				return source;
+			}
+		}
+		else {
+			return source;
+		}
+	}
+
 	@Override
 	protected void writeToResult(Object o, HttpHeaders headers, Result result) throws IOException {
 		try {
-			Class clazz = ClassUtils.getUserClass(o);
+			Class<?> clazz = ClassUtils.getUserClass(o);
 			Marshaller marshaller = createMarshaller(clazz);
 			setCharset(headers.getContentType(), marshaller);
 			marshaller.marshal(o, result);
@@ -109,4 +194,12 @@ private void setCharset(MediaType contentType, Marshaller marshaller) throws Pro
 		}
 	}
 
+
+	private static final EntityResolver NO_OP_ENTITY_RESOLVER = new EntityResolver() {
+		@Override
+		public InputSource resolveEntity(String publicId, String systemId) {
+			return new InputSource(new StringReader(""));
+		}
+	};
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
index e949503263..11fc4c6d20 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,73 +17,189 @@
 package org.springframework.http.converter.xml;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.StringReader;
+import java.util.HashSet;
+import java.util.Set;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLResolver;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
-import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import org.w3c.dom.Document;
+import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
 
-import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpInputMessage;
+import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
+import org.springframework.http.converter.AbstractHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConversionException;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
+import org.springframework.util.StreamUtils;
 
 /**
- * Implementation of {@link org.springframework.http.converter.HttpMessageConverter} that can read and write {@link
- * Source} objects.
+ * Implementation of {@link org.springframework.http.converter.HttpMessageConverter}
+ * that can read and write {@link Source} objects.
  *
  * @author Arjen Poutsma
+ * @author Rossen Stoyanchev
  * @since 3.0
  */
-public class SourceHttpMessageConverter<T extends Source> extends AbstractXmlHttpMessageConverter<T> {
+public class SourceHttpMessageConverter<T extends Source> extends AbstractHttpMessageConverter<T> {
+
+	private static final Set<Class<?>> SUPPORTED_CLASSES = new HashSet<Class<?>>(4);
+
+	static {
+		SUPPORTED_CLASSES.add(DOMSource.class);
+		SUPPORTED_CLASSES.add(SAXSource.class);
+		SUPPORTED_CLASSES.add(StreamSource.class);
+		SUPPORTED_CLASSES.add(Source.class);
+	}
+
+
+	private final TransformerFactory transformerFactory = TransformerFactory.newInstance();
+
+	private boolean supportDtd = false;
+
+	private boolean processExternalEntities = false;
+
+
+	/**
+	 * Sets the {@link #setSupportedMediaTypes(java.util.List) supportedMediaTypes}
+	 * to {@code text/xml} and {@code application/xml}, and {@code application/*-xml}.
+	 */
+	public SourceHttpMessageConverter() {
+		super(MediaType.APPLICATION_XML, MediaType.TEXT_XML, new MediaType("application", "*+xml"));
+	}
+
+
+	/**
+	 * Indicates whether DTD parsing should be supported.
+	 * <p>Default is {@code false} meaning that DTD is disabled.
+	 */
+	public void setSupportDtd(boolean supportDtd) {
+		this.supportDtd = supportDtd;
+	}
+
+	/**
+	 * Whether DTD parsing is supported.
+	 */
+	public boolean isSupportDtd() {
+		return this.supportDtd;
+	}
+
+	/**
+	 * Indicates whether external XML entities are processed when converting to a Source.
+	 * <p>Default is {@code false}, meaning that external entities are not resolved.
+	 * <p><strong>Note:</strong> setting this option to {@code true} also
+	 * automatically sets {@link #setSupportDtd} to {@code true}.
+	 */
+	public void setProcessExternalEntities(boolean processExternalEntities) {
+		this.processExternalEntities = processExternalEntities;
+		if (processExternalEntities) {
+			setSupportDtd(true);
+		}
+	}
+
+	/**
+	 * Returns the configured value for whether XML external entities are allowed.
+	 */
+	public boolean isProcessExternalEntities() {
+		return this.processExternalEntities;
+	}
+
 
 	@Override
 	public boolean supports(Class<?> clazz) {
-		return DOMSource.class.equals(clazz) || SAXSource.class.equals(clazz) || StreamSource.class.equals(clazz) ||
-				Source.class.equals(clazz);
+		return SUPPORTED_CLASSES.contains(clazz);
 	}
 
 	@Override
 	@SuppressWarnings("unchecked")
-	protected T readFromSource(Class clazz, HttpHeaders headers, Source source) throws IOException {
+	protected T readInternal(Class<? extends T> clazz, HttpInputMessage inputMessage)
+			throws IOException, HttpMessageNotReadableException {
+
+		InputStream body = inputMessage.getBody();
+		if (DOMSource.class.equals(clazz)) {
+			return (T) readDOMSource(body);
+		}
+		else if (SAXSource.class.equals(clazz)) {
+			return (T) readSAXSource(body);
+		}
+		else if (StreamSource.class.equals(clazz) || Source.class.equals(clazz)) {
+			return (T) readStreamSource(body);
+		}
+		else {
+			throw new HttpMessageConversionException("Could not read class [" + clazz +
+					"]. Only DOMSource, SAXSource, and StreamSource are supported.");
+		}
+	}
+
+	private DOMSource readDOMSource(InputStream body) throws IOException {
 		try {
-			if (DOMSource.class.equals(clazz)) {
-				DOMResult domResult = new DOMResult();
-				transform(source, domResult);
-				return (T) new DOMSource(domResult.getNode());
-			}
-			else if (SAXSource.class.equals(clazz)) {
-				ByteArrayInputStream bis = transformToByteArrayInputStream(source);
-				return (T) new SAXSource(new InputSource(bis));
+			DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+			documentBuilderFactory.setNamespaceAware(true);
+			documentBuilderFactory.setFeature(
+					"http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+			documentBuilderFactory.setFeature(
+					"http://xml.org/sax/features/external-general-entities", isProcessExternalEntities());
+			DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
+			if (!isProcessExternalEntities()) {
+				documentBuilder.setEntityResolver(NO_OP_ENTITY_RESOLVER);
 			}
-			else if (StreamSource.class.equals(clazz) || Source.class.equals(clazz)) {
-				ByteArrayInputStream bis = transformToByteArrayInputStream(source);
-				return (T) new StreamSource(bis);
+			Document document = documentBuilder.parse(body);
+			return new DOMSource(document);
+		}
+		catch (NullPointerException ex) {
+			if (!isSupportDtd()) {
+				throw new HttpMessageNotReadableException("NPE while unmarshalling. " +
+						"This can happen on JDK 1.6 due to the presence of DTD " +
+						"declarations, which are disabled.", ex);
 			}
-			else {
-				throw new HttpMessageConversionException("Could not read class [" + clazz +
-						"]. Only DOMSource, SAXSource, and StreamSource are supported.");
+			throw ex;
+		}
+		catch (ParserConfigurationException ex) {
+			throw new HttpMessageNotReadableException("Could not set feature: " + ex.getMessage(), ex);
+		}
+		catch (SAXException ex) {
+			throw new HttpMessageNotReadableException("Could not parse document: " + ex.getMessage(), ex);
+		}
+	}
+
+	private SAXSource readSAXSource(InputStream body) throws IOException {
+		try {
+			XMLReader reader = XMLReaderFactory.createXMLReader();
+			reader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+			reader.setFeature("http://xml.org/sax/features/external-general-entities", isProcessExternalEntities());
+			if (!isProcessExternalEntities()) {
+				reader.setEntityResolver(NO_OP_ENTITY_RESOLVER);
 			}
+			byte[] bytes = StreamUtils.copyToByteArray(body);
+			return new SAXSource(reader, new InputSource(new ByteArrayInputStream(bytes)));
 		}
-		catch (TransformerException ex) {
-			throw new HttpMessageNotReadableException("Could not transform from [" + source + "] to [" + clazz + "]",
-					ex);
+		catch (SAXException ex) {
+			throw new HttpMessageNotReadableException("Could not parse document: " + ex.getMessage(), ex);
 		}
 	}
 
-	private ByteArrayInputStream transformToByteArrayInputStream(Source source) throws TransformerException {
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
-		transform(source, new StreamResult(bos));
-		return new ByteArrayInputStream(bos.toByteArray());
+	private StreamSource readStreamSource(InputStream body) throws IOException {
+		byte[] bytes = StreamUtils.copyToByteArray(body);
+		return new StreamSource(new ByteArrayInputStream(bytes));
 	}
 
 	@Override
@@ -102,33 +218,55 @@ protected Long getContentLength(T t, MediaType contentType) {
 	}
 
 	@Override
-	protected void writeToResult(T t, HttpHeaders headers, Result result) throws IOException {
+	protected void writeInternal(T t, HttpOutputMessage outputMessage)
+			throws IOException, HttpMessageNotWritableException {
 		try {
+			Result result = new StreamResult(outputMessage.getBody());
 			transform(t, result);
 		}
 		catch (TransformerException ex) {
-			throw new HttpMessageNotWritableException("Could not transform [" + t + "] to [" + result + "]", ex);
+			throw new HttpMessageNotWritableException("Could not transform [" + t + "] to output message", ex);
 		}
 	}
 
+	private void transform(Source source, Result result) throws TransformerException {
+		this.transformerFactory.newTransformer().transform(source, result);
+	}
+
+
 	private static class CountingOutputStream extends OutputStream {
 
-		private long count = 0;
+		long count = 0;
 
 		@Override
 		public void write(int b) throws IOException {
-			count++;
+			this.count++;
 		}
 
 		@Override
 		public void write(byte[] b) throws IOException {
-			count += b.length;
+			this.count += b.length;
 		}
 
 		@Override
 		public void write(byte[] b, int off, int len) throws IOException {
-			count += len;
+			this.count += len;
 		}
 	}
 
+
+	private static final EntityResolver NO_OP_ENTITY_RESOLVER = new EntityResolver() {
+		@Override
+		public InputSource resolveEntity(String publicId, String systemId) {
+			return new InputSource(new StringReader(""));
+		}
+	};
+
+	private static final XMLResolver NO_OP_XML_RESOLVER = new XMLResolver() {
+		@Override
+		public Object resolveEntity(String publicID, String systemID, String base, String ns) {
+			return new ByteArrayInputStream(new byte[0]);
+		}
+	};
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java
index 87cddf189f..2848bd2933 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.http.converter.xml;
 
 import org.springframework.http.converter.FormHttpMessageConverter;
-import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 
 /**
  * Extension of {@link org.springframework.http.converter.FormHttpMessageConverter},
@@ -25,7 +24,8 @@
  *
  * @author Juergen Hoeller
  * @since 3.0.3
- * @deprecated in favor of {@link AllEncompassingFormHttpMessageConverter}
+ * @deprecated in favor of
+ * {@link org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter}
  */
 @Deprecated
 public class XmlAwareFormHttpMessageConverter extends FormHttpMessageConverter {
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
index 5dd0dbd424..d0d7d99f87 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,17 +28,17 @@
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.util.Assert;
+import org.springframework.util.LinkedCaseInsensitiveMap;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link ServerHttpRequest} implementation that is based on a {@link HttpServletRequest}.
@@ -54,6 +54,7 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
 
 	private static final String METHOD_POST = "POST";
 
+
 	private final HttpServletRequest servletRequest;
 
 	private HttpHeaders headers;
@@ -64,7 +65,7 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
 	 * @param servletRequest the servlet request
 	 */
 	public ServletServerHttpRequest(HttpServletRequest servletRequest) {
-		Assert.notNull(servletRequest, "'servletRequest' must not be null");
+		Assert.notNull(servletRequest, "HttpServletRequest must not be null");
 		this.servletRequest = servletRequest;
 	}
 
@@ -103,21 +104,30 @@ public HttpHeaders getHeaders() {
 				}
 			}
 			// HttpServletRequest exposes some headers as properties: we should include those if not already present
-			if (this.headers.getContentType() == null && this.servletRequest.getContentType() != null) {
-				MediaType contentType = MediaType.parseMediaType(this.servletRequest.getContentType());
-				this.headers.setContentType(contentType);
+			MediaType contentType = this.headers.getContentType();
+			if (contentType == null) {
+				String requestContentType = this.servletRequest.getContentType();
+				if (StringUtils.hasLength(requestContentType)) {
+					contentType = MediaType.parseMediaType(requestContentType);
+					this.headers.setContentType(contentType);
+				}
 			}
-			if (this.headers.getContentType() != null && this.headers.getContentType().getCharSet() == null &&
-					this.servletRequest.getCharacterEncoding() != null) {
-				MediaType oldContentType = this.headers.getContentType();
-				Charset charSet = Charset.forName(this.servletRequest.getCharacterEncoding());
-				Map<String, String> params = new HashMap<String, String>(oldContentType.getParameters());
-				params.put("charset", charSet.toString());
-				MediaType newContentType = new MediaType(oldContentType.getType(), oldContentType.getSubtype(), params);
-				this.headers.setContentType(newContentType);
+			if (contentType != null && contentType.getCharSet() == null) {
+				String requestEncoding = this.servletRequest.getCharacterEncoding();
+				if (StringUtils.hasLength(requestEncoding)) {
+					Charset charSet = Charset.forName(requestEncoding);
+					Map<String, String> params = new LinkedCaseInsensitiveMap<String>();
+					params.putAll(contentType.getParameters());
+					params.put("charset", charSet.toString());
+					MediaType newContentType = new MediaType(contentType.getType(), contentType.getSubtype(), params);
+					this.headers.setContentType(newContentType);
+				}
 			}
-			if (this.headers.getContentLength() == -1 && this.servletRequest.getContentLength() != -1) {
-				this.headers.setContentLength(this.servletRequest.getContentLength());
+			if (this.headers.getContentLength() == -1) {
+				int requestContentLength = this.servletRequest.getContentLength();
+				if (requestContentLength != -1) {
+					this.headers.setContentLength(requestContentLength);
+				}
 			}
 		}
 		return this.headers;
@@ -132,19 +142,22 @@ public InputStream getBody() throws IOException {
 		}
 	}
 
-	private boolean isFormPost(HttpServletRequest request) {
-		return (request.getContentType() != null && request.getContentType().contains(FORM_CONTENT_TYPE) &&
+
+
+	private static boolean isFormPost(HttpServletRequest request) {
+		String contentType = request.getContentType();
+		return (contentType != null && contentType.contains(FORM_CONTENT_TYPE) &&
 				METHOD_POST.equalsIgnoreCase(request.getMethod()));
 	}
 
 	/**
 	 * Use {@link javax.servlet.ServletRequest#getParameterMap()} to reconstruct the
 	 * body of a form 'POST' providing a predictable outcome as opposed to reading
-	 * from the body, which can fail if any other code has used ServletRequest
-	 * to access a parameter thus causing the input stream to be "consumed".
+	 * from the body, which can fail if any other code has used the ServletRequest
+	 * to access a parameter, thus causing the input stream to be "consumed".
 	 */
-	private InputStream getBodyFromServletRequestParameters(HttpServletRequest request) throws IOException {
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+	private static InputStream getBodyFromServletRequestParameters(HttpServletRequest request) throws IOException {
+		ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
 		Writer writer = new OutputStreamWriter(bos, FORM_CHARSET);
 
 		Map<String, String[]> form = request.getParameterMap();
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java
index 18668f5300..eee844b648 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,10 +99,10 @@ public String getCodebaseUrl() {
 	 * Set the HttpInvokerRequestExecutor implementation to use for executing
 	 * remote invocations.
 	 * <p>Default is {@link SimpleHttpInvokerRequestExecutor}. Alternatively,
-	 * consider using {@link CommonsHttpInvokerRequestExecutor} for more
+	 * consider using {@link HttpComponentsHttpInvokerRequestExecutor} for more
 	 * sophisticated needs.
 	 * @see SimpleHttpInvokerRequestExecutor
-	 * @see CommonsHttpInvokerRequestExecutor
+	 * @see HttpComponentsHttpInvokerRequestExecutor
 	 */
 	public void setHttpInvokerRequestExecutor(HttpInvokerRequestExecutor httpInvokerRequestExecutor) {
 		this.httpInvokerRequestExecutor = httpInvokerRequestExecutor;
@@ -137,7 +137,7 @@ public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		}
 
 		RemoteInvocation invocation = createRemoteInvocation(methodInvocation);
-		RemoteInvocationResult result = null;
+		RemoteInvocationResult result;
 		try {
 			result = executeRequest(invocation, methodInvocation);
 		}
@@ -200,18 +200,18 @@ protected RemoteInvocationResult executeRequest(RemoteInvocation invocation) thr
 	 */
 	protected RemoteAccessException convertHttpInvokerAccessException(Throwable ex) {
 		if (ex instanceof ConnectException) {
-			throw new RemoteConnectFailureException(
+			return new RemoteConnectFailureException(
 					"Could not connect to HTTP invoker remote service at [" + getServiceUrl() + "]", ex);
 		}
-		else if (ex instanceof ClassNotFoundException || ex instanceof NoClassDefFoundError ||
+
+		if (ex instanceof ClassNotFoundException || ex instanceof NoClassDefFoundError ||
 				ex instanceof InvalidClassException) {
-			throw new RemoteAccessException(
+			return new RemoteAccessException(
 					"Could not deserialize result from HTTP invoker remote service [" + getServiceUrl() + "]", ex);
 		}
-		else {
-			throw new RemoteAccessException(
-				"Could not access HTTP invoker remote service at [" + getServiceUrl() + "]", ex);
-		}
+
+		return new RemoteAccessException(
+					"Could not access HTTP invoker remote service at [" + getServiceUrl() + "]", ex);
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java
index d8a2be4d0f..a02cebb602 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,11 @@
  * expense of being tied to Java. Nevertheless, it is as easy to set up as
  * Hessian and Burlap, which is its main advantage compared to RMI.
  *
+ * <p><b>WARNING: Be aware of vulnerabilities due to unsafe Java deserialization:
+ * Manipulated input streams could lead to unwanted code execution on the server
+ * during the deserialization step. As a consequence, do not expose HTTP invoker
+ * endpoints to untrusted clients but rather just between your own services.</b>
+ *
  * @author Juergen Hoeller
  * @since 1.1
  * @see #setServiceInterface
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
index 67d35cae79..a8a590962f 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,11 @@
  * expense of being tied to Java. Nevertheless, it is as easy to set up as
  * Hessian and Burlap, which is its main advantage compared to RMI.
  *
+ * <p><b>WARNING: Be aware of vulnerabilities due to unsafe Java deserialization:
+ * Manipulated input streams could lead to unwanted code execution on the server
+ * during the deserialization step. As a consequence, do not expose HTTP invoker
+ * endpoints to untrusted clients but rather just between your own services.</b>
+ *
  * @author Juergen Hoeller
  * @since 1.1
  * @see HttpInvokerClientInterceptor
diff --git a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java
index f41a2b8f92..eb3fcc3719 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package org.springframework.web;
 
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
 import javax.servlet.ServletException;
 
 import org.springframework.http.MediaType;
@@ -33,6 +33,7 @@ public abstract class HttpMediaTypeException extends ServletException {
 
 	private final List<MediaType> supportedMediaTypes;
 
+
 	/**
 	 * Create a new HttpMediaTypeException.
 	 * @param message the exception message
@@ -48,13 +49,15 @@ protected HttpMediaTypeException(String message) {
 	 */
 	protected HttpMediaTypeException(String message, List<MediaType> supportedMediaTypes) {
 		super(message);
-		this.supportedMediaTypes = supportedMediaTypes;
+		this.supportedMediaTypes = Collections.unmodifiableList(supportedMediaTypes);
 	}
 
+
 	/**
 	 * Return the list of supported media types.
 	 */
 	public List<MediaType> getSupportedMediaTypes() {
-		return supportedMediaTypes;
+		return this.supportedMediaTypes;
 	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java
index ed820c7043..93bc99972a 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@ public class HttpMediaTypeNotSupportedException extends HttpMediaTypeException {
 
 	private final MediaType contentType;
 
+
 	/**
 	 * Create a new HttpMediaTypeNotSupportedException.
 	 * @param message the exception message
@@ -61,11 +62,12 @@ public HttpMediaTypeNotSupportedException(MediaType contentType, List<MediaType>
 		this.contentType = contentType;
 	}
 
+
 	/**
 	 * Return the HTTP request content type method that caused the failure.
 	 */
 	public MediaType getContentType() {
-		return contentType;
+		return this.contentType;
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java b/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
index a70b37386c..44096bb583 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 package org.springframework.web;
 
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.Set;
-
 import javax.servlet.ServletException;
 
 import org.springframework.http.HttpMethod;
@@ -105,11 +105,11 @@ public String[] getSupportedMethods() {
 	 * Return the actually supported HTTP methods, if known, as {@link HttpMethod} instances.
 	 */
 	public Set<HttpMethod> getSupportedHttpMethods() {
-		Set<HttpMethod> supportedMethods = new HashSet<HttpMethod>();
+		Set<HttpMethod> supportedMethods = new LinkedHashSet<HttpMethod>();
 		for (String value : this.supportedMethods) {
 			supportedMethods.add(HttpMethod.valueOf(value));
 		}
-		return supportedMethods;
+		return Collections.unmodifiableSet(supportedMethods);
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
index 2c579172c1..4d9472403d 100644
--- a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.web;
 
 import java.lang.reflect.Modifier;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ServiceLoader;
@@ -47,12 +46,7 @@
  * Final Draft specification for complete details.
  *
  * <h3>In combination with {@code web.xml}</h3>
- * <p>If a web application includes a {@code WEB-INF/web.xml} file, it is important to
- * understand that neither this nor any other {@code ServletContextInitializer} will be
- * processed unless the {@code <web-app>} element's {@code version} attribute is >= "3.0"
- * and the {@code xsi:schemaLocation} for "http://java.sun.com/xml/ns/javaee" is set to
- * "http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd".
- * <p>A web application can choose to limit the amount of classpath scanning the Servlet
+ * A web application can choose to limit the amount of classpath scanning the Servlet
  * container does at startup either through the {@code metadata-complete} attribute in
  * {@code web.xml}, which controls scanning for Servlet annotations or through an
  * {@code <absolute-ordering>} element also in {@code web.xml}, which controls which
@@ -173,7 +167,7 @@ public void onStartup(Set<Class<?>> webAppInitializerClasses, ServletContext ser
 			return;
 		}
 
-		Collections.sort(initializers, new AnnotationAwareOrderComparator());
+		AnnotationAwareOrderComparator.sort(initializers);
 		servletContext.log("Spring WebApplicationInitializers detected on classpath: " + initializers);
 
 		for (WebApplicationInitializer initializer : initializers) {
diff --git a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManager.java b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManager.java
index 0024eef27d..2886fe487f 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManager.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManager.java
@@ -50,6 +50,8 @@
  */
 public class ContentNegotiationManager implements ContentNegotiationStrategy, MediaTypeFileExtensionResolver {
 
+	private static final List<MediaType> MEDIA_TYPE_ALL = Arrays.asList(MediaType.ALL);
+
 	private final List<ContentNegotiationStrategy> contentNegotiationStrategies =
 			new ArrayList<ContentNegotiationStrategy>();
 
@@ -119,9 +121,10 @@ public void addFileExtensionResolvers(MediaTypeFileExtensionResolver... resolver
 	public List<MediaType> resolveMediaTypes(NativeWebRequest webRequest) throws HttpMediaTypeNotAcceptableException {
 		for (ContentNegotiationStrategy strategy : this.contentNegotiationStrategies) {
 			List<MediaType> mediaTypes = strategy.resolveMediaTypes(webRequest);
-			if (!mediaTypes.isEmpty()) {
-				return mediaTypes;
+			if (mediaTypes.isEmpty() || mediaTypes.equals(MEDIA_TYPE_ALL)) {
+				continue;
 			}
+			return mediaTypes;
 		}
 		return Collections.emptyList();
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
index a5d0357d91..0e684b015b 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java
@@ -128,6 +128,10 @@ public void setUseJaf(boolean useJaf) {
 		this.useJaf = useJaf;
 	}
 
+	private boolean isUseJafTurnedOff() {
+		return (this.useJaf != null && !this.useJaf);
+	}
+
 	/**
 	 * Indicate whether a request parameter should be used to determine the
 	 * requested media type with the <em>2nd highest priority</em>, i.e.
@@ -184,9 +188,10 @@ public void afterPropertiesSet() {
 
 		if (this.favorPathExtension) {
 			PathExtensionContentNegotiationStrategy strategy;
-			if (this.servletContext != null) {
+			if (this.servletContext != null && !isUseJafTurnedOff()) {
 				strategy = new ServletPathExtensionContentNegotiationStrategy(this.servletContext, this.mediaTypes);
-			} else {
+			}
+			else {
 				strategy = new PathExtensionContentNegotiationStrategy(this.mediaTypes);
 			}
 			if (this.useJaf != null) {
diff --git a/spring-web/src/main/java/org/springframework/web/accept/PathExtensionContentNegotiationStrategy.java b/spring-web/src/main/java/org/springframework/web/accept/PathExtensionContentNegotiationStrategy.java
index c3c24fe85b..92209600bf 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/PathExtensionContentNegotiationStrategy.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/PathExtensionContentNegotiationStrategy.java
@@ -63,7 +63,7 @@ public class PathExtensionContentNegotiationStrategy extends AbstractMappingCont
 		urlPathHelper.setUrlDecode(false);
 	}
 
-	private boolean useJaf = JAF_PRESENT;
+	private boolean useJaf = true;
 
 
 	/**
@@ -109,7 +109,7 @@ protected void handleMatch(String extension, MediaType mediaType) {
 
 	@Override
 	protected MediaType handleNoMatch(NativeWebRequest webRequest, String extension) {
-		if (this.useJaf) {
+		if (this.useJaf && JAF_PRESENT) {
 			MediaType jafMediaType = JafMediaTypeFactory.getMediaType("file." + extension);
 			if (jafMediaType != null && !MediaType.APPLICATION_OCTET_STREAM.equals(jafMediaType)) {
 				return jafMediaType;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java
index b04bb01567..9a51146c48 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,11 +33,11 @@
  * <p>Supported for annotated handler methods in Servlet environments.
  *
  * @author Arjen Poutsma
+ * @since 3.0
  * @see RequestHeader
  * @see ResponseBody
  * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter
  * @see org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter
- * @since 3.0
  */
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
@@ -49,6 +49,7 @@
 	 * <p>Default is {@code true}, leading to an exception thrown in case
 	 * there is no body content. Switch this to {@code false} if you prefer
 	 * {@code null} to be passed when the body content is {@code null}.
+	 * @since 3.2
 	 */
 	boolean required() default true;
 
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
index 320bb95d13..0d80f5e3b6 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -321,7 +321,7 @@
 	 * specified header is <i>not</i> supposed to be present in the request.
 	 * <p>Also supports media type wildcards (*), for headers such as Accept
 	 * and Content-Type. For instance,
-	 * <pre>
+	 * <pre class="code">
 	 * &#064;RequestMapping(value = "/something", headers = "content-type=text/*")
 	 * </pre>
 	 * will match requests with a Content-Type of "text/html", "text/plain", etc.
@@ -340,7 +340,7 @@
 	 * <p>The format is a single media type or a sequence of media types,
 	 * with a request only mapped if the {@code Content-Type} matches one of these media types.
 	 * Examples:
-	 * <pre>
+	 * <pre class="code">
 	 * consumes = "text/plain"
 	 * consumes = {"text/plain", "application/*"}
 	 * </pre>
@@ -359,7 +359,7 @@
 	 * <p>The format is a single media type or a sequence of media types,
 	 * with a request only mapped if the {@code Accept} matches one of these media types.
 	 * Examples:
-	 * <pre>
+	 * <pre class="code">
 	 * produces = "text/plain"
 	 * produces = {"text/plain", "application/*"}
 	 * </pre>
@@ -367,7 +367,7 @@
 	 * all requests with a {@code Accept} other than "text/plain".
 	 * <p><b>Supported at the type level as well as at the method level!</b>
 	 * When used at the type level, all method-level mappings override
-	 * this consumes restriction.
+	 * this produces restriction.
 	 * @see org.springframework.http.MediaType
 	 */
 	String[] produces() default {};
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMethod.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMethod.java
index 814687ca65..80bd4b1c01 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,16 +17,14 @@
 package org.springframework.web.bind.annotation;
 
 /**
- * Java 5 enumeration of HTTP request methods. Intended for use
- * with the {@link RequestMapping#method()} attribute of the
- * {@link RequestMapping} annotation.
+ * Java 5 enumeration of HTTP request methods. Intended for use with the
+ * {@link RequestMapping#method()} attribute of the {@link RequestMapping} annotation.
  *
  * <p>Note that, by default, {@link org.springframework.web.servlet.DispatcherServlet}
  * supports GET, HEAD, POST, PUT, PATCH and DELETE only. DispatcherServlet will
- * process TRACE and OPTIONS with the default HttpServlet behavior unless
- * explicitly told to dispatch those request types as well: Check out
- * the "dispatchOptionsRequest" and "dispatchTraceRequest" properties,
- * switching them to "true" if necessary.
+ * process TRACE and OPTIONS with the default HttpServlet behavior unless explicitly
+ * told to dispatch those request types as well: Check out the "dispatchOptionsRequest"
+ * and "dispatchTraceRequest" properties, switching them to "true" if necessary.
  *
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java b/spring-web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java
index 10f1d22f17..93b3c11064 100644
--- a/spring-web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java
+++ b/spring-web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@ public abstract class HttpStatusCodeException extends RestClientException {
 
 	private static final String DEFAULT_CHARSET = "ISO-8859-1";
 
+
 	private final HttpStatus statusCode;
 
 	private final String statusText;
@@ -74,10 +75,9 @@ protected HttpStatusCodeException(HttpStatus statusCode, String statusText) {
 	 * @param responseCharset the response body charset, may be {@code null}
 	 * @since 3.0.5
 	 */
-	protected HttpStatusCodeException(HttpStatus statusCode,
-			String statusText,
-			byte[] responseBody,
-			Charset responseCharset) {
+	protected HttpStatusCodeException(
+			HttpStatus statusCode, String statusText, byte[] responseBody, Charset responseCharset) {
+
 		this(statusCode, statusText, null, responseBody, responseCharset);
 	}
 
@@ -93,6 +93,7 @@ protected HttpStatusCodeException(HttpStatus statusCode,
 	 */
 	protected HttpStatusCodeException(HttpStatus statusCode, String statusText,
 			HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {
+
 		super(statusCode.value() + " " + statusText);
 		this.statusCode = statusCode;
 		this.statusText = statusText;
@@ -126,11 +127,10 @@ public HttpHeaders getResponseHeaders() {
 
 	/**
 	 * Return the response body as a byte array.
-	 *
 	 * @since 3.0.5
 	 */
 	public byte[] getResponseBodyAsByteArray() {
-		return responseBody;
+		return this.responseBody;
 	}
 
 	/**
@@ -139,11 +139,11 @@ public byte[] getResponseBodyAsByteArray() {
 	 */
 	public String getResponseBodyAsString() {
 		try {
-			return new String(responseBody, responseCharset);
+			return new String(this.responseBody, this.responseCharset);
 		}
 		catch (UnsupportedEncodingException ex) {
 			// should not occur
-			throw new InternalError(ex.getMessage());
+			throw new IllegalStateException(ex);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestOperations.java b/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
index 62ea452dd3..d1e0caf8fc 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,6 +105,7 @@ public interface RestOperations {
 	 */
 	<T> ResponseEntity<T> getForEntity(URI url, Class<T> responseType) throws RestClientException;
 
+
 	// HEAD
 
 	/**
@@ -132,6 +133,7 @@ public interface RestOperations {
 	 */
 	HttpHeaders headForHeaders(URI url) throws RestClientException;
 
+
 	// POST
 
 	/**
@@ -264,6 +266,7 @@ <T> ResponseEntity<T> postForEntity(String url, Object request, Class<T> respons
 	 */
 	<T> ResponseEntity<T> postForEntity(URI url, Object request, Class<T> responseType) throws RestClientException;
 
+
 	// PUT
 
 	/**
@@ -300,6 +303,7 @@ <T> ResponseEntity<T> postForEntity(String url, Object request, Class<T> respons
 	 */
 	void put(URI url, Object request) throws RestClientException;
 
+
 	// DELETE
 
 	/**
@@ -325,6 +329,7 @@ <T> ResponseEntity<T> postForEntity(String url, Object request, Class<T> respons
 	 */
 	void delete(URI url) throws RestClientException;
 
+
 	// OPTIONS
 
 	/**
@@ -352,6 +357,7 @@ <T> ResponseEntity<T> postForEntity(String url, Object request, Class<T> respons
 	 */
 	Set<HttpMethod> optionsForAllow(URI url) throws RestClientException;
 
+
 	// exchange
 
 	/**
@@ -401,12 +407,10 @@ <T> ResponseEntity<T> exchange(URI url, HttpMethod method, HttpEntity<?> request
 	 * Execute the HTTP method to the given URI template, writing the given
 	 * request entity to the request, and returns the response as {@link ResponseEntity}.
 	 * The given {@link ParameterizedTypeReference} is used to pass generic type information:
-	 *
 	 * <pre class="code">
 	 * ParameterizedTypeReference&lt;List&lt;MyBean&gt;&gt; myBean = new ParameterizedTypeReference&lt;List&lt;MyBean&gt;&gt;() {};
 	 * ResponseEntity&lt;List&lt;MyBean&gt;&gt; response = template.exchange(&quot;http://example.com&quot;,HttpMethod.GET, null, myBean);
 	 * </pre>
-	 *
 	 * @param url the URL
 	 * @param method the HTTP method (GET, POST, etc)
 	 * @param requestEntity the entity (headers and/or body) to write to the
@@ -414,7 +418,7 @@ <T> ResponseEntity<T> exchange(URI url, HttpMethod method, HttpEntity<?> request
 	 * @param responseType the type of the return value
 	 * @param uriVariables the variables to expand in the template
 	 * @return the response as entity
-	 * @since 3.2.0
+	 * @since 3.2
 	 */
 	<T> ResponseEntity<T> exchange(String url,HttpMethod method, HttpEntity<?> requestEntity,
 			ParameterizedTypeReference<T> responseType, Object... uriVariables) throws RestClientException;
@@ -423,19 +427,17 @@ <T> ResponseEntity<T> exchange(String url,HttpMethod method, HttpEntity<?> reque
 	 * Execute the HTTP method to the given URI template, writing the given
 	 * request entity to the request, and returns the response as {@link ResponseEntity}.
 	 * The given {@link ParameterizedTypeReference} is used to pass generic type information:
-	 *
 	 * <pre class="code">
 	 * ParameterizedTypeReference&lt;List&lt;MyBean&gt;&gt; myBean = new ParameterizedTypeReference&lt;List&lt;MyBean&gt;&gt;() {};
 	 * ResponseEntity&lt;List&lt;MyBean&gt;&gt; response = template.exchange(&quot;http://example.com&quot;,HttpMethod.GET, null, myBean);
 	 * </pre>
-	 *
 	 * @param url the URL
 	 * @param method the HTTP method (GET, POST, etc)
 	 * @param requestEntity the entity (headers and/or body) to write to the request, may be {@code null}
 	 * @param responseType the type of the return value
 	 * @param uriVariables the variables to expand in the template
 	 * @return the response as entity
-	 * @since 3.2.0
+	 * @since 3.2
 	 */
 	<T> ResponseEntity<T> exchange(String url, HttpMethod method, HttpEntity<?> requestEntity,
 			ParameterizedTypeReference<T> responseType, Map<String, ?> uriVariables) throws RestClientException;
@@ -444,22 +446,21 @@ <T> ResponseEntity<T> exchange(String url, HttpMethod method, HttpEntity<?> requ
 	 * Execute the HTTP method to the given URI template, writing the given
 	 * request entity to the request, and returns the response as {@link ResponseEntity}.
 	 * The given {@link ParameterizedTypeReference} is used to pass generic type information:
-	 *
 	 * <pre class="code">
 	 * ParameterizedTypeReference&lt;List&lt;MyBean&gt;&gt; myBean = new ParameterizedTypeReference&lt;List&lt;MyBean&gt;&gt;() {};
 	 * ResponseEntity&lt;List&lt;MyBean&gt;&gt; response = template.exchange(&quot;http://example.com&quot;,HttpMethod.GET, null, myBean);
 	 * </pre>
-	 *
 	 * @param url the URL
 	 * @param method the HTTP method (GET, POST, etc)
 	 * @param requestEntity the entity (headers and/or body) to write to the request, may be {@code null}
 	 * @param responseType the type of the return value
 	 * @return the response as entity
-	 * @since 3.2.0
+	 * @since 3.2
 	 */
 	<T> ResponseEntity<T> exchange(URI url, HttpMethod method, HttpEntity<?> requestEntity,
 			ParameterizedTypeReference<T> responseType) throws RestClientException;
 
+
 	// general execution
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
index cd729964f4..825a5bacbf 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,13 @@
 package org.springframework.web.client;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Type;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javax.xml.transform.Source;
 
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
@@ -51,12 +50,12 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.web.util.UriTemplate;
-import org.springframework.web.util.UriUtils;
 
 /**
- * <strong>The central class for client-side HTTP access.</strong> It simplifies communication with HTTP servers, and
- * enforces RESTful principles. It handles HTTP connections, leaving application code to provide URLs (with possible
- * template variables) and extract results.
+ * <strong>Spring's central class for client-side HTTP access.</strong>
+ * It simplifies communication with HTTP servers, and enforces RESTful principles.
+ * It handles HTTP connections, leaving application code to provide URLs
+ * (with possible template variables) and extract results.
  *
  * <p>The main entry points of this template are the methods named after the six main HTTP methods:
  * <table>
@@ -74,21 +73,21 @@
  *
  * <p>The {@code exchange} and {@code execute} methods are generalized versions of the more specific methods listed
  * above them. They support additional, less frequently used combinations including support for requests using the
- * HTTP PATCH method. However, note that the underlying HTTP library must also support the desired combination.</p>
+ * HTTP PATCH method. However, note that the underlying HTTP library must also support the desired combination.
  *
- * <p>For each of these HTTP methods, there are three corresponding Java methods in the {@code RestTemplate}. Two
- * variant take a {@code String} URI as first argument (eg. {@link #getForObject(String, Class, Object[])}, {@link
- * #getForObject(String, Class, Map)}), and are capable of substituting any {@linkplain UriTemplate URI templates} in
- * that URL using either a {@code String} variable arguments array, or a {@code Map<String, String>}. The string varargs
- * variant expands the given template variables in order, so that
- * <pre>
- * String result = restTemplate.getForObject("http://example.com/hotels/{hotel}/bookings/{booking}", String.class,"42",
+ * <p>For each of these HTTP methods, there are three corresponding Java methods in the {@code RestTemplate}.
+ * Two variants take a {@code String} URI as first argument (eg. {@link #getForObject(String, Class, Object[])},
+ * {@link #getForObject(String, Class, Map)}), and are capable of substituting any {@linkplain UriTemplate URI templates}
+ * in that URL using either a {@code String} variable arguments array, or a {@code Map<String, String>}.
+ * The string varargs variant expands the given template variables in order, so that
+ * <pre class="code">
+ * String result = restTemplate.getForObject("http://example.com/hotels/{hotel}/bookings/{booking}", String.class, "42",
  * "21");
  * </pre>
- * will perform a GET on {@code http://example.com/hotels/42/bookings/21}. The map variant expands the template based on
- * variable name, and is therefore more useful when using many variables, or when a single variable is used multiple
+ * will perform a GET on {@code http://example.com/hotels/42/bookings/21}. The map variant expands the template based
+ * on variable name, and is therefore more useful when using many variables, or when a single variable is used multiple
  * times. For example:
- * <pre>
+ * <pre class="code">
  * Map&lt;String, String&gt; vars = Collections.singletonMap("hotel", "42");
  * String result = restTemplate.getForObject("http://example.com/hotels/{hotel}/rooms/{hotel}", String.class, vars);
  * </pre>
@@ -97,7 +96,7 @@
  * expanded URI multiple times.
  *
  * <p>Furthermore, the {@code String}-argument methods assume that the URL String is unencoded. This means that
- * <pre>
+ * <pre class="code">
  * restTemplate.getForObject("http://example.com/hotel list");
  * </pre>
  * will perform a GET on {@code http://example.com/hotel%20list}. As a result, any URL passed that is already encoded
@@ -105,24 +104,29 @@
  * http://example.com/hotel%2520list}). If this behavior is undesirable, use the {@code URI}-argument methods, which
  * will not perform any URL encoding.
  *
- * <p>Objects passed to and returned from these methods are converted to and from HTTP messages by {@link
- * HttpMessageConverter} instances. Converters for the main mime types are registered by default, but you can also write
- * your own converter and register it via the {@link #setMessageConverters messageConverters} bean property.
+ * <p>Objects passed to and returned from these methods are converted to and from HTTP messages by
+ * {@link HttpMessageConverter} instances. Converters for the main mime types are registered by default,
+ * but you can also write your own converter and register it via the {@link #setMessageConverters messageConverters}
+ * bean property.
  *
- * <p>This template uses a {@link org.springframework.http.client.SimpleClientHttpRequestFactory} and a {@link
- * DefaultResponseErrorHandler} as default strategies for creating HTTP connections or handling HTTP errors,
+ * <p>This template uses a {@link org.springframework.http.client.SimpleClientHttpRequestFactory} and a
+ * {@link DefaultResponseErrorHandler} as default strategies for creating HTTP connections or handling HTTP errors,
  * respectively. These defaults can be overridden through the {@link #setRequestFactory(ClientHttpRequestFactory)
  * requestFactory} and {@link #setErrorHandler(ResponseErrorHandler) errorHandler} bean properties.
  *
  * @author Arjen Poutsma
+ * @author Brian Clozel
+ * @since 3.0
  * @see HttpMessageConverter
  * @see RequestCallback
  * @see ResponseExtractor
  * @see ResponseErrorHandler
- * @since 3.0
  */
 public class RestTemplate extends InterceptingHttpAccessor implements RestOperations {
 
+	private static boolean romePresent =
+			ClassUtils.isPresent("com.sun.syndication.feed.WireFeed", RestTemplate.class.getClassLoader());
+
 	private static final boolean jaxb2Present =
 			ClassUtils.isPresent("javax.xml.bind.Binder", RestTemplate.class.getClassLoader());
 
@@ -134,24 +138,25 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 			ClassUtils.isPresent("org.codehaus.jackson.map.ObjectMapper", RestTemplate.class.getClassLoader()) &&
 					ClassUtils.isPresent("org.codehaus.jackson.JsonGenerator", RestTemplate.class.getClassLoader());
 
-	private static boolean romePresent =
-			ClassUtils.isPresent("com.sun.syndication.feed.WireFeed", RestTemplate.class.getClassLoader());
-
-
-	private final ResponseExtractor<HttpHeaders> headersExtractor = new HeadersExtractor();
 
-	private List<HttpMessageConverter<?>> messageConverters = new ArrayList<HttpMessageConverter<?>>();
+	private final List<HttpMessageConverter<?>> messageConverters = new ArrayList<HttpMessageConverter<?>>();
 
 	private ResponseErrorHandler errorHandler = new DefaultResponseErrorHandler();
 
+	private final ResponseExtractor<HttpHeaders> headersExtractor = new HeadersExtractor();
 
-	/** Create a new instance of the {@link RestTemplate} using default settings. */
+
+	/**
+	 * Create a new instance of the {@link RestTemplate} using default settings.
+	 * Default {@link HttpMessageConverter}s are initialized.
+	 */
 	public RestTemplate() {
 		this.messageConverters.add(new ByteArrayHttpMessageConverter());
 		this.messageConverters.add(new StringHttpMessageConverter());
 		this.messageConverters.add(new ResourceHttpMessageConverter());
-		this.messageConverters.add(new SourceHttpMessageConverter());
+		this.messageConverters.add(new SourceHttpMessageConverter<Source>());
 		this.messageConverters.add(new AllEncompassingFormHttpMessageConverter());
+
 		if (romePresent) {
 			this.messageConverters.add(new AtomFeedHttpMessageConverter());
 			this.messageConverters.add(new RssChannelHttpMessageConverter());
@@ -171,35 +176,57 @@ else if (jacksonPresent) {
 	 * Create a new instance of the {@link RestTemplate} based on the given {@link ClientHttpRequestFactory}.
 	 * @param requestFactory HTTP request factory to use
 	 * @see org.springframework.http.client.SimpleClientHttpRequestFactory
-	 * @see org.springframework.http.client.CommonsClientHttpRequestFactory
+	 * @see org.springframework.http.client.HttpComponentsClientHttpRequestFactory
 	 */
 	public RestTemplate(ClientHttpRequestFactory requestFactory) {
 		this();
 		setRequestFactory(requestFactory);
 	}
 
+	/**
+	 * Create a new instance of the {@link RestTemplate} using the given list of
+	 * {@link HttpMessageConverter} to use
+	 * @param messageConverters the list of {@link HttpMessageConverter} to use
+	 * @since 3.2.7
+	 */
+	public RestTemplate(List<HttpMessageConverter<?>> messageConverters) {
+		Assert.notEmpty(messageConverters, "'messageConverters' must not be empty");
+		this.messageConverters.addAll(messageConverters);
+	}
+
 
 	/**
-	 * Set the message body converters to use. These converters are used to convert from and to HTTP requests and
-	 * responses.
+	 * Set the message body converters to use.
+	 * <p>These converters are used to convert from and to HTTP requests and responses.
 	 */
 	public void setMessageConverters(List<HttpMessageConverter<?>> messageConverters) {
 		Assert.notEmpty(messageConverters, "'messageConverters' must not be empty");
-		this.messageConverters = messageConverters;
+		// Take getMessageConverters() List as-is when passed in here
+		if (this.messageConverters != messageConverters) {
+			this.messageConverters.clear();
+			this.messageConverters.addAll(messageConverters);
+		}
 	}
 
-	/** Returns the message body converters. These converters are used to convert from and to HTTP requests and responses. */
+	/**
+	 * Return the message body converters.
+	 */
 	public List<HttpMessageConverter<?>> getMessageConverters() {
 		return this.messageConverters;
 	}
 
-	/** Set the error handler. */
+	/**
+	 * Set the error handler.
+	 * <p>By default, RestTemplate uses a {@link DefaultResponseErrorHandler}.
+	 */
 	public void setErrorHandler(ResponseErrorHandler errorHandler) {
 		Assert.notNull(errorHandler, "'errorHandler' must not be null");
 		this.errorHandler = errorHandler;
 	}
 
-	/** Return the error handler. By default, this is the {@link DefaultResponseErrorHandler}. */
+	/**
+	 * Return the error handler.
+	 */
 	public ResponseErrorHandler getErrorHandler() {
 		return this.errorHandler;
 	}
@@ -230,6 +257,7 @@ public <T> T getForObject(URI url, Class<T> responseType) throws RestClientExcep
 
 	public <T> ResponseEntity<T> getForEntity(String url, Class<T> responseType, Object... urlVariables)
 			throws RestClientException {
+
 		AcceptHeaderRequestCallback requestCallback = new AcceptHeaderRequestCallback(responseType);
 		ResponseEntityResponseExtractor<T> responseExtractor =
 				new ResponseEntityResponseExtractor<T>(responseType);
@@ -238,6 +266,7 @@ public <T> ResponseEntity<T> getForEntity(String url, Class<T> responseType, Obj
 
 	public <T> ResponseEntity<T> getForEntity(String url, Class<T> responseType, Map<String, ?> urlVariables)
 			throws RestClientException {
+
 		AcceptHeaderRequestCallback requestCallback = new AcceptHeaderRequestCallback(responseType);
 		ResponseEntityResponseExtractor<T> responseExtractor =
 				new ResponseEntityResponseExtractor<T>(responseType);
@@ -251,6 +280,7 @@ public <T> ResponseEntity<T> getForEntity(URI url, Class<T> responseType) throws
 		return execute(url, HttpMethod.GET, requestCallback, responseExtractor);
 	}
 
+
 	// HEAD
 
 	public HttpHeaders headForHeaders(String url, Object... urlVariables) throws RestClientException {
@@ -265,6 +295,7 @@ public HttpHeaders headForHeaders(URI url) throws RestClientException {
 		return execute(url, HttpMethod.HEAD, null, this.headersExtractor);
 	}
 
+
 	// POST
 
 	public URI postForLocation(String url, Object request, Object... urlVariables) throws RestClientException {
@@ -275,6 +306,7 @@ public URI postForLocation(String url, Object request, Object... urlVariables) t
 
 	public URI postForLocation(String url, Object request, Map<String, ?> urlVariables)
 			throws RestClientException {
+
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request);
 		HttpHeaders headers = execute(url, HttpMethod.POST, requestCallback, this.headersExtractor, urlVariables);
 		return headers.getLocation();
@@ -288,6 +320,7 @@ public URI postForLocation(URI url, Object request) throws RestClientException {
 
 	public <T> T postForObject(String url, Object request, Class<T> responseType, Object... uriVariables)
 			throws RestClientException {
+
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request, responseType);
 		HttpMessageConverterExtractor<T> responseExtractor =
 				new HttpMessageConverterExtractor<T>(responseType, getMessageConverters(), logger);
@@ -296,6 +329,7 @@ public <T> T postForObject(String url, Object request, Class<T> responseType, Ob
 
 	public <T> T postForObject(String url, Object request, Class<T> responseType, Map<String, ?> uriVariables)
 			throws RestClientException {
+
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request, responseType);
 		HttpMessageConverterExtractor<T> responseExtractor =
 				new HttpMessageConverterExtractor<T>(responseType, getMessageConverters(), logger);
@@ -311,17 +345,16 @@ public <T> T postForObject(URI url, Object request, Class<T> responseType) throw
 
 	public <T> ResponseEntity<T> postForEntity(String url, Object request, Class<T> responseType, Object... uriVariables)
 			throws RestClientException {
+
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request, responseType);
 		ResponseEntityResponseExtractor<T> responseExtractor =
 				new ResponseEntityResponseExtractor<T>(responseType);
 		return execute(url, HttpMethod.POST, requestCallback, responseExtractor, uriVariables);
 	}
 
-	public <T> ResponseEntity<T> postForEntity(String url,
-										   Object request,
-										   Class<T> responseType,
-										   Map<String, ?> uriVariables)
+	public <T> ResponseEntity<T> postForEntity(String url, Object request, Class<T> responseType, Map<String, ?> uriVariables)
 			throws RestClientException {
+
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request, responseType);
 		ResponseEntityResponseExtractor<T> responseExtractor =
 				new ResponseEntityResponseExtractor<T>(responseType);
@@ -335,6 +368,7 @@ public <T> ResponseEntity<T> postForEntity(URI url, Object request, Class<T> res
 		return execute(url, HttpMethod.POST, requestCallback, responseExtractor);
 	}
 
+
 	// PUT
 
 	public void put(String url, Object request, Object... urlVariables) throws RestClientException {
@@ -352,6 +386,7 @@ public void put(URI url, Object request) throws RestClientException {
 		execute(url, HttpMethod.PUT, requestCallback, null);
 	}
 
+
 	// DELETE
 
 	public void delete(String url, Object... urlVariables) throws RestClientException {
@@ -366,6 +401,7 @@ public void delete(URI url) throws RestClientException {
 		execute(url, HttpMethod.DELETE, null, null);
 	}
 
+
 	// OPTIONS
 
 	public Set<HttpMethod> optionsForAllow(String url, Object... urlVariables) throws RestClientException {
@@ -383,6 +419,7 @@ public Set<HttpMethod> optionsForAllow(URI url) throws RestClientException {
 		return headers.getAllow();
 	}
 
+
 	// exchange
 
 	public <T> ResponseEntity<T> exchange(String url, HttpMethod method,
@@ -441,16 +478,14 @@ public <T> ResponseEntity<T> exchange(URI url, HttpMethod method, HttpEntity<?>
 	public <T> T execute(String url, HttpMethod method, RequestCallback requestCallback,
 			ResponseExtractor<T> responseExtractor, Object... urlVariables) throws RestClientException {
 
-		UriTemplate uriTemplate = new HttpUrlTemplate(url);
-		URI expanded = uriTemplate.expand(urlVariables);
+		URI expanded = new UriTemplate(url).expand(urlVariables);
 		return doExecute(expanded, method, requestCallback, responseExtractor);
 	}
 
 	public <T> T execute(String url, HttpMethod method, RequestCallback requestCallback,
 			ResponseExtractor<T> responseExtractor, Map<String, ?> urlVariables) throws RestClientException {
 
-		UriTemplate uriTemplate = new HttpUrlTemplate(url);
-		URI expanded = uriTemplate.expand(urlVariables);
+		URI expanded = new UriTemplate(url).expand(urlVariables);
 		return doExecute(expanded, method, requestCallback, responseExtractor);
 	}
 
@@ -461,8 +496,9 @@ public <T> T execute(URI url, HttpMethod method, RequestCallback requestCallback
 	}
 
 	/**
-	 * Execute the given method on the provided URI. The {@link ClientHttpRequest} is processed using the {@link
-	 * RequestCallback}; the response with the {@link ResponseExtractor}.
+	 * Execute the given method on the provided URI.
+	 * <p>The {@link ClientHttpRequest} is processed using the {@link RequestCallback};
+	 * the response with the {@link ResponseExtractor}.
 	 * @param url the fully-expanded URL to connect to
 	 * @param method the HTTP method to execute (GET, POST, etc.)
 	 * @param requestCallback object that prepares the request (can be {@code null})
@@ -496,7 +532,7 @@ protected <T> T doExecute(URI url, HttpMethod method, RequestCallback requestCal
 		}
 		catch (IOException ex) {
 			throw new ResourceAccessException("I/O error on " + method.name() +
-					" request for \"" + url + "\":" + ex.getMessage(), ex);
+					" request for \"" + url + "\": " + ex.getMessage(), ex);
 		}
 		finally {
 			if (response != null) {
@@ -508,9 +544,8 @@ protected <T> T doExecute(URI url, HttpMethod method, RequestCallback requestCal
 	private void logResponseStatus(HttpMethod method, URI url, ClientHttpResponse response) {
 		if (logger.isDebugEnabled()) {
 			try {
-				logger.debug(
-						method.name() + " request for \"" + url + "\" resulted in " + response.getStatusCode() + " (" +
-								response.getStatusText() + ")");
+				logger.debug(method.name() + " request for \"" + url + "\" resulted in " +
+						response.getStatusCode() + " (" + response.getStatusText() + ")");
 			}
 			catch (IOException e) {
 				// ignore
@@ -521,9 +556,8 @@ private void logResponseStatus(HttpMethod method, URI url, ClientHttpResponse re
 	private void handleResponseError(HttpMethod method, URI url, ClientHttpResponse response) throws IOException {
 		if (logger.isWarnEnabled()) {
 			try {
-				logger.warn(
-						method.name() + " request for \"" + url + "\" resulted in " + response.getStatusCode() + " (" +
-								response.getStatusText() + "); invoking error handler");
+				logger.warn(method.name() + " request for \"" + url + "\" resulted in " +
+						response.getStatusCode() + " (" + response.getStatusText() + "); invoking error handler");
 			}
 			catch (IOException e) {
 				// ignore
@@ -549,7 +583,7 @@ public void doWithRequest(ClientHttpRequest request) throws IOException {
 			if (responseType != null) {
 				Class<?> responseClass = null;
 				if (responseType instanceof Class) {
-					responseClass = (Class) responseType;
+					responseClass = (Class<?>) responseType;
 				}
 
 				List<MediaType> allSupportedMediaTypes = new ArrayList<MediaType>();
@@ -561,7 +595,7 @@ public void doWithRequest(ClientHttpRequest request) throws IOException {
 					}
 					else if (converter instanceof GenericHttpMessageConverter) {
 
-						GenericHttpMessageConverter genericConverter = (GenericHttpMessageConverter) converter;
+						GenericHttpMessageConverter<?> genericConverter = (GenericHttpMessageConverter<?>) converter;
 						if (genericConverter.canRead(responseType, null, null)) {
 							allSupportedMediaTypes.addAll(getSupportedMediaTypes(converter));
 						}
@@ -599,7 +633,7 @@ private List<MediaType> getSupportedMediaTypes(HttpMessageConverter<?> messageCo
 	 */
 	private class HttpEntityRequestCallback extends AcceptHeaderRequestCallback {
 
-		private final HttpEntity requestEntity;
+		private final HttpEntity<?> requestEntity;
 
 		private HttpEntityRequestCallback(Object requestBody) {
 			this(requestBody, null);
@@ -609,10 +643,10 @@ private HttpEntityRequestCallback(Object requestBody) {
 		private HttpEntityRequestCallback(Object requestBody, Type responseType) {
 			super(responseType);
 			if (requestBody instanceof HttpEntity) {
-				this.requestEntity = (HttpEntity) requestBody;
+				this.requestEntity = (HttpEntity<?>) requestBody;
 			}
 			else if (requestBody != null) {
-				this.requestEntity = new HttpEntity(requestBody);
+				this.requestEntity = new HttpEntity<Object>(requestBody);
 			}
 			else {
 				this.requestEntity = HttpEntity.EMPTY;
@@ -638,7 +672,7 @@ public void doWithRequest(ClientHttpRequest httpRequest) throws IOException {
 				Class<?> requestType = requestBody.getClass();
 				HttpHeaders requestHeaders = requestEntity.getHeaders();
 				MediaType requestContentType = requestHeaders.getContentType();
-				for (HttpMessageConverter messageConverter : getMessageConverters()) {
+				for (HttpMessageConverter<?> messageConverter : getMessageConverters()) {
 					if (messageConverter.canWrite(requestType, requestContentType)) {
 						if (!requestHeaders.isEmpty()) {
 							httpRequest.getHeaders().putAll(requestHeaders);
@@ -653,7 +687,8 @@ public void doWithRequest(ClientHttpRequest httpRequest) throws IOException {
 							}
 
 						}
-						messageConverter.write(requestBody, requestContentType, httpRequest);
+						((HttpMessageConverter<Object>) messageConverter).write(
+								requestBody, requestContentType, httpRequest);
 						return;
 					}
 				}
@@ -667,6 +702,7 @@ public void doWithRequest(ClientHttpRequest httpRequest) throws IOException {
 		}
 	}
 
+
 	/**
 	 * Response extractor for {@link HttpEntity}.
 	 */
@@ -677,14 +713,15 @@ private class ResponseEntityResponseExtractor<T> implements ResponseExtractor<Re
 		public ResponseEntityResponseExtractor(Type responseType) {
 			if (responseType != null && !Void.class.equals(responseType)) {
 				this.delegate = new HttpMessageConverterExtractor<T>(responseType, getMessageConverters(), logger);
-			} else {
+			}
+			else {
 				this.delegate = null;
 			}
 		}
 
 		public ResponseEntity<T> extractData(ClientHttpResponse response) throws IOException {
-			if (delegate != null) {
-				T body = delegate.extractData(response);
+			if (this.delegate != null) {
+				T body = this.delegate.extractData(response);
 				return new ResponseEntity<T>(body, response.getHeaders(), response.getStatusCode());
 			}
 			else {
@@ -704,30 +741,4 @@ public HttpHeaders extractData(ClientHttpResponse response) throws IOException {
 		}
 	}
 
-	/**
-	 * HTTP-specific subclass of UriTemplate, overriding the encode method.
-	 */
-	@SuppressWarnings("serial")
-	private static class HttpUrlTemplate extends UriTemplate {
-
-		public HttpUrlTemplate(String uriTemplate) {
-			super(uriTemplate);
-		}
-
-		@Override
-		protected URI encodeUri(String uri) {
-			try {
-				String encoded = UriUtils.encodeHttpUrl(uri, "UTF-8");
-				return new URI(encoded);
-			}
-			catch (UnsupportedEncodingException ex) {
-				// should not happen, UTF-8 is always supported
-				throw new IllegalStateException(ex);
-			}
-			catch (URISyntaxException ex) {
-				throw new IllegalArgumentException("Could not create HTTP URL from [" + uri + "]: " + ex, ex);
-			}
-		}
-	}
-
 }
diff --git a/spring-web/src/main/java/org/springframework/web/client/UnknownHttpStatusCodeException.java b/spring-web/src/main/java/org/springframework/web/client/UnknownHttpStatusCodeException.java
index 648c82d79c..40ac50474f 100644
--- a/spring-web/src/main/java/org/springframework/web/client/UnknownHttpStatusCodeException.java
+++ b/spring-web/src/main/java/org/springframework/web/client/UnknownHttpStatusCodeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.client;
 
 import java.io.UnsupportedEncodingException;
@@ -64,6 +65,7 @@ public UnknownHttpStatusCodeException(int rawStatusCode, String statusText,
 		this.responseCharset = responseCharset != null ? responseCharset.name() : DEFAULT_CHARSET;
 	}
 
+
 	/**
 	 * Return the raw HTTP status code value.
 	 */
@@ -89,7 +91,7 @@ public HttpHeaders getResponseHeaders() {
 	 * Return the response body as a byte array.
 	 */
 	public byte[] getResponseBodyAsByteArray() {
-		return responseBody;
+		return this.responseBody;
 	}
 
 	/**
@@ -97,11 +99,11 @@ public byte[] getResponseBodyAsByteArray() {
 	 */
 	public String getResponseBodyAsString() {
 		try {
-			return new String(responseBody, responseCharset);
+			return new String(this.responseBody, this.responseCharset);
 		}
 		catch (UnsupportedEncodingException ex) {
 			// should not occur
-			throw new InternalError(ex.getMessage());
+			throw new IllegalStateException(ex);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/AbstractContextLoaderInitializer.java b/spring-web/src/main/java/org/springframework/web/context/AbstractContextLoaderInitializer.java
index 54defc908f..d38e739876 100644
--- a/spring-web/src/main/java/org/springframework/web/context/AbstractContextLoaderInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/context/AbstractContextLoaderInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +25,12 @@
 import org.springframework.web.WebApplicationInitializer;
 
 /**
- * Convenient base class for {@link WebApplicationInitializer} implementations that
- * register a {@link ContextLoaderListener} in the servlet context.
+ * Convenient base class for {@link WebApplicationInitializer} implementations
+ * that register a {@link ContextLoaderListener} in the servlet context.
  *
- * <p>The only method required to be implemented by subclasses is {@link
- * #createRootApplicationContext()}, which gets invoked from {@link
- * #registerContextLoaderListener(javax.servlet.ServletContext)}.
+ * <p>The only method required to be implemented by subclasses is
+ * {@link #createRootApplicationContext()}, which gets invoked from
+ * {@link #registerContextLoaderListener(ServletContext)}.
  *
  * @author Arjen Poutsma
  * @author Chris Beams
@@ -38,11 +38,12 @@
  */
 public abstract class AbstractContextLoaderInitializer implements WebApplicationInitializer {
 
-	/** Logger available to subclasses. */
+	/** Logger available to subclasses */
 	protected final Log logger = LogFactory.getLog(getClass());
 
+
 	public void onStartup(ServletContext servletContext) throws ServletException {
-		this.registerContextLoaderListener(servletContext);
+		registerContextLoaderListener(servletContext);
 	}
 
 	/**
@@ -52,7 +53,7 @@ public void onStartup(ServletContext servletContext) throws ServletException {
 	 * @param servletContext the servlet context to register the listener against
 	 */
 	protected void registerContextLoaderListener(ServletContext servletContext) {
-		WebApplicationContext rootAppContext = this.createRootApplicationContext();
+		WebApplicationContext rootAppContext = createRootApplicationContext();
 		if (rootAppContext != null) {
 			servletContext.addListener(new ContextLoaderListener(rootAppContext));
 		}
@@ -63,7 +64,7 @@ protected void registerContextLoaderListener(ServletContext servletContext) {
 	}
 
 	/**
-	 * Create the "root" application context to be provided to the
+	 * Create the "<strong>root</strong>" application context to be provided to the
 	 * {@code ContextLoaderListener}.
 	 * <p>The returned context is delegated to
 	 * {@link ContextLoaderListener#ContextLoaderListener(WebApplicationContext)} and will
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
index 69d812da37..4b71c293b2 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java
@@ -18,7 +18,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -78,8 +77,8 @@
  *
  * <p>As of Spring 3.1, {@code ContextLoader} supports injecting the root web
  * application context via the {@link #ContextLoader(WebApplicationContext)}
- * constructor, allowing for programmatic configuration in Servlet 3.0+ environments. See
- * {@link org.springframework.web.WebApplicationInitializer} for usage examples.
+ * constructor, allowing for programmatic configuration in Servlet 3.0+ environments.
+ * See {@link org.springframework.web.WebApplicationInitializer} for usage examples.
  *
  * @author Juergen Hoeller
  * @author Colin Sampaleanu
@@ -91,6 +90,20 @@
  */
 public class ContextLoader {
 
+	/**
+	 * Config param for the root WebApplicationContext id,
+	 * to be used as serialization id for the underlying BeanFactory: {@value}
+	 */
+	public static final String CONTEXT_ID_PARAM = "contextId";
+
+	/**
+	 * Name of servlet context parameter (i.e., {@value}) that can specify the
+	 * config location for the root context, falling back to the implementation's
+	 * default otherwise.
+	 * @see org.springframework.web.context.support.XmlWebApplicationContext#DEFAULT_CONFIG_LOCATION
+	 */
+	public static final String CONFIG_LOCATION_PARAM = "contextConfigLocation";
+
 	/**
 	 * Config param for the root WebApplicationContext implementation class to use: {@value}
 	 * @see #determineContextClass(ServletContext)
@@ -99,25 +112,18 @@ public class ContextLoader {
 	public static final String CONTEXT_CLASS_PARAM = "contextClass";
 
 	/**
-	 * Config param for the root WebApplicationContext id,
-	 * to be used as serialization id for the underlying BeanFactory: {@value}
-	 */
-	public static final String CONTEXT_ID_PARAM = "contextId";
-
-	/**
-	 * Config param for which {@link ApplicationContextInitializer} classes to use
-	 * for initializing the web application context: {@value}
+	 * Config param for {@link ApplicationContextInitializer} classes to use
+	 * for initializing the root web application context: {@value}
 	 * @see #customizeContext(ServletContext, ConfigurableWebApplicationContext)
 	 */
 	public static final String CONTEXT_INITIALIZER_CLASSES_PARAM = "contextInitializerClasses";
 
 	/**
-	 * Name of servlet context parameter (i.e., {@value}) that can specify the
-	 * config location for the root context, falling back to the implementation's
-	 * default otherwise.
-	 * @see org.springframework.web.context.support.XmlWebApplicationContext#DEFAULT_CONFIG_LOCATION
+	 * Config param for global {@link ApplicationContextInitializer} classes to use
+	 * for initializing all web application contexts in the current application: {@value}
+	 * @see #customizeContext(ServletContext, ConfigurableWebApplicationContext)
 	 */
-	public static final String CONFIG_LOCATION_PARAM = "contextConfigLocation";
+	public static final String GLOBAL_INITIALIZER_CLASSES_PARAM = "globalInitializerClasses";
 
 	/**
 	 * Optional servlet context parameter (i.e., "{@code locatorFactorySelector}")
@@ -147,6 +153,12 @@ public class ContextLoader {
 	 */
 	public static final String LOCATOR_FACTORY_KEY_PARAM = "parentContextKey";
 
+	/**
+	 * Any number of these characters are considered delimiters between
+	 * multiple values in a single init-param String value.
+	 */
+	private static final String INIT_PARAM_DELIMITERS = ",; \t\n";
+
 	/**
 	 * Name of the class path resource (relative to the ContextLoader class)
 	 * that defines ContextLoader's default strategy names.
@@ -381,14 +393,71 @@ protected void configureAndRefreshWebApplicationContext(ConfigurableWebApplicati
 		}
 
 		wac.setServletContext(sc);
-		String initParameter = sc.getInitParameter(CONFIG_LOCATION_PARAM);
-		if (initParameter != null) {
-			wac.setConfigLocation(initParameter);
+		String configLocationParam = sc.getInitParameter(CONFIG_LOCATION_PARAM);
+		if (configLocationParam != null) {
+			wac.setConfigLocation(configLocationParam);
+		}
+
+		// The wac environment's #initPropertySources will be called in any case when the context
+		// is refreshed; do it eagerly here to ensure servlet property sources are in place for
+		// use in any post-processing or initialization that occurs below prior to #refresh
+		ConfigurableEnvironment env = wac.getEnvironment();
+		if (env instanceof ConfigurableWebEnvironment) {
+			((ConfigurableWebEnvironment) env).initPropertySources(sc, null);
 		}
+
 		customizeContext(sc, wac);
 		wac.refresh();
 	}
 
+	/**
+	 * Customize the {@link ConfigurableWebApplicationContext} created by this
+	 * ContextLoader after config locations have been supplied to the context
+	 * but before the context is <em>refreshed</em>.
+	 * <p>The default implementation {@linkplain #determineContextInitializerClasses(ServletContext)
+	 * determines} what (if any) context initializer classes have been specified through
+	 * {@linkplain #CONTEXT_INITIALIZER_CLASSES_PARAM context init parameters} and
+	 * {@linkplain ApplicationContextInitializer#initialize invokes each} with the
+	 * given web application context.
+	 * <p>Any {@code ApplicationContextInitializers} implementing
+	 * {@link org.springframework.core.Ordered Ordered} or marked with @{@link
+	 * org.springframework.core.annotation.Order Order} will be sorted appropriately.
+	 * @param sc the current servlet context
+	 * @param wac the newly created application context
+	 * @see #createWebApplicationContext(ServletContext, ApplicationContext)
+	 * @see #CONTEXT_INITIALIZER_CLASSES_PARAM
+	 * @see ApplicationContextInitializer#initialize(ConfigurableApplicationContext)
+	 */
+	protected void customizeContext(ServletContext sc, ConfigurableWebApplicationContext wac) {
+		List<Class<ApplicationContextInitializer<ConfigurableApplicationContext>>> initializerClasses =
+				determineContextInitializerClasses(sc);
+		if (initializerClasses.isEmpty()) {
+			// no ApplicationContextInitializers have been declared -> nothing to do
+			return;
+		}
+
+		ArrayList<ApplicationContextInitializer<ConfigurableApplicationContext>> initializerInstances =
+				new ArrayList<ApplicationContextInitializer<ConfigurableApplicationContext>>();
+
+		for (Class<ApplicationContextInitializer<ConfigurableApplicationContext>> initializerClass : initializerClasses) {
+			Class<?> initializerContextClass =
+					GenericTypeResolver.resolveTypeArgument(initializerClass, ApplicationContextInitializer.class);
+			if (initializerContextClass != null) {
+				Assert.isAssignable(initializerContextClass, wac.getClass(), String.format(
+						"Could not add context initializer [%s] since its generic parameter [%s] " +
+						"is not assignable from the type of application context used by this " +
+						"context loader [%s]: ", initializerClass.getName(), initializerContextClass.getName(),
+						wac.getClass().getName()));
+			}
+			initializerInstances.add(BeanUtils.instantiateClass(initializerClass));
+		}
+
+		AnnotationAwareOrderComparator.sort(initializerInstances);
+		for (ApplicationContextInitializer<ConfigurableApplicationContext> initializer : initializerInstances) {
+			initializer.initialize(wac);
+		}
+	}
+
 	/**
 	 * Return the WebApplicationContext implementation class to use, either the
 	 * default XmlWebApplicationContext or a custom context class if specified.
@@ -426,79 +495,38 @@ protected Class<?> determineContextClass(ServletContext servletContext) {
 	 * @param servletContext current servlet context
 	 * @see #CONTEXT_INITIALIZER_CLASSES_PARAM
 	 */
-	@SuppressWarnings("unchecked")
 	protected List<Class<ApplicationContextInitializer<ConfigurableApplicationContext>>>
 			determineContextInitializerClasses(ServletContext servletContext) {
-		String classNames = servletContext.getInitParameter(CONTEXT_INITIALIZER_CLASSES_PARAM);
+
 		List<Class<ApplicationContextInitializer<ConfigurableApplicationContext>>> classes =
-			new ArrayList<Class<ApplicationContextInitializer<ConfigurableApplicationContext>>>();
-		if (classNames != null) {
-			for (String className : StringUtils.tokenizeToStringArray(classNames, ",")) {
-				try {
-					Class<?> clazz = ClassUtils.forName(className, ClassUtils.getDefaultClassLoader());
-					Assert.isAssignable(ApplicationContextInitializer.class, clazz,
-							"class [" + className + "] must implement ApplicationContextInitializer");
-					classes.add((Class<ApplicationContextInitializer<ConfigurableApplicationContext>>)clazz);
-				}
-				catch (ClassNotFoundException ex) {
-					throw new ApplicationContextException(
-							"Failed to load context initializer class [" + className + "]", ex);
-				}
+				new ArrayList<Class<ApplicationContextInitializer<ConfigurableApplicationContext>>>();
+
+		String globalClassNames = servletContext.getInitParameter(GLOBAL_INITIALIZER_CLASSES_PARAM);
+		if (globalClassNames != null) {
+			for (String className : StringUtils.tokenizeToStringArray(globalClassNames, INIT_PARAM_DELIMITERS)) {
+				classes.add(loadInitializerClass(className));
 			}
 		}
-		return classes;
-	}
 
-	/**
-	 * Customize the {@link ConfigurableWebApplicationContext} created by this
-	 * ContextLoader after config locations have been supplied to the context
-	 * but before the context is <em>refreshed</em>.
-	 * <p>The default implementation {@linkplain #determineContextInitializerClasses(ServletContext)
-	 * determines} what (if any) context initializer classes have been specified through
-	 * {@linkplain #CONTEXT_INITIALIZER_CLASSES_PARAM context init parameters} and
-	 * {@linkplain ApplicationContextInitializer#initialize invokes each} with the
-	 * given web application context.
-	 * <p>Any {@code ApplicationContextInitializers} implementing
-	 * {@link org.springframework.core.Ordered Ordered} or marked with @{@link
-	 * org.springframework.core.annotation.Order Order} will be sorted appropriately.
-	 * @param servletContext the current servlet context
-	 * @param applicationContext the newly created application context
-	 * @see #createWebApplicationContext(ServletContext, ApplicationContext)
-	 * @see #CONTEXT_INITIALIZER_CLASSES_PARAM
-	 * @see ApplicationContextInitializer#initialize(ConfigurableApplicationContext)
-	 */
-	protected void customizeContext(ServletContext servletContext, ConfigurableWebApplicationContext applicationContext) {
-		List<Class<ApplicationContextInitializer<ConfigurableApplicationContext>>> initializerClasses =
-				determineContextInitializerClasses(servletContext);
-
-		if (initializerClasses.size() == 0) {
-			// no ApplicationContextInitializers have been declared -> nothing to do
-			return;
+		String localClassNames = servletContext.getInitParameter(CONTEXT_INITIALIZER_CLASSES_PARAM);
+		if (localClassNames != null) {
+			for (String className : StringUtils.tokenizeToStringArray(localClassNames, INIT_PARAM_DELIMITERS)) {
+				classes.add(loadInitializerClass(className));
+			}
 		}
 
-		Class<?> contextClass = applicationContext.getClass();
-		ArrayList<ApplicationContextInitializer<ConfigurableApplicationContext>> initializerInstances =
-				new ArrayList<ApplicationContextInitializer<ConfigurableApplicationContext>>();
-
-		for (Class<ApplicationContextInitializer<ConfigurableApplicationContext>> initializerClass : initializerClasses) {
-			Class<?> initializerContextClass =
-					GenericTypeResolver.resolveTypeArgument(initializerClass, ApplicationContextInitializer.class);
-			Assert.isAssignable(initializerContextClass, contextClass, String.format(
-					"Could not add context initializer [%s] as its generic parameter [%s] " +
-					"is not assignable from the type of application context used by this " +
-					"context loader [%s]: ", initializerClass.getName(), initializerContextClass.getName(),
-					contextClass.getName()));
-			initializerInstances.add(BeanUtils.instantiateClass(initializerClass));
-		}
+		return classes;
+	}
 
-		ConfigurableEnvironment env = applicationContext.getEnvironment();
-		if (env instanceof ConfigurableWebEnvironment) {
-			((ConfigurableWebEnvironment)env).initPropertySources(servletContext, null);
+	@SuppressWarnings("unchecked")
+	private Class<ApplicationContextInitializer<ConfigurableApplicationContext>> loadInitializerClass(String className) {
+		try {
+			Class<?> clazz = ClassUtils.forName(className, ClassUtils.getDefaultClassLoader());
+			Assert.isAssignable(ApplicationContextInitializer.class, clazz);
+			return (Class<ApplicationContextInitializer<ConfigurableApplicationContext>>) clazz;
 		}
-
-		Collections.sort(initializerInstances, new AnnotationAwareOrderComparator());
-		for (ApplicationContextInitializer<ConfigurableApplicationContext> initializer : initializerInstances) {
-			initializer.initialize(applicationContext);
+		catch (ClassNotFoundException ex) {
+			throw new ApplicationContextException("Failed to load context initializer class [" + className + "]", ex);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java
index 6c8ff6de88..73c4fbaa0a 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,17 +62,19 @@ public void requestInitialized(ServletRequestEvent requestEvent) {
 	}
 
 	public void requestDestroyed(ServletRequestEvent requestEvent) {
-		ServletRequestAttributes attributes =
-				(ServletRequestAttributes) requestEvent.getServletRequest().getAttribute(REQUEST_ATTRIBUTES_ATTRIBUTE);
-		ServletRequestAttributes threadAttributes =
-				(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+		ServletRequestAttributes attributes = null;
+		Object reqAttr = requestEvent.getServletRequest().getAttribute(REQUEST_ATTRIBUTES_ATTRIBUTE);
+		if (reqAttr instanceof ServletRequestAttributes) {
+			attributes = (ServletRequestAttributes) reqAttr;
+		}
+		RequestAttributes threadAttributes = RequestContextHolder.getRequestAttributes();
 		if (threadAttributes != null) {
 			// We're assumably within the original request thread...
-			if (attributes == null) {
-				attributes = threadAttributes;
-			}
 			LocaleContextHolder.resetLocaleContext();
 			RequestContextHolder.resetRequestAttributes();
+			if (attributes == null && threadAttributes instanceof ServletRequestAttributes) {
+				attributes = (ServletRequestAttributes) threadAttributes;
+			}
 		}
 		if (attributes != null) {
 			attributes.requestCompleted();
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java
index 6f8331f05f..ce1546aa6e 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/ServletRequestAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package org.springframework.web.context.request;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
@@ -50,7 +50,7 @@ public class ServletRequestAttributes extends AbstractRequestAttributes {
 
 	private volatile HttpSession session;
 
-	private final Map<String, Object> sessionAttributesToUpdate = new HashMap<String, Object>();
+	private final Map<String, Object> sessionAttributesToUpdate = new ConcurrentHashMap<String, Object>(1);
 
 
 	/**
@@ -103,9 +103,7 @@ public Object getAttribute(String name, int scope) {
 				try {
 					Object value = session.getAttribute(name);
 					if (value != null) {
-						synchronized (this.sessionAttributesToUpdate) {
-							this.sessionAttributesToUpdate.put(name, value);
-						}
+						this.sessionAttributesToUpdate.put(name, value);
 					}
 					return value;
 				}
@@ -127,9 +125,7 @@ public void setAttribute(String name, Object value, int scope) {
 		}
 		else {
 			HttpSession session = getSession(true);
-			synchronized (this.sessionAttributesToUpdate) {
-				this.sessionAttributesToUpdate.remove(name);
-			}
+			this.sessionAttributesToUpdate.remove(name);
 			session.setAttribute(name, value);
 		}
 	}
@@ -144,9 +140,7 @@ public void removeAttribute(String name, int scope) {
 		else {
 			HttpSession session = getSession(false);
 			if (session != null) {
-				synchronized (this.sessionAttributesToUpdate) {
-					this.sessionAttributesToUpdate.remove(name);
-				}
+				this.sessionAttributesToUpdate.remove(name);
 				try {
 					session.removeAttribute(name);
 					// Remove any registered destruction callback as well.
@@ -220,24 +214,22 @@ protected void updateAccessedSessionAttributes() {
 		// Store session reference for access after request completion.
 		this.session = this.request.getSession(false);
 		// Update all affected session attributes.
-		synchronized (this.sessionAttributesToUpdate) {
-			if (this.session != null) {
-				try {
-					for (Map.Entry<String, Object> entry : this.sessionAttributesToUpdate.entrySet()) {
-						String name = entry.getKey();
-						Object newValue = entry.getValue();
-						Object oldValue = this.session.getAttribute(name);
-						if (oldValue == newValue) {
-							this.session.setAttribute(name, newValue);
-						}
+		if (this.session != null) {
+			try {
+				for (Map.Entry<String, Object> entry : this.sessionAttributesToUpdate.entrySet()) {
+					String name = entry.getKey();
+					Object newValue = entry.getValue();
+					Object oldValue = this.session.getAttribute(name);
+					if (oldValue == newValue) {
+						this.session.setAttribute(name, newValue);
 					}
 				}
-				catch (IllegalStateException ex) {
-					// Session invalidated - shouldn't usually happen.
-				}
 			}
-			this.sessionAttributesToUpdate.clear();
+			catch (IllegalStateException ex) {
+				// Session invalidated - shouldn't usually happen.
+			}
 		}
+		this.sessionAttributesToUpdate.clear();
 	}
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
index ca6318f344..10fe45035f 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.web.context.request;
 
 import java.security.Principal;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
@@ -47,6 +48,8 @@ public class ServletWebRequest extends ServletRequestAttributes implements Nativ
 
 	private static final String METHOD_GET = "GET";
 
+	private static final String METHOD_HEAD = "HEAD";
+
 
 	private HttpServletResponse response;
 
@@ -73,7 +76,7 @@ public ServletWebRequest(HttpServletRequest request, HttpServletResponse respons
 
 
 	/**
-	 * Exposes the native {@link HttpServletRequest} that we're wrapping (if any).
+	 * Exposes the native {@link HttpServletResponse} that we're wrapping (if any).
 	 */
 	public final HttpServletResponse getResponse() {
 		return this.response;
@@ -149,13 +152,31 @@ public boolean isSecure() {
 		return getRequest().isSecure();
 	}
 
+	@SuppressWarnings("deprecation")
 	public boolean checkNotModified(long lastModifiedTimestamp) {
 		if (lastModifiedTimestamp >= 0 && !this.notModified &&
 				(this.response == null || !this.response.containsHeader(HEADER_LAST_MODIFIED))) {
-			long ifModifiedSince = getRequest().getDateHeader(HEADER_IF_MODIFIED_SINCE);
+			long ifModifiedSince = -1;
+			try {
+				ifModifiedSince = getRequest().getDateHeader(HEADER_IF_MODIFIED_SINCE);
+			}
+			catch (IllegalArgumentException ex) {
+				String headerValue = getRequest().getHeader(HEADER_IF_MODIFIED_SINCE);
+				// Possibly an IE 10 style value: "Wed, 09 Apr 2014 09:57:42 GMT; length=13774"
+				int separatorIndex = headerValue.indexOf(';');
+				if (separatorIndex != -1) {
+					String datePart = headerValue.substring(0, separatorIndex);
+					try {
+						ifModifiedSince = Date.parse(datePart);
+					}
+					catch (IllegalArgumentException ex2) {
+						// Giving up
+					}
+				}
+			}
 			this.notModified = (ifModifiedSince >= (lastModifiedTimestamp / 1000 * 1000));
 			if (this.response != null) {
-				if (this.notModified && METHOD_GET.equals(getRequest().getMethod())) {
+				if (this.notModified && supportsNotModifiedStatus()) {
 					this.response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
 				}
 				else {
@@ -166,22 +187,27 @@ public boolean checkNotModified(long lastModifiedTimestamp) {
 		return this.notModified;
 	}
 
-	public boolean checkNotModified(String eTag) {
-		if (StringUtils.hasLength(eTag) && !this.notModified &&
+	@Override
+	public boolean checkNotModified(String etag) {
+		if (StringUtils.hasLength(etag) && !this.notModified &&
 				(this.response == null || !this.response.containsHeader(HEADER_ETAG))) {
 			String ifNoneMatch = getRequest().getHeader(HEADER_IF_NONE_MATCH);
-			this.notModified = eTag.equals(ifNoneMatch);
+			this.notModified = etag.equals(ifNoneMatch);
 			if (this.response != null) {
-				if (this.notModified && METHOD_GET.equals(getRequest().getMethod())) {
+				if (this.notModified && supportsNotModifiedStatus()) {
 					this.response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
 				}
 				else {
-					this.response.setHeader(HEADER_ETAG, eTag);
+					this.response.setHeader(HEADER_ETAG, etag);
 				}
 			}
 		}
 		return this.notModified;
+	}
 
+	private boolean supportsNotModifiedStatus() {
+		String method = getRequest().getMethod();
+		return (METHOD_GET.equals(method) || METHOD_HEAD.equals(method));
 	}
 
 	public boolean isNotModified() {
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java
index cce42d4c5f..401451494f 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -142,8 +142,11 @@ public interface WebRequest extends RequestAttributes {
 	 *   return "myViewName";
 	 * }</pre>
 	 * <p><strong>Note:</strong> that you typically want to use either
-	 * this {@link #checkNotModified(long)} method; or
+	 * this {@code #checkNotModified(long)} method; or
 	 * {@link #checkNotModified(String)}, but not both.
+	 * <p>If the "If-Modified-Since" header is set but cannot be parsed
+	 * to a date value, this method will ignore the header and proceed
+	 * with setting the last-modified timestamp on the response.
 	 * @param lastModifiedTimestamp the last-modified timestamp that
 	 * the application determined for the underlying resource
 	 * @return whether the request qualifies as not modified,
@@ -170,16 +173,16 @@ public interface WebRequest extends RequestAttributes {
 	 *   return "myViewName";
 	 * }</pre>
 	 * <p><strong>Note:</strong> that you typically want to use either
-	 * this {@link #checkNotModified(String)} method; or
+	 * this {@code #checkNotModified(String)} method; or
 	 * {@link #checkNotModified(long)}, but not both.
-	 * @param eTag the entity tag that the application determined
+	 * @param etag the entity tag that the application determined
 	 * for the underlying resource. This parameter will be padded
 	 * with quotes (") if necessary.
 	 * @return whether the request qualifies as not modified,
 	 * allowing to abort request processing and relying on the response
 	 * telling the client that the content has not been modified
 	 */
-	boolean checkNotModified(String eTag);
+	boolean checkNotModified(String etag);
 
 	/**
 	 * Get a short description of this request,
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/CallableInterceptorChain.java b/spring-web/src/main/java/org/springframework/web/context/request/async/CallableInterceptorChain.java
index ba3885330d..3cf4f889f8 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/CallableInterceptorChain.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/CallableInterceptorChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
  */
 class CallableInterceptorChain {
 
-	private static Log logger = LogFactory.getLog(CallableInterceptorChain.class);
+	private static final Log logger = LogFactory.getLog(CallableInterceptorChain.class);
 
 	private final List<CallableProcessingInterceptor> interceptors;
 
@@ -102,4 +102,5 @@ public void triggerAfterCompletion(NativeWebRequest request, Callable<?> task) {
 			}
 		}
 	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResult.java b/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResult.java
index 22ea83f458..79a0e7e6d8 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResult.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.context.request.async;
 
 import java.util.PriorityQueue;
@@ -20,38 +21,38 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.util.Assert;
 import org.springframework.web.context.request.NativeWebRequest;
 
 /**
- * {@code DeferredResult} provides an alternative to using a {@link Callable}
- * for asynchronous request processing. While a {@code Callable} is executed
- * concurrently on behalf of the application, with a {@code DeferredResult} the
- * application can produce the result from a thread of its choice.
+ * {@code DeferredResult} provides an alternative to using a {@link Callable} for
+ * asynchronous request processing. While a {@code Callable} is executed concurrently
+ * on behalf of the application, with a {@code DeferredResult} the application can
+ * produce the result from a thread of its choice.
  *
- * <p>Subclasses can extend this class to easily associate additional data or
- * behavior with the {@link DeferredResult}. For example, one might want to
- * associate the user used to create the {@link DeferredResult} by extending the
- * class and adding an additional property for the user. In this way, the user
- * could easily be accessed later without the need to use a data structure to do
- * the mapping.
+ * <p>Subclasses can extend this class to easily associate additional data or behavior
+ * with the {@link DeferredResult}. For example, one might want to associate the user
+ * used to create the {@link DeferredResult} by extending the class and adding an
+ * additional property for the user. In this way, the user could easily be accessed
+ * later without the need to use a data structure to do the mapping.
  *
- * <p>An example of associating additional behavior to this class might be
- * realized by extending the class to implement an additional interface. For
- * example, one might want to implement {@link Comparable} so that when the
- * {@link DeferredResult} is added to a {@link PriorityQueue} it is handled in
- * the correct order.
+ * <p>An example of associating additional behavior to this class might be realized
+ * by extending the class to implement an additional interface. For example, one
+ * might want to implement {@link Comparable} so that when the {@link DeferredResult}
+ * is added to a {@link PriorityQueue} it is handled in the correct order.
  *
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @author Rob Winch
  * @since 3.2
  */
 public class DeferredResult<T> {
 
-	private static final Log logger = LogFactory.getLog(DeferredResult.class);
-
 	private static final Object RESULT_NONE = new Object();
 
+	private static final Log logger = LogFactory.getLog(DeferredResult.class);
+
 
 	private final Long timeout;
 
@@ -63,9 +64,9 @@ public class DeferredResult<T> {
 
 	private DeferredResultHandler resultHandler;
 
-	private Object result = RESULT_NONE;
+	private volatile Object result = RESULT_NONE;
 
-	private boolean expired;
+	private volatile boolean expired = false;
 
 
 	/**
@@ -86,7 +87,7 @@ public DeferredResult(long timeout) {
 	/**
 	 * Create a DeferredResult with a timeout value and a default result to use
 	 * in case of timeout.
-	 * @param timeout timeout value in milliseconds; ignored if {@code null}
+	 * @param timeout timeout value in milliseconds (ignored if {@code null})
 	 * @param timeoutResult the result to use
 	 */
 	public DeferredResult(Long timeout, Object timeoutResult) {
@@ -94,17 +95,17 @@ public DeferredResult(Long timeout, Object timeoutResult) {
 		this.timeout = timeout;
 	}
 
+
 	/**
 	 * Return {@code true} if this DeferredResult is no longer usable either
 	 * because it was previously set or because the underlying request expired.
-	 * <p>
-	 * The result may have been set with a call to {@link #setResult(Object)},
+	 * <p>The result may have been set with a call to {@link #setResult(Object)},
 	 * or {@link #setErrorResult(Object)}, or as a result of a timeout, if a
 	 * timeout result was provided to the constructor. The request may also
 	 * expire due to a timeout or network error.
 	 */
 	public final boolean isSetOrExpired() {
-		return ((this.result != RESULT_NONE) || this.expired);
+		return (this.result != RESULT_NONE || this.expired);
 	}
 
 	/**
@@ -115,22 +116,21 @@ final Long getTimeoutValue() {
 	}
 
 	/**
-	 * Register code to invoke when the async request times out. This method is
-	 * called from a container thread when an async request times out before the
-	 * {@code DeferredResult} has been set. It may invoke
-	 * {@link DeferredResult#setResult(Object) setResult} or
-	 * {@link DeferredResult#setErrorResult(Object) setErrorResult} to resume
-	 * processing.
+	 * Register code to invoke when the async request times out.
+	 * <p>This method is called from a container thread when an async request
+	 * times out before the {@code DeferredResult} has been populated.
+	 * It may invoke {@link DeferredResult#setResult setResult} or
+	 * {@link DeferredResult#setErrorResult setErrorResult} to resume processing.
 	 */
 	public void onTimeout(Runnable callback) {
 		this.timeoutCallback = callback;
 	}
 
 	/**
-	 * Register code to invoke when the async request completes. This method is
-	 * called from a container thread when an async request completed for any
-	 * reason including timeout and network error. This method is useful for
-	 * detecting that a {@code DeferredResult} instance is no longer usable.
+	 * Register code to invoke when the async request completes.
+	 * <p>This method is called from a container thread when an async request
+	 * completed for any reason including timeout and network error. This is useful
+	 * for detecting that a {@code DeferredResult} instance is no longer usable.
 	 */
 	public void onCompletion(Runnable callback) {
 		this.completionCallback = callback;
@@ -143,24 +143,39 @@ public void onCompletion(Runnable callback) {
 	 */
 	public final void setResultHandler(DeferredResultHandler resultHandler) {
 		Assert.notNull(resultHandler, "DeferredResultHandler is required");
+		// Immediate expiration check outside of the result lock
+		if (this.expired) {
+			return;
+		}
+		Object resultToHandle;
 		synchronized (this) {
-			this.resultHandler = resultHandler;
-			if ((this.result != RESULT_NONE) && (!this.expired)) {
-				try {
-					this.resultHandler.handleResult(this.result);
-				}
-				catch (Throwable t) {
-					logger.trace("DeferredResult not handled", t);
-				}
+			// Got the lock in the meantime: double-check expiration status
+			if (this.expired) {
+				return;
 			}
+			resultToHandle = this.result;
+			if (resultToHandle == RESULT_NONE) {
+				// No result yet: store handler for processing once it comes in
+				this.resultHandler = resultHandler;
+				return;
+			}
+		}
+		// If we get here, we need to process an existing result object immediately.
+		// The decision is made within the result lock; just the handle call outside
+		// of it, avoiding any deadlock potential with Servlet container locks.
+		try {
+			resultHandler.handleResult(resultToHandle);
+		}
+		catch (Throwable ex) {
+			logger.debug("Failed to handle existing result", ex);
 		}
 	}
 
 	/**
 	 * Set the value for the DeferredResult and handle it.
 	 * @param result the value to set
-	 * @return "true" if the result was set and passed on for handling; "false"
-	 * if the result was already set or the async request expired.
+	 * @return {@code true} if the result was set and passed on for handling;
+	 * {@code false} if the result was already set or the async request expired
 	 * @see #isSetOrExpired()
 	 */
 	public boolean setResult(T result) {
@@ -168,51 +183,76 @@ public boolean setResult(T result) {
 	}
 
 	private boolean setResultInternal(Object result) {
+		// Immediate expiration check outside of the result lock
+		if (isSetOrExpired()) {
+			return false;
+		}
+		DeferredResultHandler resultHandlerToUse;
 		synchronized (this) {
+			// Got the lock in the meantime: double-check expiration status
 			if (isSetOrExpired()) {
 				return false;
 			}
+			// At this point, we got a new result to process
 			this.result = result;
-			if (this.resultHandler != null) {
-				this.resultHandler.handleResult(this.result);
+			resultHandlerToUse = this.resultHandler;
+			if (resultHandlerToUse == null) {
+				// No result handler set yet -> let the setResultHandler implementation
+				// pick up the result object and invoke the result handler for it.
+				return true;
 			}
+			// Result handler available -> let's clear the stored reference since
+			// we don't need it anymore.
+			this.resultHandler = null;
 		}
+		// If we get here, we need to process an existing result object immediately.
+		// The decision is made within the result lock; just the handle call outside
+		// of it, avoiding any deadlock potential with Servlet container locks.
+		resultHandlerToUse.handleResult(result);
 		return true;
 	}
 
 	/**
-	 * Set an error value for the {@link DeferredResult} and handle it. The value
-	 * may be an {@link Exception} or {@link Throwable} in which case it will be
-	 * processed as if a handler raised the exception.
+	 * Set an error value for the {@link DeferredResult} and handle it.
+	 * The value may be an {@link Exception} or {@link Throwable} in which case
+	 * it will be processed as if a handler raised the exception.
 	 * @param result the error result value
-	 * @return "true" if the result was set to the error value and passed on for
-	 * handling; "false" if the result was already set or the async request
-	 * expired.
+	 * @return {@code true} if the result was set to the error value and passed on
+	 * for handling; {@code false} if the result was already set or the async
+	 * request expired
 	 * @see #isSetOrExpired()
 	 */
 	public boolean setErrorResult(Object result) {
 		return setResultInternal(result);
 	}
 
+
 	final DeferredResultProcessingInterceptor getInterceptor() {
 		return new DeferredResultProcessingInterceptorAdapter() {
-
 			@Override
 			public <S> boolean handleTimeout(NativeWebRequest request, DeferredResult<S> deferredResult) {
-				if (timeoutCallback != null) {
-					timeoutCallback.run();
+				boolean continueProcessing = true;
+				try {
+					if (timeoutCallback != null) {
+						timeoutCallback.run();
+					}
 				}
-				if (DeferredResult.this.timeoutResult != RESULT_NONE) {
-					setResultInternal(timeoutResult);
+				finally {
+					if (timeoutResult != RESULT_NONE) {
+						continueProcessing = false;
+						try {
+							setResultInternal(timeoutResult);
+						}
+						catch (Throwable ex) {
+							logger.debug("Failed to handle timeout result", ex);
+						}
+					}
 				}
-				return true;
+				return continueProcessing;
 			}
-
 			@Override
 			public <S> void afterCompletion(NativeWebRequest request, DeferredResult<S> deferredResult) {
-				synchronized (DeferredResult.this) {
-					expired = true;
-				}
+				expired = true;
 				if (completionCallback != null) {
 					completionCallback.run();
 				}
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultInterceptorChain.java b/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultInterceptorChain.java
index ffe9bb8126..fba37f178a 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultInterceptorChain.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultInterceptorChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
  */
 class DeferredResultInterceptorChain {
 
-	private static Log logger = LogFactory.getLog(DeferredResultInterceptorChain.class);
+	private static final Log logger = LogFactory.getLog(DeferredResultInterceptorChain.class);
 
 	private final List<DeferredResultProcessingInterceptor> interceptors;
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultProcessingInterceptorAdapter.java b/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultProcessingInterceptorAdapter.java
index 774761bdb6..9a7387486a 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultProcessingInterceptorAdapter.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultProcessingInterceptorAdapter.java
@@ -30,7 +30,9 @@ public abstract class DeferredResultProcessingInterceptorAdapter implements Defe
 	/**
 	 * This implementation is empty.
 	 */
-	public <T> void beforeConcurrentHandling(NativeWebRequest request, DeferredResult<T> deferredResult) throws Exception {
+	@Override
+	public <T> void beforeConcurrentHandling(NativeWebRequest request, DeferredResult<T> deferredResult)
+			throws Exception {
 	}
 
 	/**
@@ -47,7 +49,8 @@ public <T> void postProcess(NativeWebRequest request, DeferredResult<T> deferred
 	}
 
 	/**
-	 * This implementation returns {@code true} by default.
+	 * This implementation returns {@code true} by default allowing other interceptors
+	 * to be given a chance to handle the timeout.
 	 */
 	public <T> boolean handleTimeout(NativeWebRequest request, DeferredResult<T> deferredResult) throws Exception {
 		return true;
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/NoSupportAsyncWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/async/NoSupportAsyncWebRequest.java
index 6158a82931..626e2a9135 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/NoSupportAsyncWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/NoSupportAsyncWebRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,6 +49,7 @@ public boolean isAsyncStarted() {
 		return false;
 	}
 
+
 	// Not supported
 
 	public void startAsync() {
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
index 8e5e6d4d6b..6080a81e34 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import javax.servlet.AsyncContext;
 import javax.servlet.AsyncEvent;
 import javax.servlet.AsyncListener;
@@ -36,7 +35,7 @@
  * <p>The servlet and all filters involved in an async request must have async
  * support enabled using the Servlet API or by adding an
  * {@code <async-support>true</async-support>} element to servlet and filter
- * declarations in web.xml
+ * declarations in {@code web.xml}.
  *
  * @author Rossen Stoyanchev
  * @since 3.2
@@ -63,9 +62,9 @@ public StandardServletAsyncWebRequest(HttpServletRequest request, HttpServletRes
 		super(request, response);
 	}
 
+
 	/**
-	 * {@inheritDoc}
-	 * <p>In Servlet 3 async processing, the timeout period begins after the
+	 * In Servlet 3 async processing, the timeout period begins after the
 	 * container processing thread has exited.
 	 */
 	public void setTimeout(Long timeout) {
@@ -82,7 +81,7 @@ public void addCompletionHandler(Runnable runnable) {
 	}
 
 	public boolean isAsyncStarted() {
-		return ((this.asyncContext != null) && getRequest().isAsyncStarted());
+		return (this.asyncContext != null && getRequest().isAsyncStarted());
 	}
 
 	/**
@@ -101,6 +100,7 @@ public void startAsync() {
 				"or by adding \"<async-supported>true</async-supported>\" to servlet and " +
 				"filter declarations in web.xml.");
 		Assert.state(!isAsyncComplete(), "Async processing has already completed");
+
 		if (isAsyncStarted()) {
 			return;
 		}
@@ -116,6 +116,7 @@ public void dispatch() {
 		this.asyncContext.dispatch();
 	}
 
+
 	// ---------------------------------------------------------------------
 	// Implementation of AsyncListener methods
 	// ---------------------------------------------------------------------
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java
index 8c79b4230f..0cf26d13c4 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.context.request.async;
 
 import java.util.ArrayList;
@@ -20,11 +21,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
-
+import java.util.concurrent.RejectedExecutionException;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.util.Assert;
@@ -48,7 +50,6 @@
  *
  * @author Rossen Stoyanchev
  * @since 3.2
- *
  * @see org.springframework.web.context.request.AsyncWebRequestInterceptor
  * @see org.springframework.web.servlet.AsyncHandlerInterceptor
  * @see org.springframework.web.filter.OncePerRequestFilter#shouldNotFilterAsyncDispatch
@@ -85,13 +86,14 @@ public final class WebAsyncManager {
 
 
 	/**
-	 * Package private constructor.
+	 * Package-private constructor.
 	 * @see WebAsyncUtils#getAsyncManager(javax.servlet.ServletRequest)
 	 * @see WebAsyncUtils#getAsyncManager(org.springframework.web.context.request.WebRequest)
 	 */
 	WebAsyncManager() {
 	}
 
+
 	/**
 	 * Configure the {@link AsyncWebRequest} to use. This property may be set
 	 * more than once during a single request to accurately reflect the current
@@ -99,7 +101,6 @@ public final class WebAsyncManager {
 	 * wrapping, etc). However, it should not be set while concurrent handling
 	 * is in progress, i.e. while {@link #isConcurrentHandlingStarted()} is
 	 * {@code true}.
-	 *
 	 * @param asyncWebRequest the web request to use
 	 */
 	public void setAsyncWebRequest(final AsyncWebRequest asyncWebRequest) {
@@ -143,7 +144,6 @@ public boolean hasConcurrentResult() {
 
 	/**
 	 * Provides access to the result from concurrent handling.
-	 *
 	 * @return an Object, possibly an {@code Exception} or {@code Throwable} if
 	 * concurrent handling raised one.
 	 * @see #clearConcurrentResult()
@@ -155,7 +155,6 @@ public Object getConcurrentResult() {
 	/**
 	 * Provides access to additional processing context saved at the start of
 	 * concurrent handling.
-	 *
 	 * @see #clearConcurrentResult()
 	 */
 	public Object[] getConcurrentResultContext() {
@@ -216,14 +215,14 @@ public void registerDeferredResultInterceptor(Object key, DeferredResultProcessi
 	}
 
 	/**
-	 * Register a {@link DeferredResultProcessingInterceptor} without a key.
-	 * The key is derived from the class name and hashcode.
+	 * Register one or more {@link DeferredResultProcessingInterceptor}s without a specified key.
+	 * The default key is derived from the interceptor class name and hash code.
 	 * @param interceptors one or more interceptors to register
 	 */
 	public void registerDeferredResultInterceptors(DeferredResultProcessingInterceptor... interceptors) {
 		Assert.notNull(interceptors, "A DeferredResultProcessingInterceptor is required");
 		for (DeferredResultProcessingInterceptor interceptor : interceptors) {
-			String key = interceptors.getClass().getName() + ":" + interceptors.hashCode();
+			String key = interceptor.getClass().getName() + ":" + interceptor.hashCode();
 			this.deferredResultInterceptors.put(key, interceptor);
 		}
 	}
@@ -243,17 +242,15 @@ public void clearConcurrentResult() {
 	 * from the task execution is saved and the request dispatched in order to
 	 * resume processing of that result. If the task raises an Exception then
 	 * the saved result will be the raised Exception.
-	 *
 	 * @param callable a unit of work to be executed asynchronously
 	 * @param processingContext additional context to save that can be accessed
 	 * via {@link #getConcurrentResultContext()}
-	 * @throws Exception If concurrent processing failed to start
-	 *
+	 * @throws Exception if concurrent processing failed to start
 	 * @see #getConcurrentResult()
 	 * @see #getConcurrentResultContext()
 	 */
-	@SuppressWarnings({"unchecked" })
-	public void startCallableProcessing(final Callable<?> callable, Object... processingContext) throws Exception {
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	public void startCallableProcessing(Callable<?> callable, Object... processingContext) throws Exception {
 		Assert.notNull(callable, "Callable must not be null");
 		startCallableProcessing(new WebAsyncTask(callable), processingContext);
 	}
@@ -262,11 +259,10 @@ public void startCallableProcessing(final Callable<?> callable, Object... proces
 	 * Use the given {@link WebAsyncTask} to configure the task executor as well as
 	 * the timeout value of the {@code AsyncWebRequest} before delegating to
 	 * {@link #startCallableProcessing(Callable, Object...)}.
-	 *
 	 * @param webAsyncTask a WebAsyncTask containing the target {@code Callable}
 	 * @param processingContext additional context to save that can be accessed
 	 * via {@link #getConcurrentResultContext()}
-	 * @throws Exception If concurrent processing failed to start
+	 * @throws Exception if concurrent processing failed to start
 	 */
 	public void startCallableProcessing(final WebAsyncTask<?> webAsyncTask, Object... processingContext) throws Exception {
 		Assert.notNull(webAsyncTask, "WebAsyncTask must not be null");
@@ -306,26 +302,31 @@ public void run() {
 			}
 		});
 
-		interceptorChain.applyBeforeConcurrentHandling(asyncWebRequest, callable);
-
+		interceptorChain.applyBeforeConcurrentHandling(this.asyncWebRequest, callable);
 		startAsyncProcessing(processingContext);
-
-		this.taskExecutor.submit(new Runnable() {
-			public void run() {
-				Object result = null;
-				try {
-					interceptorChain.applyPreProcess(asyncWebRequest, callable);
-					result = callable.call();
-				}
-				catch (Throwable t) {
-					result = t;
-				}
-				finally {
-					result = interceptorChain.applyPostProcess(asyncWebRequest, callable, result);
+		try {
+			this.taskExecutor.submit(new Runnable() {
+				public void run() {
+					Object result = null;
+					try {
+						interceptorChain.applyPreProcess(asyncWebRequest, callable);
+						result = callable.call();
+					}
+					catch (Throwable ex) {
+						result = ex;
+					}
+					finally {
+						result = interceptorChain.applyPostProcess(asyncWebRequest, callable, result);
+					}
+					setConcurrentResultAndDispatch(result);
 				}
-				setConcurrentResultAndDispatch(result);
-			}
-		});
+			});
+		}
+		catch (RejectedExecutionException ex) {
+			Object result = interceptorChain.applyPostProcess(this.asyncWebRequest, callable, ex);
+			setConcurrentResultAndDispatch(result);
+			throw ex;
+		}
 	}
 
 	private void setConcurrentResultAndDispatch(Object result) {
@@ -333,18 +334,20 @@ private void setConcurrentResultAndDispatch(Object result) {
 			if (hasConcurrentResult()) {
 				return;
 			}
-			concurrentResult = result;
+			this.concurrentResult = result;
 		}
 
-		if (asyncWebRequest.isAsyncComplete()) {
+		if (this.asyncWebRequest.isAsyncComplete()) {
 			logger.error("Could not complete async processing due to timeout or network error");
 			return;
 		}
 
-		logger.debug("Concurrent result value [" + concurrentResult + "]");
-		logger.debug("Dispatching request to resume processing");
+		if (logger.isDebugEnabled()) {
+			logger.debug("Concurrent result value [" + this.concurrentResult +
+					"] - dispatching request to resume processing");
+		}
 
-		asyncWebRequest.dispatch();
+		this.asyncWebRequest.dispatch();
 	}
 
 	/**
@@ -354,12 +357,10 @@ private void setConcurrentResultAndDispatch(Object result) {
 	 * result. The {@code AsyncWebRequest} is also updated with a completion
 	 * handler that expires the {@code DeferredResult} and a timeout handler
 	 * assuming the {@code DeferredResult} has a default timeout result.
-	 *
 	 * @param deferredResult the DeferredResult instance to initialize
 	 * @param processingContext additional context to save that can be accessed
 	 * via {@link #getConcurrentResultContext()}
-	 * @throws Exception If concurrent processing failed to start
-	 *
+	 * @throws Exception if concurrent processing failed to start
 	 * @see #getConcurrentResult()
 	 * @see #getConcurrentResultContext()
 	 */
@@ -386,8 +387,8 @@ public void run() {
 				try {
 					interceptorChain.triggerAfterTimeout(asyncWebRequest, deferredResult);
 				}
-				catch (Throwable t) {
-					setConcurrentResultAndDispatch(t);
+				catch (Throwable ex) {
+					setConcurrentResultAndDispatch(ex);
 				}
 			}
 		});
@@ -398,8 +399,7 @@ public void run() {
 			}
 		});
 
-		interceptorChain.applyBeforeConcurrentHandling(asyncWebRequest, deferredResult);
-
+		interceptorChain.applyBeforeConcurrentHandling(this.asyncWebRequest, deferredResult);
 		startAsyncProcessing(processingContext);
 
 		try {
@@ -411,16 +411,14 @@ public void handleResult(Object result) {
 				}
 			});
 		}
-		catch (Throwable t) {
-			setConcurrentResultAndDispatch(t);
+		catch (Throwable ex) {
+			setConcurrentResultAndDispatch(ex);
 		}
 	}
 
 	private void startAsyncProcessing(Object[] processingContext) {
-
 		clearConcurrentResult();
 		this.concurrentResultContext = processingContext;
-
 		this.asyncWebRequest.startAsync();
 
 		if (logger.isDebugEnabled()) {
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncTask.java b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncTask.java
index 59fa985acb..21a4ede67f 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncTask.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.context.request.async;
 
 import java.util.concurrent.Callable;
 
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.util.Assert;
 import org.springframework.web.context.request.NativeWebRequest;
@@ -26,94 +28,105 @@
  * Holder for a {@link Callable}, a timeout value, and a task executor.
  *
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @since 3.2
  */
-public class WebAsyncTask<V> {
+public class WebAsyncTask<V> implements BeanFactoryAware {
 
 	private final Callable<V> callable;
 
-	private final Long timeout;
+	private Long timeout;
+
+	private AsyncTaskExecutor executor;
 
-	private final String executorName;
+	private String executorName;
 
-	private final AsyncTaskExecutor executor;
+	private BeanFactory beanFactory;
 
 	private Callable<V> timeoutCallback;
 
 	private Runnable completionCallback;
 
-	private BeanFactory beanFactory;
-
 
 	/**
 	 * Create a {@code WebAsyncTask} wrapping the given {@link Callable}.
 	 * @param callable the callable for concurrent handling
 	 */
 	public WebAsyncTask(Callable<V> callable) {
-		this(null, null, null, callable);
+		Assert.notNull(callable, "Callable must not be null");
+		this.callable = callable;
 	}
 
 	/**
 	 * Create a {@code WebAsyncTask} with a timeout value and a {@link Callable}.
-	 * @param timeout timeout value in milliseconds
+	 * @param timeout a timeout value in milliseconds
 	 * @param callable the callable for concurrent handling
 	 */
 	public WebAsyncTask(long timeout, Callable<V> callable) {
-		this(timeout, null, null, callable);
+		this(callable);
+		this.timeout = timeout;
 	}
 
 	/**
 	 * Create a {@code WebAsyncTask} with a timeout value, an executor name, and a {@link Callable}.
 	 * @param timeout timeout value in milliseconds; ignored if {@code null}
+	 * @param executorName the name of an executor bean to use
 	 * @param callable the callable for concurrent handling
 	 */
 	public WebAsyncTask(Long timeout, String executorName, Callable<V> callable) {
-		this(timeout, null, executorName, callable);
-		Assert.notNull(executor, "Executor name must not be null");
+		this(callable);
+		Assert.notNull(executorName, "Executor name must not be null");
+		this.executorName = executorName;
+		this.timeout = timeout;
 	}
 
 	/**
 	 * Create a {@code WebAsyncTask} with a timeout value, an executor instance, and a Callable.
 	 * @param timeout timeout value in milliseconds; ignored if {@code null}
+	 * @param executor the executor to use
 	 * @param callable the callable for concurrent handling
 	 */
 	public WebAsyncTask(Long timeout, AsyncTaskExecutor executor, Callable<V> callable) {
-		this(timeout, executor, null, callable);
+		this(callable);
 		Assert.notNull(executor, "Executor must not be null");
-	}
-
-	private WebAsyncTask(Long timeout, AsyncTaskExecutor executor, String executorName, Callable<V> callable) {
-		Assert.notNull(callable, "Callable must not be null");
-		this.callable = callable;
-		this.timeout = timeout;
 		this.executor = executor;
-		this.executorName = executorName;
+		this.timeout = timeout;
 	}
 
 
 	/**
-	 * Return the {@link Callable} to use for concurrent handling, never {@code null}.
+	 * Return the {@link Callable} to use for concurrent handling (never {@code null}).
 	 */
 	public Callable<?> getCallable() {
 		return this.callable;
 	}
 
 	/**
-	 * Return the timeout value in milliseconds or {@code null} if not value is set.
+	 * Return the timeout value in milliseconds, or {@code null} if no timeout is set.
 	 */
 	public Long getTimeout() {
 		return this.timeout;
 	}
 
 	/**
-	 * Return the AsyncTaskExecutor to use for concurrent handling, or {@code null}.
+	 * A {@link BeanFactory} to use for resolving an executor name.
+	 * <p>This factory reference will automatically be set when
+	 * {@code WebAsyncTask} is used within a Spring MVC controller.
+	 */
+	public void setBeanFactory(BeanFactory beanFactory) {
+		this.beanFactory = beanFactory;
+	}
+
+	/**
+	 * Return the AsyncTaskExecutor to use for concurrent handling,
+	 * or {@code null} if none specified.
 	 */
 	public AsyncTaskExecutor getExecutor() {
 		if (this.executor != null) {
 			return this.executor;
 		}
 		else if (this.executorName != null) {
-			Assert.state(this.beanFactory != null, "A BeanFactory is required to look up a task executor bean");
+			Assert.state(this.beanFactory != null, "BeanFactory is required to look up an executor bean by name");
 			return this.beanFactory.getBean(this.executorName, AsyncTaskExecutor.class);
 		}
 		else {
@@ -121,22 +134,13 @@ else if (this.executorName != null) {
 		}
 	}
 
-	/**
-	 * A {@link BeanFactory} to use to resolve an executor name. Applications are
-	 * not expected to have to set this property when {@code WebAsyncTask} is used in a
-	 * Spring MVC controller.
-	 */
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
 
 	/**
-	 * Register code to invoke when the async request times out. This method is
-	 * called from a container thread when an async request times out before the
-	 * {@code Callable} has completed. The callback is executed in the same
-	 * thread and therefore should return without blocking. It may return an
-	 * alternative value to use, including an {@link Exception} or return
+	 * Register code to invoke when the async request times out.
+	 * <p>This method is called from a container thread when an async request times
+	 * out before the {@code Callable} has completed. The callback is executed in
+	 * the same thread and therefore should return without blocking. It may return
+	 * an alternative value to use, including an {@link Exception} or return
 	 * {@link CallableProcessingInterceptor#RESULT_NONE RESULT_NONE}.
 	 */
 	public void onTimeout(Callable<V> callback) {
@@ -144,9 +148,9 @@ public void onTimeout(Callable<V> callback) {
 	}
 
 	/**
-	 * Register code to invoke when the async request completes. This method is
-	 * called from a container thread when an async request completed for any
-	 * reason including timeout and network error.
+	 * Register code to invoke when the async request completes.
+	 * <p>This method is called from a container thread when an async request
+	 * completed for any reason, including timeout and network error.
 	 */
 	public void onCompletion(Runnable callback) {
 		this.completionCallback = callback;
@@ -154,12 +158,10 @@ public void onCompletion(Runnable callback) {
 
 	CallableProcessingInterceptor getInterceptor() {
 		return new CallableProcessingInterceptorAdapter() {
-
 			@Override
 			public <T> Object handleTimeout(NativeWebRequest request, Callable<T> task) throws Exception {
-				return (timeoutCallback != null) ? timeoutCallback.call() : CallableProcessingInterceptor.RESULT_NONE;
+				return (timeoutCallback != null ? timeoutCallback.call() : CallableProcessingInterceptor.RESULT_NONE);
 			}
-
 			@Override
 			public <T> void afterCompletion(NativeWebRequest request, Callable<T> task) throws Exception {
 				if (completionCallback != null) {
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncUtils.java b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncUtils.java
index 4a2e8b7d82..ec83b84120 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.context.request.async;
 
 import java.lang.reflect.Constructor;
@@ -36,6 +37,9 @@ public abstract class WebAsyncUtils {
 
 	public static final String WEB_ASYNC_MANAGER_ATTRIBUTE = WebAsyncManager.class.getName() + ".WEB_ASYNC_MANAGER";
 
+	private static Constructor<?> standardAsyncRequestConstructor;
+
+
 	/**
 	 * Obtain the {@link WebAsyncManager} for the current request, or if not
 	 * found, create and associate it with the request.
@@ -64,29 +68,30 @@ public static WebAsyncManager getAsyncManager(WebRequest webRequest) {
 	}
 
 	/**
-	 * Create an AsyncWebRequest instance. By default an instance of
-	 * {@link StandardServletAsyncWebRequest} is created if running in Servlet
-	 * 3.0 (or higher) environment or as a fallback, an instance of
-	 * {@link NoSupportAsyncWebRequest} is returned.
-	 *
+	 * Create an AsyncWebRequest instance. By default, an instance of
+	 * {@link StandardServletAsyncWebRequest} gets created when running in
+	 * Servlet 3.0 (or higher) environment - as a fallback, an instance
+	 * of {@link NoSupportAsyncWebRequest} will be returned.
 	 * @param request the current request
 	 * @param response the current response
-	 * @return an AsyncWebRequest instance, never {@code null}
+	 * @return an AsyncWebRequest instance (never {@code null})
 	 */
 	public static AsyncWebRequest createAsyncWebRequest(HttpServletRequest request, HttpServletResponse response) {
-		return ClassUtils.hasMethod(ServletRequest.class, "startAsync") ?
-				createStandardServletAsyncWebRequest(request, response) : new NoSupportAsyncWebRequest(request, response);
+		return (ClassUtils.hasMethod(ServletRequest.class, "startAsync") ?
+				createStandardServletAsyncWebRequest(request, response) : new NoSupportAsyncWebRequest(request, response));
 	}
 
 	private static AsyncWebRequest createStandardServletAsyncWebRequest(HttpServletRequest request, HttpServletResponse response) {
 		try {
-			String className = "org.springframework.web.context.request.async.StandardServletAsyncWebRequest";
-			Class<?> clazz = ClassUtils.forName(className, WebAsyncUtils.class.getClassLoader());
-			Constructor<?> constructor = clazz.getConstructor(HttpServletRequest.class, HttpServletResponse.class);
-			return (AsyncWebRequest) BeanUtils.instantiateClass(constructor, request, response);
+			if (standardAsyncRequestConstructor == null) {
+				String className = "org.springframework.web.context.request.async.StandardServletAsyncWebRequest";
+				Class<?> clazz = ClassUtils.forName(className, WebAsyncUtils.class.getClassLoader());
+				standardAsyncRequestConstructor = clazz.getConstructor(HttpServletRequest.class, HttpServletResponse.class);
+			}
+			return (AsyncWebRequest) BeanUtils.instantiateClass(standardAsyncRequestConstructor, request, response);
 		}
-		catch (Throwable t) {
-			throw new IllegalStateException("Failed to instantiate StandardServletAsyncWebRequest", t);
+		catch (Throwable ex) {
+			throw new IllegalStateException("Failed to instantiate StandardServletAsyncWebRequest", ex);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java
index 92b1f7907a..71d9ae9760 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java
@@ -201,11 +201,9 @@ protected void onRefresh() {
 	 */
 	@Override
 	protected void initPropertySources() {
-		super.initPropertySources();
-		ConfigurableEnvironment env = this.getEnvironment();
+		ConfigurableEnvironment env = getEnvironment();
 		if (env instanceof ConfigurableWebEnvironment) {
-			((ConfigurableWebEnvironment)env).initPropertySources(
-					this.servletContext, this.servletConfig);
+			((ConfigurableWebEnvironment) env).initPropertySources(this.servletContext, this.servletConfig);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
index 8f672aae41..c4c1ec3d34 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.web.context.support;
 
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
 import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.annotation.AnnotatedBeanDefinitionReader;
@@ -23,7 +27,6 @@
 import org.springframework.context.annotation.ClassPathBeanDefinitionScanner;
 import org.springframework.context.annotation.ScopeMetadataResolver;
 import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.ContextLoader;
 
@@ -64,7 +67,7 @@
  * {@linkplain ContextLoader#CONTEXT_INITIALIZER_CLASSES_PARAM "contextInitializerClasses"}
  * context-param / init-param. In such cases, users should favor the {@link #refresh()}
  * and {@link #scan(String...)} methods over the {@link #setConfigLocation(String)}
- * method, which is primarily for use by {@code ContextLoader}
+ * method, which is primarily for use by {@code ContextLoader}.
  *
  * <p>Note: In case of multiple {@code @Configuration} classes, later {@code @Bean}
  * definitions will override ones defined in earlier loaded files. This can be leveraged
@@ -77,64 +80,59 @@
  */
 public class AnnotationConfigWebApplicationContext extends AbstractRefreshableWebApplicationContext {
 
-	private Class<?>[] annotatedClasses;
-
-	private String[] basePackages;
-
 	private BeanNameGenerator beanNameGenerator;
 
 	private ScopeMetadataResolver scopeMetadataResolver;
 
+	private final Set<Class<?>> annotatedClasses = new LinkedHashSet<Class<?>>();
+
+	private final Set<String> basePackages = new LinkedHashSet<String>();
+
+
 	/**
-	 * {@inheritDoc}
-	 * <p>This implementation accepts delimited values in the form of fully-qualified
-	 * class names, (typically of {@code Configuration} classes) or fully-qualified
-	 * packages to scan for annotated classes. During {@link #loadBeanDefinitions}, these
-	 * locations will be processed in their given order, first attempting to load each
-	 * value as a class. If class loading fails (i.e. a {@code ClassNotFoundException}
-	 * occurs), the value is assumed to be a package and scanning is attempted.
-	 * <p>Note that this method exists primarily for compatibility with Spring's
-	 * {@link org.springframework.web.context.ContextLoader} and that if this application
-	 * context is being configured through an
-	 * {@link org.springframework.context.ApplicationContextInitializer}, use of the
-	 * {@link #register} and {@link #scan} methods are preferred.
-	 * @see #register(Class...)
-	 * @see #scan(String...)
-	 * @see #setConfigLocations(String[])
-	 * @see #loadBeanDefinitions(DefaultListableBeanFactory)
+	 * Set a custom {@link BeanNameGenerator} for use with {@link AnnotatedBeanDefinitionReader}
+	 * and/or {@link ClassPathBeanDefinitionScanner}.
+	 * <p>Default is {@link org.springframework.context.annotation.AnnotationBeanNameGenerator}.
+	 * @see AnnotatedBeanDefinitionReader#setBeanNameGenerator
+	 * @see ClassPathBeanDefinitionScanner#setBeanNameGenerator
 	 */
-	@Override
-	public void setConfigLocation(String location) {
-		super.setConfigLocation(location);
+	public void setBeanNameGenerator(BeanNameGenerator beanNameGenerator) {
+		this.beanNameGenerator = beanNameGenerator;
 	}
 
 	/**
-	 * {@inheritDoc}
-	 * <p>This implementation accepts individual location values as fully-qualified class
-	 * names (typically {@code @Configuration} classes) or fully-qualified packages to
-	 * scan. During {@link #loadBeanDefinitions}, these locations will be processed in
-	 * order, first attempting to load values as a class, and upon class loading failure
-	 * the value is assumed to be a package to be scanned.
-	 * <p>Note that this method exists primarily for compatibility with Spring's
-	 * {@link org.springframework.web.context.ContextLoader} and that if this application
-	 * context is being configured through an
-	 * {@link org.springframework.context.ApplicationContextInitializer}, use of the
-	 * {@link #register} and {@link #scan} methods are preferred.
-	 * @see #scan(String...)
-	 * @see #register(Class...)
-	 * @see #setConfigLocation(String)
-	 * @see #loadBeanDefinitions(DefaultListableBeanFactory)
+	 * Return the custom {@link BeanNameGenerator} for use with {@link AnnotatedBeanDefinitionReader}
+	 * and/or {@link ClassPathBeanDefinitionScanner}, if any.
 	 */
-	@Override
-	public void setConfigLocations(String[] locations) {
-		super.setConfigLocations(locations);
+	protected BeanNameGenerator getBeanNameGenerator() {
+		return this.beanNameGenerator;
 	}
 
+	/**
+	 * Set a custom {@link ScopeMetadataResolver} for use with {@link AnnotatedBeanDefinitionReader}
+	 * and/or {@link ClassPathBeanDefinitionScanner}.
+	 * <p>Default is an {@link org.springframework.context.annotation.AnnotationScopeMetadataResolver}.
+	 * @see AnnotatedBeanDefinitionReader#setScopeMetadataResolver
+	 * @see ClassPathBeanDefinitionScanner#setScopeMetadataResolver
+	 */
+	public void setScopeMetadataResolver(ScopeMetadataResolver scopeMetadataResolver) {
+		this.scopeMetadataResolver = scopeMetadataResolver;
+	}
+
+	/**
+	 * Return the custom {@link ScopeMetadataResolver} for use with {@link AnnotatedBeanDefinitionReader}
+	 * and/or {@link ClassPathBeanDefinitionScanner}, if any.
+	 */
+	protected ScopeMetadataResolver getScopeMetadataResolver() {
+		return this.scopeMetadataResolver;
+	}
+
+
 	/**
 	 * Register one or more annotated classes to be processed.
-	 * Note that {@link #refresh()} must be called in order for the context to fully
-	 * process the new class.
-	 * <p>Calls to {@link #register} are idempotent; adding the same
+	 * Note that {@link #refresh()} must be called in order for the context
+	 * to fully process the new class.
+	 * <p>Calls to {@code register} are idempotent; adding the same
 	 * annotated class more than once has no additional effect.
 	 * @param annotatedClasses one or more annotated classes,
 	 * e.g. {@link org.springframework.context.annotation.Configuration @Configuration} classes
@@ -145,7 +143,7 @@ public void setConfigLocations(String[] locations) {
 	 */
 	public void register(Class<?>... annotatedClasses) {
 		Assert.notEmpty(annotatedClasses, "At least one annotated class must be specified");
-		this.annotatedClasses = annotatedClasses;
+		this.annotatedClasses.addAll(Arrays.asList(annotatedClasses));
 	}
 
 	/**
@@ -160,9 +158,10 @@ public void register(Class<?>... annotatedClasses) {
 	 */
 	public void scan(String... basePackages) {
 		Assert.notEmpty(basePackages, "At least one base package must be specified");
-		this.basePackages = basePackages;
+		this.basePackages.addAll(Arrays.asList(basePackages));
 	}
 
+
 	/**
 	 * Register a {@link org.springframework.beans.factory.config.BeanDefinition} for
 	 * any classes specified by {@link #register(Class...)} and scan any packages
@@ -187,38 +186,37 @@ public void scan(String... basePackages) {
 	@Override
 	protected void loadBeanDefinitions(DefaultListableBeanFactory beanFactory) {
 		AnnotatedBeanDefinitionReader reader = new AnnotatedBeanDefinitionReader(beanFactory);
-		reader.setEnvironment(this.getEnvironment());
+		reader.setEnvironment(getEnvironment());
 
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(beanFactory);
-		scanner.setEnvironment(this.getEnvironment());
+		scanner.setEnvironment(getEnvironment());
 
 		BeanNameGenerator beanNameGenerator = getBeanNameGenerator();
 		ScopeMetadataResolver scopeMetadataResolver = getScopeMetadataResolver();
 		if (beanNameGenerator != null) {
 			reader.setBeanNameGenerator(beanNameGenerator);
 			scanner.setBeanNameGenerator(beanNameGenerator);
-			beanFactory.registerSingleton(
-					AnnotationConfigUtils.CONFIGURATION_BEAN_NAME_GENERATOR, beanNameGenerator);
+			beanFactory.registerSingleton(AnnotationConfigUtils.CONFIGURATION_BEAN_NAME_GENERATOR, beanNameGenerator);
 		}
 		if (scopeMetadataResolver != null) {
 			reader.setScopeMetadataResolver(scopeMetadataResolver);
 			scanner.setScopeMetadataResolver(scopeMetadataResolver);
 		}
 
-		if (!ObjectUtils.isEmpty(this.annotatedClasses)) {
+		if (!this.annotatedClasses.isEmpty()) {
 			if (logger.isInfoEnabled()) {
 				logger.info("Registering annotated classes: [" +
-						StringUtils.arrayToCommaDelimitedString(this.annotatedClasses) + "]");
+						StringUtils.collectionToCommaDelimitedString(this.annotatedClasses) + "]");
 			}
-			reader.register(this.annotatedClasses);
+			reader.register(this.annotatedClasses.toArray(new Class<?>[this.annotatedClasses.size()]));
 		}
 
-		if (!ObjectUtils.isEmpty(this.basePackages)) {
+		if (!this.basePackages.isEmpty()) {
 			if (logger.isInfoEnabled()) {
 				logger.info("Scanning base packages: [" +
-						StringUtils.arrayToCommaDelimitedString(this.basePackages) + "]");
+						StringUtils.collectionToCommaDelimitedString(this.basePackages) + "]");
 			}
-			scanner.scan(this.basePackages);
+			scanner.scan(this.basePackages.toArray(new String[this.basePackages.size()]));
 		}
 
 		String[] configLocations = getConfigLocations();
@@ -250,37 +248,4 @@ protected void loadBeanDefinitions(DefaultListableBeanFactory beanFactory) {
 		}
 	}
 
-	public void setBeanNameGenerator(BeanNameGenerator beanNameGenerator) {
-		this.beanNameGenerator = beanNameGenerator;
-	}
-
-	/**
-	 * Provide a custom {@link BeanNameGenerator} for use with {@link AnnotatedBeanDefinitionReader}
-	 * and/or {@link ClassPathBeanDefinitionScanner}, if any.
-	 * <p>Default is {@link org.springframework.context.annotation.AnnotationBeanNameGenerator}.
-	 * @see AnnotatedBeanDefinitionReader#setBeanNameGenerator
-	 * @see ClassPathBeanDefinitionScanner#setBeanNameGenerator
-	 */
-	protected BeanNameGenerator getBeanNameGenerator() {
-		return this.beanNameGenerator;
-	}
-
-	/**
-	 * Set the {@link ScopeMetadataResolver} to use for detected bean classes.
-	 * <p>The default is an {@link org.springframework.context.annotation.AnnotationScopeMetadataResolver}.
-	 */
-	public void setScopeMetadataResolver(ScopeMetadataResolver scopeMetadataResolver) {
-		this.scopeMetadataResolver = scopeMetadataResolver;
-	}
-
-	/**
-	 * Provide a custom {@link ScopeMetadataResolver} for use with {@link AnnotatedBeanDefinitionReader}
-	 * and/or {@link ClassPathBeanDefinitionScanner}, if any.
-	 * <p>Default is {@link org.springframework.context.annotation.AnnotationScopeMetadataResolver}.
-	 * @see AnnotatedBeanDefinitionReader#setScopeMetadataResolver
-	 * @see ClassPathBeanDefinitionScanner#setScopeMetadataResolver
-	 */
-	protected ScopeMetadataResolver getScopeMetadataResolver() {
-		return this.scopeMetadataResolver;
-	}
 }
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
index d30d3aef84..a5dc7951ca 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java
@@ -28,7 +28,6 @@
 import org.springframework.ui.context.Theme;
 import org.springframework.ui.context.ThemeSource;
 import org.springframework.ui.context.support.UiApplicationContextUtils;
-import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.ConfigurableWebApplicationContext;
@@ -192,11 +191,9 @@ protected void onRefresh() {
 	 */
 	@Override
 	protected void initPropertySources() {
-		super.initPropertySources();
-		ConfigurableEnvironment env = this.getEnvironment();
+		ConfigurableEnvironment env = getEnvironment();
 		if (env instanceof ConfigurableWebEnvironment) {
-			((ConfigurableWebEnvironment)env).initPropertySources(
-					this.servletContext, null);
+			((ConfigurableWebEnvironment) env).initPropertySources(this.servletContext, null);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java
index c933827cff..212b9a302d 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.PropertySource;
-import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link PropertySource} that reads init parameters from a {@link ServletConfig} object.
@@ -37,8 +37,7 @@ public ServletConfigPropertySource(String name, ServletConfig servletConfig) {
 
 	@Override
 	public String[] getPropertyNames() {
-		return CollectionUtils.toArray(
-				this.source.getInitParameterNames(), EMPTY_NAMES_ARRAY);
+		return StringUtils.toStringArray(this.source.getInitParameterNames());
 	}
 
 	@Override
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java
index d5c3cdbf1c..0fb48c9e5a 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.PropertySource;
-import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link PropertySource} that reads init parameters from a {@link ServletContext} object.
@@ -37,12 +37,12 @@ public ServletContextPropertySource(String name, ServletContext servletContext)
 
 	@Override
 	public String[] getPropertyNames() {
-		return CollectionUtils.toArray(
-				this.source.getInitParameterNames(), EMPTY_NAMES_ARRAY);
+		return StringUtils.toStringArray(this.source.getInitParameterNames());
 	}
 
 	@Override
 	public String getProperty(String name) {
 		return this.source.getInitParameter(name);
 	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
index 8ce1a65392..e33a0928a7 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,8 @@
 /**
  * ServletContext-aware subclass of {@link PathMatchingResourcePatternResolver},
  * able to find matching resources below the web application root directory
- * via Servlet 2.3's {@code ServletContext.getResourcePaths}.
- * Falls back to the superclass' file system checking for other resources.
+ * via {@link ServletContext#getResourcePaths}. Falls back to the superclass'
+ * file system checking for other resources.
  *
  * @author Juergen Hoeller
  * @since 1.1.2
@@ -109,7 +109,7 @@ protected void doRetrieveMatchingServletContextResources(
 			ServletContext servletContext, String fullPattern, String dir, Set<Resource> result)
 			throws IOException {
 
-		Set candidates = servletContext.getResourcePaths(dir);
+		Set<String> candidates = servletContext.getResourcePaths(dir);
 		if (candidates != null) {
 			boolean dirDepthNotFixed = fullPattern.contains("**");
 			int jarFileSep = fullPattern.indexOf(ResourceUtils.JAR_URL_SEPARATOR);
@@ -119,8 +119,7 @@ protected void doRetrieveMatchingServletContextResources(
 				jarFilePath = fullPattern.substring(0, jarFileSep);
 				pathInJarFile = fullPattern.substring(jarFileSep + ResourceUtils.JAR_URL_SEPARATOR.length());
 			}
-			for (Object candidate : candidates) {
-				String currPath = (String) candidate;
+			for (String currPath : candidates) {
 				if (!currPath.startsWith(dir)) {
 					// Returned resource path does not start with relative directory:
 					// assuming absolute path returned -> strip absolute path.
@@ -150,11 +149,10 @@ protected void doRetrieveMatchingServletContextResources(
 	}
 
 	/**
-	 * Method extracts entries from the given jar by pattern.
+	 * Extract entries from the given jar by pattern.
 	 * @param jarFilePath the path to the jar file
 	 * @param entryPattern the pattern for jar entries to match
 	 * @param result the Set of matching Resources to add to
-	 * @throws IOException if jar contents could not be retrieved
 	 */
 	private void doRetrieveMatchingJarEntries(String jarFilePath, String entryPattern, Set<Resource> result) {
 		if (logger.isDebugEnabled()) {
@@ -162,15 +160,20 @@ private void doRetrieveMatchingJarEntries(String jarFilePath, String entryPatter
 		}
 		try {
 			JarFile jarFile = new JarFile(jarFilePath);
-			for (Enumeration<JarEntry> entries = jarFile.entries(); entries.hasMoreElements();) {
-				JarEntry entry = entries.nextElement();
-				String entryPath = entry.getName();
-				if (getPathMatcher().match(entryPattern, entryPath)) {
-					result.add(new UrlResource(ResourceUtils.URL_PROTOCOL_JAR + ":" +
-							ResourceUtils.URL_PROTOCOL_FILE + ":" + jarFilePath +
-							ResourceUtils.JAR_URL_SEPARATOR + entryPath));
+			try {
+				for (Enumeration<JarEntry> entries = jarFile.entries(); entries.hasMoreElements();) {
+					JarEntry entry = entries.nextElement();
+					String entryPath = entry.getName();
+					if (getPathMatcher().match(entryPattern, entryPath)) {
+						result.add(new UrlResource(
+								ResourceUtils.URL_PROTOCOL_JAR,
+								ResourceUtils.FILE_URL_PREFIX + jarFilePath + ResourceUtils.JAR_URL_SEPARATOR + entryPath));
+					}
 				}
 			}
+			finally {
+				jarFile.close();
+			}
 		}
 		catch (IOException ex) {
 			if (logger.isWarnEnabled()) {
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java b/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
index b929c4bbe3..e83b373bfe 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,8 +41,7 @@
  * @since 3.1
  * @see StandardEnvironment
  */
-public class StandardServletEnvironment extends StandardEnvironment
-		implements ConfigurableWebEnvironment {
+public class StandardServletEnvironment extends StandardEnvironment implements ConfigurableWebEnvironment {
 
 	/** Servlet context init parameters property source name: {@value} */
 	public static final String SERVLET_CONTEXT_PROPERTY_SOURCE_NAME = "servletContextInitParams";
@@ -68,10 +67,10 @@ public class StandardServletEnvironment extends StandardEnvironment
 	 * {@value #JNDI_PROPERTY_SOURCE_NAME}.
 	 * <p>Properties in any of the above will take precedence over system properties and
 	 * environment variables contributed by the {@link StandardEnvironment} superclass.
-	 * <p>The {@code Servlet}-related property sources are added as {@link
-	 * StubPropertySource stubs} at this stage, and will be {@linkplain
-	 * #initPropertySources(ServletContext, ServletConfig) fully initialized} once the actual
-	 * {@link ServletContext} object becomes available.
+	 * <p>The {@code Servlet}-related property sources are added as
+	 * {@link StubPropertySource stubs} at this stage, and will be
+	 * {@linkplain #initPropertySources(ServletContext, ServletConfig) fully initialized}
+	 * once the actual {@link ServletContext} object becomes available.
 	 * @see StandardEnvironment#customizePropertySources
 	 * @see org.springframework.core.env.AbstractEnvironment#customizePropertySources
 	 * @see ServletConfigPropertySource
@@ -91,8 +90,7 @@ protected void customizePropertySources(MutablePropertySources propertySources)
 	}
 
 	public void initPropertySources(ServletContext servletContext, ServletConfig servletConfig) {
-		WebApplicationContextUtils.initServletPropertySources(
-				this.getPropertySources(), servletContext, servletConfig);
+		WebApplicationContextUtils.initServletPropertySources(getPropertySources(), servletContext, servletConfig);
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java
index 5d26a434e3..14c02bd07c 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java
@@ -177,9 +177,8 @@ protected void onRefresh() {
 
 	@Override
 	protected void initPropertySources() {
-		super.initPropertySources();
-		WebApplicationContextUtils.initServletPropertySources(
-				this.getEnvironment().getPropertySources(), this.servletContext, this.servletConfig);
+		WebApplicationContextUtils.initServletPropertySources(getEnvironment().getPropertySources(),
+				this.servletContext, this.servletConfig);
 	}
 
 	public Theme getTheme(String themeName) {
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java
index 9091e337a4..fdc7fbf7d8 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,11 @@
 
 package org.springframework.web.context.support;
 
-import static org.springframework.web.context.support.StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME;
-import static org.springframework.web.context.support.StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME;
-
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.servlet.ServletConfig;
@@ -49,13 +45,12 @@
 import org.springframework.web.context.request.WebRequest;
 
 /**
- * Convenience methods for retrieving the root
- * {@link org.springframework.web.context.WebApplicationContext} for a given
- * {@code ServletContext}. This is e.g. useful for accessing a Spring
- * context from within custom web views or Struts actions.
+ * Convenience methods for retrieving the root {@link WebApplicationContext} for
+ * a given {@link ServletContext}. This is useful for programmatically accessing
+ * a Spring application context from within custom web views or MVC actions.
  *
  * <p>Note that there are more convenient ways of accessing the root context for
- * many web frameworks, either part of Spring or available as external library.
+ * many web frameworks, either part of Spring or available as an external library.
  * This helper class is just the most generic way to access the root context.
  *
  * @author Juergen Hoeller
@@ -63,7 +58,6 @@
  * @see org.springframework.web.servlet.FrameworkServlet
  * @see org.springframework.web.servlet.DispatcherServlet
  * @see org.springframework.web.jsf.FacesContextUtils
- * @see org.springframework.web.jsf.SpringBeanVariableResolver
  * @see org.springframework.web.jsf.el.SpringBeanFacesELResolver
  */
 public abstract class WebApplicationContextUtils {
@@ -73,8 +67,8 @@ public abstract class WebApplicationContextUtils {
 
 
 	/**
-	 * Find the root WebApplicationContext for this web application, which is
-	 * typically loaded via {@link org.springframework.web.context.ContextLoaderListener}.
+	 * Find the root {@link WebApplicationContext} for this web app, typically
+	 * loaded via {@link org.springframework.web.context.ContextLoaderListener}.
 	 * <p>Will rethrow an exception that happened on root context startup,
 	 * to differentiate between a failed context startup and no context at all.
 	 * @param sc ServletContext to find the web application context for
@@ -82,9 +76,7 @@ public abstract class WebApplicationContextUtils {
 	 * @throws IllegalStateException if the root WebApplicationContext could not be found
 	 * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
 	 */
-	public static WebApplicationContext getRequiredWebApplicationContext(ServletContext sc)
-			throws IllegalStateException {
-
+	public static WebApplicationContext getRequiredWebApplicationContext(ServletContext sc) throws IllegalStateException {
 		WebApplicationContext wac = getWebApplicationContext(sc);
 		if (wac == null) {
 			throw new IllegalStateException("No WebApplicationContext found: no ContextLoaderListener registered?");
@@ -93,8 +85,8 @@ public static WebApplicationContext getRequiredWebApplicationContext(ServletCont
 	}
 
 	/**
-	 * Find the root WebApplicationContext for this web application, which is
-	 * typically loaded via {@link org.springframework.web.context.ContextLoaderListener}.
+	 * Find the root {@link WebApplicationContext} for this web app, typically
+	 * loaded via {@link org.springframework.web.context.ContextLoaderListener}.
 	 * <p>Will rethrow an exception that happened on root context startup,
 	 * to differentiate between a failed context startup and no context at all.
 	 * @param sc ServletContext to find the web application context for
@@ -106,7 +98,7 @@ public static WebApplicationContext getWebApplicationContext(ServletContext sc)
 	}
 
 	/**
-	 * Find a custom WebApplicationContext for this web application.
+	 * Find a custom {@link WebApplicationContext} for this web app.
 	 * @param sc ServletContext to find the web application context for
 	 * @param attrName the name of the ServletContext attribute to look for
 	 * @return the desired WebApplicationContext for this web app, or {@code null} if none
@@ -181,34 +173,34 @@ public static void registerEnvironmentBeans(ConfigurableListableBeanFactory bf,
 	 * Register web-specific environment beans ("contextParameters", "contextAttributes")
 	 * with the given BeanFactory, as used by the WebApplicationContext.
 	 * @param bf the BeanFactory to configure
-	 * @param sc the ServletContext that we're running within
-	 * @param config the ServletConfig of the containing Portlet
+	 * @param servletContext the ServletContext that we're running within
+	 * @param servletConfig the ServletConfig of the containing Portlet
 	 */
 	public static void registerEnvironmentBeans(
-			ConfigurableListableBeanFactory bf, ServletContext sc, ServletConfig config) {
+			ConfigurableListableBeanFactory bf, ServletContext servletContext, ServletConfig servletConfig) {
 
-		if (sc != null && !bf.containsBean(WebApplicationContext.SERVLET_CONTEXT_BEAN_NAME)) {
-			bf.registerSingleton(WebApplicationContext.SERVLET_CONTEXT_BEAN_NAME, sc);
+		if (servletContext != null && !bf.containsBean(WebApplicationContext.SERVLET_CONTEXT_BEAN_NAME)) {
+			bf.registerSingleton(WebApplicationContext.SERVLET_CONTEXT_BEAN_NAME, servletContext);
 		}
 
-		if (config != null && !bf.containsBean(ConfigurableWebApplicationContext.SERVLET_CONFIG_BEAN_NAME)) {
-			bf.registerSingleton(ConfigurableWebApplicationContext.SERVLET_CONFIG_BEAN_NAME, config);
+		if (servletConfig != null && !bf.containsBean(ConfigurableWebApplicationContext.SERVLET_CONFIG_BEAN_NAME)) {
+			bf.registerSingleton(ConfigurableWebApplicationContext.SERVLET_CONFIG_BEAN_NAME, servletConfig);
 		}
 
 		if (!bf.containsBean(WebApplicationContext.CONTEXT_PARAMETERS_BEAN_NAME)) {
 			Map<String, String> parameterMap = new HashMap<String, String>();
-			if (sc != null) {
-				Enumeration<?> paramNameEnum = sc.getInitParameterNames();
+			if (servletContext != null) {
+				Enumeration<?> paramNameEnum = servletContext.getInitParameterNames();
 				while (paramNameEnum.hasMoreElements()) {
 					String paramName = (String) paramNameEnum.nextElement();
-					parameterMap.put(paramName, sc.getInitParameter(paramName));
+					parameterMap.put(paramName, servletContext.getInitParameter(paramName));
 				}
 			}
-			if (config != null) {
-				Enumeration<?> paramNameEnum = config.getInitParameterNames();
+			if (servletConfig != null) {
+				Enumeration<?> paramNameEnum = servletConfig.getInitParameterNames();
 				while (paramNameEnum.hasMoreElements()) {
 					String paramName = (String) paramNameEnum.nextElement();
-					parameterMap.put(paramName, config.getInitParameter(paramName));
+					parameterMap.put(paramName, servletConfig.getInitParameter(paramName));
 				}
 			}
 			bf.registerSingleton(WebApplicationContext.CONTEXT_PARAMETERS_BEAN_NAME,
@@ -217,11 +209,11 @@ public static void registerEnvironmentBeans(
 
 		if (!bf.containsBean(WebApplicationContext.CONTEXT_ATTRIBUTES_BEAN_NAME)) {
 			Map<String, Object> attributeMap = new HashMap<String, Object>();
-			if (sc != null) {
-				Enumeration<?> attrNameEnum = sc.getAttributeNames();
+			if (servletContext != null) {
+				Enumeration<?> attrNameEnum = servletContext.getAttributeNames();
 				while (attrNameEnum.hasMoreElements()) {
 					String attrName = (String) attrNameEnum.nextElement();
-					attributeMap.put(attrName, sc.getAttribute(attrName));
+					attributeMap.put(attrName, servletContext.getAttribute(attrName));
 				}
 			}
 			bf.registerSingleton(WebApplicationContext.CONTEXT_ATTRIBUTES_BEAN_NAME,
@@ -235,8 +227,7 @@ public static void registerEnvironmentBeans(
 	 * {@link ServletConfig} parameter.
 	 * @see #initServletPropertySources(MutablePropertySources, ServletContext, ServletConfig)
 	 */
-	public static void initServletPropertySources(
-			MutablePropertySources propertySources, ServletContext servletContext) {
+	public static void initServletPropertySources(MutablePropertySources propertySources, ServletContext servletContext) {
 		initServletPropertySources(propertySources, servletContext, null);
 	}
 
@@ -260,16 +251,17 @@ public static void initServletPropertySources(
 	 */
 	public static void initServletPropertySources(
 			MutablePropertySources propertySources, ServletContext servletContext, ServletConfig servletConfig) {
+
 		Assert.notNull(propertySources, "propertySources must not be null");
-		if(servletContext != null &&
-				propertySources.contains(SERVLET_CONTEXT_PROPERTY_SOURCE_NAME) &&
-				propertySources.get(SERVLET_CONTEXT_PROPERTY_SOURCE_NAME) instanceof StubPropertySource) {
-			propertySources.replace(SERVLET_CONTEXT_PROPERTY_SOURCE_NAME, new ServletContextPropertySource(SERVLET_CONTEXT_PROPERTY_SOURCE_NAME, servletContext));
+		if (servletContext != null && propertySources.contains(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME) &&
+				propertySources.get(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME) instanceof StubPropertySource) {
+			propertySources.replace(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME,
+					new ServletContextPropertySource(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME, servletContext));
 		}
-		if(servletConfig != null &&
-				propertySources.contains(SERVLET_CONFIG_PROPERTY_SOURCE_NAME) &&
-				propertySources.get(SERVLET_CONFIG_PROPERTY_SOURCE_NAME) instanceof StubPropertySource) {
-			propertySources.replace(SERVLET_CONFIG_PROPERTY_SOURCE_NAME, new ServletConfigPropertySource(SERVLET_CONFIG_PROPERTY_SOURCE_NAME, servletConfig));
+		if (servletConfig != null && propertySources.contains(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME) &&
+				propertySources.get(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME) instanceof StubPropertySource) {
+			propertySources.replace(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME,
+					new ServletConfigPropertySource(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME, servletConfig));
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java
index 9aa2547d62..a5c7383bcf 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,16 +26,19 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * Convenient superclass for application objects running in a WebApplicationContext.
- * Provides {@code getWebApplicationContext()}, {@code getServletContext()},
- * and {@code getTempDir()} methods.
+ * Convenient superclass for application objects running in a {@link WebApplicationContext}.
+ * Provides {@code getWebApplicationContext()}, {@code getServletContext()}, and
+ * {@code getTempDir()} accessors.
+ *
+ * <p>Note: It is generally recommended to use individual callback interfaces for the actual
+ * callbacks needed. This broad base class is primarily intended for use within the framework,
+ * in case of {@link ServletContext} access etc typically being needed.
  *
  * @author Juergen Hoeller
  * @since 28.08.2003
  * @see SpringBeanAutowiringSupport
  */
-public abstract class WebApplicationObjectSupport extends ApplicationObjectSupport
-		implements ServletContextAware {
+public abstract class WebApplicationObjectSupport extends ApplicationObjectSupport implements ServletContextAware {
 
 	private ServletContext servletContext;
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java
index 84d4b38f3c..faa9475676 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/XmlWebApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ protected void loadBeanDefinitions(DefaultListableBeanFactory beanFactory) throw
 
 		// Configure the bean definition reader with this context's
 		// resource loading environment.
-		beanDefinitionReader.setEnvironment(this.getEnvironment());
+		beanDefinitionReader.setEnvironment(getEnvironment());
 		beanDefinitionReader.setResourceLoader(this);
 		beanDefinitionReader.setEntityResolver(new ResourceEntityResolver(this));
 
diff --git a/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
index 03c15891d7..211e197415 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
-
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
@@ -35,16 +34,19 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * Base class for {@code Filter}s that perform logging operations before and after a request is processed.
+ * Base class for {@code Filter}s that perform logging operations before and after a request
+ * is processed.
  *
  * <p>Subclasses should override the {@code beforeRequest(HttpServletRequest, String)} and
- * {@code afterRequest(HttpServletRequest, String)} methods to perform the actual logging around the request.
+ * {@code afterRequest(HttpServletRequest, String)} methods to perform the actual logging
+ * around the request.
  *
  * <p>Subclasses are passed the message to write to the log in the {@code beforeRequest} and
- * {@code afterRequest} methods. By default, only the URI of the request is logged. However, setting the
- * {@code includeQueryString} property to {@code true} will cause the query string of the request to be
- * included also. The payload (body) of the request can be logged via the {@code includePayload} flag. Note that
- * this will only log that which is read, which might not be the entire payload.
+ * {@code afterRequest} methods. By default, only the URI of the request is logged. However,
+ * setting the {@code includeQueryString} property to {@code true} will cause the query string
+ * of the request to be included also. The payload (body) of the request can be logged via the
+ * {@code includePayload} flag. Note that this will only log that which is read, which might
+ * not be the entire payload.
  *
  * <p>Prefixes and suffixes for the before and after messages can be configured using the
  * {@code beforeMessagePrefix}, {@code afterMessagePrefix}, {@code beforeMessageSuffix} and
@@ -53,9 +55,9 @@
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @author Rossen Stoyanchev
+ * @since 1.2.5
  * @see #beforeRequest
  * @see #afterRequest
- * @since 1.2.5
  */
 public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter {
 
@@ -69,6 +71,7 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
 
 	private static final int DEFAULT_MAX_PAYLOAD_LENGTH = 50;
 
+
 	private boolean includeQueryString = false;
 
 	private boolean includeClientInfo = false;
@@ -85,42 +88,45 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
 
 	private String afterMessageSuffix = DEFAULT_AFTER_MESSAGE_SUFFIX;
 
+
 	/**
-	 * Set whether or not the query string should be included in the log message. <p>Should be configured using an
-	 * {@code &lt;init-param&gt;} for parameter name "includeQueryString" in the filter definition in
-	 * {@code web.xml}.
+	 * Set whether the query string should be included in the log message.
+	 * <p>Should be configured using an {@code <init-param>} for parameter name
+	 * "includeQueryString" in the filter definition in {@code web.xml}.
 	 */
 	public void setIncludeQueryString(boolean includeQueryString) {
 		this.includeQueryString = includeQueryString;
 	}
 
 	/**
-	 * Return whether or not the query string should be included in the log message.
+	 * Return whether the query string should be included in the log message.
 	 */
 	protected boolean isIncludeQueryString() {
 		return this.includeQueryString;
 	}
 
 	/**
-	 * Set whether or not the client address and session id should be included in the log message. <p>Should be configured
-	 * using an {@code &lt;init-param&gt;} for parameter name "includeClientInfo" in the filter definition in
-	 * {@code web.xml}.
+	 * Set whether the client address and session id should be included in the
+	 * log message.
+	 * <p>Should be configured using an {@code <init-param>} for parameter name
+	 * "includeClientInfo" in the filter definition in {@code web.xml}.
 	 */
 	public void setIncludeClientInfo(boolean includeClientInfo) {
 		this.includeClientInfo = includeClientInfo;
 	}
 
 	/**
-	 * Return whether or not the client address and session id should be included in the log message.
+	 * Return whether the client address and session id should be included in the
+	 * log message.
 	 */
 	protected boolean isIncludeClientInfo() {
 		return this.includeClientInfo;
 	}
 
 	/**
-	 * Set whether or not the request payload (body) should be included in the log message. <p>Should be configured using
-	 * an {@code &lt;init-param&gt;} for parameter name "includePayload" in the filter definition in
-	 * {@code web.xml}.
+	 * Set whether the request payload (body) should be included in the log message.
+	 * <p>Should be configured using an {@code <init-param>} for parameter name
+	 * "includePayload" in the filter definition in {@code web.xml}.
 	 */
 
 	public void setIncludePayload(boolean includePayload) {
@@ -128,14 +134,15 @@ public void setIncludePayload(boolean includePayload) {
 	}
 
 	/**
-	 * Return whether or not the request payload (body) should be included in the log message.
+	 * Return whether the request payload (body) should be included in the log message.
 	 */
 	protected boolean isIncludePayload() {
-		return includePayload;
+		return this.includePayload;
 	}
 
 	/**
-	 * Sets the maximum length of the payload body to be included in the log message. Default is 50 characters.
+	 * Sets the maximum length of the payload body to be included in the log message.
+	 * Default is 50 characters.
 	 */
 	public void setMaxPayloadLength(int maxPayloadLength) {
 		Assert.isTrue(maxPayloadLength >= 0, "'maxPayloadLength' should be larger than or equal to 0");
@@ -146,37 +153,42 @@ public void setMaxPayloadLength(int maxPayloadLength) {
 	 * Return the maximum length of the payload body to be included in the log message.
 	 */
 	protected int getMaxPayloadLength() {
-		return maxPayloadLength;
+		return this.maxPayloadLength;
 	}
 
 	/**
-	 * Set the value that should be prepended to the log message written <i>before</i> a request is processed.
+	 * Set the value that should be prepended to the log message written
+	 * <i>before</i> a request is processed.
 	 */
 	public void setBeforeMessagePrefix(String beforeMessagePrefix) {
 		this.beforeMessagePrefix = beforeMessagePrefix;
 	}
 
 	/**
-	 * Set the value that should be apppended to the log message written <i>before</i> a request is processed.
+	 * Set the value that should be appended to the log message written
+	 * <i>before</i> a request is processed.
 	 */
 	public void setBeforeMessageSuffix(String beforeMessageSuffix) {
 		this.beforeMessageSuffix = beforeMessageSuffix;
 	}
 
 	/**
-	 * Set the value that should be prepended to the log message written <i>after</i> a request is processed.
+	 * Set the value that should be prepended to the log message written
+	 * <i>after</i> a request is processed.
 	 */
 	public void setAfterMessagePrefix(String afterMessagePrefix) {
 		this.afterMessagePrefix = afterMessagePrefix;
 	}
 
 	/**
-	 * Set the value that should be appended to the log message written <i>after</i> a request is processed.
+	 * Set the value that should be appended to the log message written
+	 * <i>after</i> a request is processed.
 	 */
 	public void setAfterMessageSuffix(String afterMessageSuffix) {
 		this.afterMessageSuffix = afterMessageSuffix;
 	}
 
+
 	/**
 	 * The default value is "false" so that the filter may log a "before" message
 	 * at the start of request processing and an "after" message at the end from
@@ -188,9 +200,8 @@ protected boolean shouldNotFilterAsyncDispatch() {
 	}
 
 	/**
-	 * Forwards the request to the next filter in the chain and delegates down to the subclasses to perform the actual
-	 * request logging both before and after the request is processed.
-	 *
+	 * Forwards the request to the next filter in the chain and delegates down to the subclasses
+	 * to perform the actual request logging both before and after the request is processed.
 	 * @see #beforeRequest
 	 * @see #afterRequest
 	 */
@@ -199,29 +210,27 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 			throws ServletException, IOException {
 
 		boolean isFirstRequest = !isAsyncDispatch(request);
+		HttpServletRequest requestToUse = request;
 
-		if (isIncludePayload()) {
-			if (isFirstRequest) {
-				request = new RequestCachingRequestWrapper(request);
-			}
+		if (isIncludePayload() && isFirstRequest) {
+			requestToUse = new RequestCachingRequestWrapper(request);
 		}
 
 		if (isFirstRequest) {
-			beforeRequest(request, getBeforeMessage(request));
+			beforeRequest(requestToUse, getBeforeMessage(requestToUse));
 		}
 		try {
-			filterChain.doFilter(request, response);
+			filterChain.doFilter(requestToUse, response);
 		}
 		finally {
-			if (!isAsyncStarted(request)) {
-				afterRequest(request, getAfterMessage(request));
+			if (!isAsyncStarted(requestToUse)) {
+				afterRequest(requestToUse, getAfterMessage(requestToUse));
 			}
 		}
 	}
 
 	/**
 	 * Get the message to write to the log before the request.
-	 *
 	 * @see #createMessage
 	 */
 	private String getBeforeMessage(HttpServletRequest request) {
@@ -230,7 +239,6 @@ private String getBeforeMessage(HttpServletRequest request) {
 
 	/**
 	 * Get the message to write to the log after the request.
-	 *
 	 * @see #createMessage
 	 */
 	private String getAfterMessage(HttpServletRequest request) {
@@ -238,17 +246,22 @@ private String getAfterMessage(HttpServletRequest request) {
 	}
 
 	/**
-	 * Create a log message for the given request, prefix and suffix. <p>If {@code includeQueryString} is
-	 * {@code true} then the inner part of the log message will take the form {@code request_uri?query_string}
-	 * otherwise the message will simply be of the form {@code request_uri}. <p>The final message is composed of the
-	 * inner part as described and the supplied prefix and suffix.
+	 * Create a log message for the given request, prefix and suffix.
+	 * <p>If {@code includeQueryString} is {@code true}, then the inner part
+	 * of the log message will take the form {@code request_uri?query_string};
+	 * otherwise the message will simply be of the form {@code request_uri}.
+	 * <p>The final message is composed of the inner part as described and
+	 * the supplied prefix and suffix.
 	 */
 	protected String createMessage(HttpServletRequest request, String prefix, String suffix) {
 		StringBuilder msg = new StringBuilder();
 		msg.append(prefix);
 		msg.append("uri=").append(request.getRequestURI());
 		if (isIncludeQueryString()) {
-			msg.append('?').append(request.getQueryString());
+			String queryString = request.getQueryString();
+			if (queryString != null) {
+				msg.append('?').append(queryString);
+			}
 		}
 		if (isIncludeClientInfo()) {
 			String client = request.getRemoteAddr();
@@ -266,7 +279,7 @@ protected String createMessage(HttpServletRequest request, String prefix, String
 		}
 		if (isIncludePayload() && request instanceof RequestCachingRequestWrapper) {
 			RequestCachingRequestWrapper wrapper = (RequestCachingRequestWrapper) request;
-			byte[] buf = wrapper.toByteArray();
+			byte[] buf = wrapper.getContentAsByteArray();
 			if (buf.length > 0) {
 				int length = Math.min(buf.length, getMaxPayloadLength());
 				String payload;
@@ -278,23 +291,23 @@ protected String createMessage(HttpServletRequest request, String prefix, String
 				}
 				msg.append(";payload=").append(payload);
 			}
-
 		}
 		msg.append(suffix);
 		return msg.toString();
 	}
 
+
 	/**
-	 * Concrete subclasses should implement this method to write a log message <i>before</i> the request is processed.
-	 *
+	 * Concrete subclasses should implement this method to write a log message
+	 * <i>before</i> the request is processed.
 	 * @param request current HTTP request
 	 * @param message the message to log
 	 */
 	protected abstract void beforeRequest(HttpServletRequest request, String message);
 
 	/**
-	 * Concrete subclasses should implement this method to write a log message <i>after</i> the request is processed.
-	 *
+	 * Concrete subclasses should implement this method to write a log message
+	 * <i>after</i> the request is processed.
 	 * @param request current HTTP request
 	 * @param message the message to log
 	 */
@@ -303,59 +316,58 @@ protected String createMessage(HttpServletRequest request, String prefix, String
 
 	private static class RequestCachingRequestWrapper extends HttpServletRequestWrapper {
 
-		private final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		private final ByteArrayOutputStream cachedContent = new ByteArrayOutputStream(1024);
 
 		private final ServletInputStream inputStream;
 
 		private BufferedReader reader;
 
-		private RequestCachingRequestWrapper(HttpServletRequest request) throws IOException {
+		public RequestCachingRequestWrapper(HttpServletRequest request) throws IOException {
 			super(request);
 			this.inputStream = new RequestCachingInputStream(request.getInputStream());
 		}
 
 		@Override
 		public ServletInputStream getInputStream() throws IOException {
-			return inputStream;
+			return this.inputStream;
 		}
 
 		@Override
 		public String getCharacterEncoding() {
-			return super.getCharacterEncoding() != null ? super.getCharacterEncoding() :
-					WebUtils.DEFAULT_CHARACTER_ENCODING;
+			String enc = super.getCharacterEncoding();
+			return (enc != null ? enc : WebUtils.DEFAULT_CHARACTER_ENCODING);
 		}
 
 		@Override
 		public BufferedReader getReader() throws IOException {
 			if (this.reader == null) {
-				this.reader = new BufferedReader(new InputStreamReader(inputStream, getCharacterEncoding()));
+				this.reader = new BufferedReader(new InputStreamReader(this.inputStream, getCharacterEncoding()));
 			}
 			return this.reader;
 		}
 
-		private byte[] toByteArray() {
-			return this.bos.toByteArray();
+		private byte[] getContentAsByteArray() {
+			return this.cachedContent.toByteArray();
 		}
 
+
 		private class RequestCachingInputStream extends ServletInputStream {
 
 			private final ServletInputStream is;
 
-			private RequestCachingInputStream(ServletInputStream is) {
+			public RequestCachingInputStream(ServletInputStream is) {
 				this.is = is;
 			}
 
 			@Override
 			public int read() throws IOException {
-				int ch = is.read();
+				int ch = this.is.read();
 				if (ch != -1) {
-					bos.write(ch);
+					cachedContent.write(ch);
 				}
 				return ch;
 			}
-
 		}
-
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java
index 191a510fbf..e870f526e8 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/CommonsRequestLoggingFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,9 +38,7 @@ public class CommonsRequestLoggingFilter extends AbstractRequestLoggingFilter {
 	 */
 	@Override
 	protected void beforeRequest(HttpServletRequest request, String message) {
-		if (logger.isDebugEnabled()) {
-			logger.debug(message);
-		}
+		logger.debug(message);
 	}
 
 	/**
@@ -48,9 +46,7 @@ protected void beforeRequest(HttpServletRequest request, String message) {
 	 */
 	@Override
 	protected void afterRequest(HttpServletRequest request, String message) {
-		if (logger.isDebugEnabled()) {
-			logger.debug(message);
-		}
+		logger.debug(message);
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java
index a3551ff767..5b31e7db68 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -28,81 +27,87 @@
 import javax.servlet.ServletResponse;
 
 /**
- * A generic composite servlet {@link Filter} that just delegates its behaviour to a chain (list) of user supplied
- * filters, achieving the functionality of a {@link FilterChain}, but conveniently using only {@link Filter} instances.
- * This is useful for filters that require dependency injection, and can therefore be set up in a Spring application
- * context. Typically this composite would be used in conjunction with {@link DelegatingFilterProxy}, so that it can be
- * declared in Spring but applied to a servlet context.
+ * A generic composite servlet {@link Filter} that just delegates its behavior
+ * to a chain (list) of user-supplied filters, achieving the functionality of a
+ * {@link FilterChain}, but conveniently using only {@link Filter} instances.
  *
- * @since 3.1
+ * <p>This is useful for filters that require dependency injection, and can
+ * therefore be set up in a Spring application context. Typically, this
+ * composite would be used in conjunction with {@link DelegatingFilterProxy},
+ * so that it can be declared in Spring but applied to a servlet context.
  *
  * @author Dave Syer
- *
+ * @since 3.1
  */
 public class CompositeFilter implements Filter {
 
 	private List<? extends Filter> filters = new ArrayList<Filter>();
 
+
 	public void setFilters(List<? extends Filter> filters) {
 		this.filters = new ArrayList<Filter>(filters);
 	}
 
-	/**
-	 * Clean up all the filters supplied, calling each one's destroy method in turn, but in reverse order.
-	 *
-	 * @see Filter#init(FilterConfig)
-	 */
-	public void destroy() {
-		for (int i = filters.size(); i-- > 0;) {
-			Filter filter = filters.get(i);
-			filter.destroy();
-		}
-	}
 
 	/**
 	 * Initialize all the filters, calling each one's init method in turn in the order supplied.
-	 *
 	 * @see Filter#init(FilterConfig)
 	 */
 	public void init(FilterConfig config) throws ServletException {
-		for (Filter filter : filters) {
+		for (Filter filter : this.filters) {
 			filter.init(config);
 		}
 	}
 
 	/**
-	 * Forms a temporary chain from the list of delegate filters supplied ({@link #setFilters(List)}) and executes them
-	 * in order. Each filter delegates to the next one in the list, achieving the normal behaviour of a
-	 * {@link FilterChain}, despite the fact that this is a {@link Filter}.
-	 *
+	 * Forms a temporary chain from the list of delegate filters supplied ({@link #setFilters})
+	 * and executes them in order. Each filter delegates to the next one in the list, achieving
+	 * the normal behavior of a {@link FilterChain}, despite the fact that this is a {@link Filter}.
 	 * @see Filter#doFilter(ServletRequest, ServletResponse, FilterChain)
 	 */
-	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
-			ServletException {
-		new VirtualFilterChain(chain, filters).doFilter(request, response);
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+			throws IOException, ServletException {
+
+		new VirtualFilterChain(chain, this.filters).doFilter(request, response);
+	}
+
+	/**
+	 * Clean up all the filters supplied, calling each one's destroy method in turn, but in reverse order.
+	 * @see Filter#init(FilterConfig)
+	 */
+	public void destroy() {
+		for (int i = this.filters.size(); i-- > 0;) {
+			Filter filter = this.filters.get(i);
+			filter.destroy();
+		}
 	}
 
+
 	private static class VirtualFilterChain implements FilterChain {
+
 		private final FilterChain originalChain;
+
 		private final List<? extends Filter> additionalFilters;
+
 		private int currentPosition = 0;
 
-		private VirtualFilterChain(FilterChain chain, List<? extends Filter> additionalFilters) {
+		public VirtualFilterChain(FilterChain chain, List<? extends Filter> additionalFilters) {
 			this.originalChain = chain;
 			this.additionalFilters = additionalFilters;
 		}
 
-		public void doFilter(final ServletRequest request, final ServletResponse response) throws IOException,
-				ServletException {
-			if (currentPosition == additionalFilters.size()) {
-				originalChain.doFilter(request, response);
-			} else {
-				currentPosition++;
-				Filter nextFilter = additionalFilters.get(currentPosition - 1);
+		public void doFilter(final ServletRequest request, final ServletResponse response)
+				throws IOException, ServletException {
+
+			if (this.currentPosition == this.additionalFilters.size()) {
+				this.originalChain.doFilter(request, response);
+			}
+			else {
+				this.currentPosition++;
+				Filter nextFilter = this.additionalFilters.get(this.currentPosition - 1);
 				nextFilter.doFilter(request, response, this);
 			}
 		}
-
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java b/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
index dcebb69937..3f484eb4a5 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,7 +88,7 @@ public class DelegatingFilterProxy extends GenericFilterBean {
 
 	private boolean targetFilterLifecycle = false;
 
-	private Filter delegate;
+	private volatile Filter delegate;
 
 	private final Object delegateMonitor = new Object();
 
@@ -227,7 +227,6 @@ protected void initFilterBean() throws ServletException {
 				if (this.targetBeanName == null) {
 					this.targetBeanName = getFilterName();
 				}
-
 				// Fetch Spring root application context and initialize the delegate early,
 				// if possible. If the root application context will be started after this
 				// filter proxy, we'll have to resort to lazy initialization.
@@ -243,16 +242,18 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 			throws ServletException, IOException {
 
 		// Lazily initialize the delegate if necessary.
-		Filter delegateToUse = null;
-		synchronized (this.delegateMonitor) {
-			if (this.delegate == null) {
-				WebApplicationContext wac = findWebApplicationContext();
-				if (wac == null) {
-					throw new IllegalStateException("No WebApplicationContext found: no ContextLoaderListener registered?");
+		Filter delegateToUse = this.delegate;
+		if (delegateToUse == null) {
+			synchronized (this.delegateMonitor) {
+				if (this.delegate == null) {
+					WebApplicationContext wac = findWebApplicationContext();
+					if (wac == null) {
+						throw new IllegalStateException("No WebApplicationContext found: no ContextLoaderListener registered?");
+					}
+					this.delegate = initDelegate(wac);
 				}
-				this.delegate = initDelegate(wac);
+				delegateToUse = this.delegate;
 			}
-			delegateToUse = this.delegate;
 		}
 
 		// Let the delegate perform the actual doFilter operation.
@@ -261,10 +262,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 
 	@Override
 	public void destroy() {
-		Filter delegateToUse = null;
-		synchronized (this.delegateMonitor) {
-			delegateToUse = this.delegate;
-		}
+		Filter delegateToUse = this.delegate;
 		if (delegateToUse != null) {
 			destroyDelegate(delegateToUse);
 		}
@@ -281,8 +279,7 @@ public void destroy() {
 	 * {@code ServletContext} before this filter gets initialized (or invoked).
 	 * <p>Subclasses may override this method to provide a different
 	 * {@code WebApplicationContext} retrieval strategy.
-	 * @return the {@code WebApplicationContext} for this proxy, or {@code null} if not
-	 * found
+	 * @return the {@code WebApplicationContext} for this proxy, or {@code null} if not found
 	 * @see #DelegatingFilterProxy(String, WebApplicationContext)
 	 * @see #getContextAttribute()
 	 * @see WebApplicationContextUtils#getWebApplicationContext(javax.servlet.ServletContext)
diff --git a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
index d422184207..39fbea5073 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.web.filter;
 
 import java.io.IOException;
-
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
@@ -35,25 +34,25 @@
  * method with HttpServletRequest and HttpServletResponse arguments.
  *
  * <p>As of Servlet 3.0, a filter may be invoked as part of a
- * {@link javax.servlet.DispatcherType.REQUEST REQUEST} or
- * {@link javax.servlet.DispatcherType.ASYNC ASYNC} dispatches that occur in
+ * {@link javax.servlet.DispatcherType#REQUEST REQUEST} or
+ * {@link javax.servlet.DispatcherType#ASYNC ASYNC} dispatches that occur in
  * separate threads. A filter can be configured in {@code web.xml} whether it
  * should be involved in async dispatches. However, in some cases servlet
  * containers assume different default configuration. Therefore sub-classes can
  * override the method {@link #shouldNotFilterAsyncDispatch()} to declare
- * statically if they shouuld indeed be invoked, <em>once</em>, during both types
+ * statically if they should indeed be invoked, <em>once</em>, during both types
  * of dispatches in order to provide thread initialization, logging, security,
  * and so on. This mechanism complements and does not replace the need to
  * configure a filter in {@code web.xml} with dispatcher types.
  *
- * <p>Sub-classes may use {@link #isAsyncDispatch(HttpServletRequest)} to
- * determine when a filter is invoked as part of an async dispatch, and
- * use {@link #isAsyncStarted(HttpServletRequest)} to determine when the
- * request has been placed in async mode and therefore the current dispatch
- * won't be the last one.
+ * <p>Subclasses may use {@link #isAsyncDispatch(HttpServletRequest)} to
+ * determine when a filter is invoked as part of an async dispatch, and use
+ * {@link #isAsyncStarted(HttpServletRequest)} to determine when the request
+ * has been placed in async mode and therefore the current dispatch won't be
+ * the last one for the given request.
  *
  * <p>Yet another dispatch type that also occurs in its own thread is
- * {@link javax.servlet.DispatcherType.ERROR ERROR}. Sub-classes can override
+ * {@link javax.servlet.DispatcherType#ERROR ERROR}. Subclasses can override
  * {@link #shouldNotFilterErrorDispatch()} if they wish to declare statically
  * if they should be invoked <em>once</em> during error dispatches.
  *
@@ -128,7 +127,6 @@ private boolean skipDispatch(HttpServletRequest request) {
 	 * in Servlet 3.0 means a filter can be invoked in more than one thread over
 	 * the course of a single request. This method returns {@code true} if the
 	 * filter is currently executing within an asynchronous dispatch.
-	 *
 	 * @param request the current request
 	 * @see WebAsyncManager#hasConcurrentResult()
 	 */
@@ -139,7 +137,6 @@ protected boolean isAsyncDispatch(HttpServletRequest request) {
 	/**
 	 * Whether request processing is in asynchronous mode meaning that the
 	 * response will not be committed after the current thread is exited.
-	 *
 	 * @param request the current request
 	 * @see WebAsyncManager#isConcurrentHandlingStarted()
 	 */
@@ -150,7 +147,7 @@ protected boolean isAsyncStarted(HttpServletRequest request) {
 	/**
 	 * Return the name of the request attribute that identifies that a request
 	 * is already filtered.
-	 * <p>Default implementation takes the configured name of the concrete filter
+	 * <p>The default implementation takes the configured name of the concrete filter
 	 * instance and appends ".FILTERED". If the filter is not fully initialized,
 	 * it falls back to its class name.
 	 * @see #getFilterName
@@ -187,7 +184,6 @@ protected boolean shouldNotFilter(HttpServletRequest request) throws ServletExce
 	 * types via {@code web.xml} or in Java through the {@code ServletContext},
 	 * servlet containers may enforce different defaults with regards to
 	 * dispatcher types. This flag enforces the design intent of the filter.
-	 *
 	 * <p>The default return value is "true", which means the filter will not be
 	 * invoked during subsequent async dispatches. If "false", the filter will
 	 * be invoked during async dispatches with the same guarantees of being
diff --git a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
index 700e524a9f..4ec3870167 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
-
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
@@ -31,16 +30,18 @@
 
 import org.springframework.util.Assert;
 import org.springframework.util.DigestUtils;
-import org.springframework.util.FileCopyUtils;
+import org.springframework.util.StreamUtils;
 import org.springframework.web.util.WebUtils;
 
 /**
- * {@link javax.servlet.Filter} that generates an {@code ETag} value based on the content on the response.
- * This ETag is compared to the {@code If-None-Match} header of the request. If these headers are equal,
- * the response content is not sent, but rather a {@code 304 "Not Modified"} status instead.
+ * {@link javax.servlet.Filter} that generates an {@code ETag} value based on the
+ * content on the response. This ETag is compared to the {@code If-None-Match}
+ * header of the request. If these headers are equal, the response content is
+ * not sent, but rather a {@code 304 "Not Modified"} status instead.
  *
- * <p>Since the ETag is based on the response content, the response (or {@link org.springframework.web.servlet.View})
- * is still rendered. As such, this filter only saves bandwidth, not server performance.
+ * <p>Since the ETag is based on the response content, the response
+ * (e.g. a {@link org.springframework.web.servlet.View}) is still rendered.
+ * As such, this filter only saves bandwidth, not server performance.
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
@@ -48,9 +49,9 @@
  */
 public class ShallowEtagHeaderFilter extends OncePerRequestFilter {
 
-	private static String HEADER_ETAG = "ETag";
+	private static final String HEADER_ETAG = "ETag";
 
-	private static String HEADER_IF_NONE_MATCH = "If-None-Match";
+	private static final String HEADER_IF_NONE_MATCH = "If-None-Match";
 
 
 	/**
@@ -66,58 +67,57 @@ protected boolean shouldNotFilterAsyncDispatch() {
 	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
 			throws ServletException, IOException {
 
+		HttpServletResponse responseToUse = response;
 		if (!isAsyncDispatch(request)) {
-			response = new ShallowEtagResponseWrapper(response);
+			responseToUse = new ShallowEtagResponseWrapper(response);
 		}
 
-		filterChain.doFilter(request, response);
+		filterChain.doFilter(request, responseToUse);
 
 		if (!isAsyncStarted(request)) {
-			updateResponse(request, response);
+			updateResponse(request, responseToUse);
 		}
 	}
 
 	private void updateResponse(HttpServletRequest request, HttpServletResponse response) throws IOException {
-
-		ShallowEtagResponseWrapper  responseWrapper = WebUtils.getNativeResponse(response, ShallowEtagResponseWrapper.class);
+		ShallowEtagResponseWrapper responseWrapper =
+				WebUtils.getNativeResponse(response, ShallowEtagResponseWrapper.class);
 		Assert.notNull(responseWrapper, "ShallowEtagResponseWrapper not found");
 
-		response = (HttpServletResponse) responseWrapper.getResponse();
-
-		byte[] body = responseWrapper.toByteArray();
+		HttpServletResponse rawResponse = (HttpServletResponse) responseWrapper.getResponse();
 		int statusCode = responseWrapper.getStatusCode();
+		byte[] body = responseWrapper.toByteArray();
 
 		if (isEligibleForEtag(request, responseWrapper, statusCode, body)) {
 			String responseETag = generateETagHeaderValue(body);
-			response.setHeader(HEADER_ETAG, responseETag);
-
+			rawResponse.setHeader(HEADER_ETAG, responseETag);
 			String requestETag = request.getHeader(HEADER_IF_NONE_MATCH);
 			if (responseETag.equals(requestETag)) {
 				if (logger.isTraceEnabled()) {
 					logger.trace("ETag [" + responseETag + "] equal to If-None-Match, sending 304");
 				}
-				response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+				rawResponse.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
 			}
 			else {
 				if (logger.isTraceEnabled()) {
 					logger.trace("ETag [" + responseETag + "] not equal to If-None-Match [" + requestETag +
 							"], sending normal response");
 				}
-				copyBodyToResponse(body, response);
+				copyBodyToResponse(body, rawResponse);
 			}
 		}
 		else {
 			if (logger.isTraceEnabled()) {
 				logger.trace("Response with status code [" + statusCode + "] not eligible for ETag");
 			}
-			copyBodyToResponse(body, response);
+			copyBodyToResponse(body, rawResponse);
 		}
 	}
 
 	private void copyBodyToResponse(byte[] body, HttpServletResponse response) throws IOException {
 		if (body.length > 0) {
 			response.setContentLength(body.length);
-			FileCopyUtils.copy(body, response.getOutputStream());
+			StreamUtils.copy(body, response.getOutputStream());
 		}
 	}
 
@@ -158,7 +158,7 @@ protected String generateETagHeaderValue(byte[] bytes) {
 	 */
 	private static class ShallowEtagResponseWrapper extends HttpServletResponseWrapper {
 
-		private final ByteArrayOutputStream content = new ByteArrayOutputStream();
+		private final ByteArrayOutputStream content = new ByteArrayOutputStream(1024);
 
 		private final ServletOutputStream outputStream = new ResponseServletOutputStream();
 
@@ -166,7 +166,7 @@ private static class ShallowEtagResponseWrapper extends HttpServletResponseWrapp
 
 		private int statusCode = HttpServletResponse.SC_OK;
 
-		private ShallowEtagResponseWrapper(HttpServletResponse response) {
+		public ShallowEtagResponseWrapper(HttpServletResponse response) {
 			super(response);
 		}
 
@@ -214,25 +214,26 @@ public PrintWriter getWriter() throws IOException {
 			return this.writer;
 		}
 
-		@Override
-		public void resetBuffer() {
-			this.content.reset();
-		}
-
 		@Override
 		public void reset() {
 			super.reset();
 			resetBuffer();
 		}
 
-		private int getStatusCode() {
-			return statusCode;
+		@Override
+		public void resetBuffer() {
+			this.content.reset();
 		}
 
-		private byte[] toByteArray() {
+		public int getStatusCode() {
+			return this.statusCode;
+		}
+
+		public byte[] toByteArray() {
 			return this.content.toByteArray();
 		}
 
+
 		private class ResponseServletOutputStream extends ServletOutputStream {
 
 			@Override
@@ -246,9 +247,10 @@ public void write(byte[] b, int off, int len) throws IOException {
 			}
 		}
 
+
 		private class ResponsePrintWriter extends PrintWriter {
 
-			private ResponsePrintWriter(String characterEncoding) throws UnsupportedEncodingException {
+			public ResponsePrintWriter(String characterEncoding) throws UnsupportedEncodingException {
 				super(new OutputStreamWriter(content, characterEncoding));
 			}
 
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java b/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java
index 3c2519f5a6..cbf07194df 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * Convenience methods to retrieve the root WebApplicationContext for a given
- * FacesContext. This is e.g. useful for accessing a Spring context from
- * custom JSF code.
+ * Convenience methods to retrieve Spring's root {@link WebApplicationContext}
+ * for a given JSF {@link FacesContext}. This is useful for accessing a
+ * Spring application context from custom JSF-based code.
  *
  * <p>Analogous to Spring's WebApplicationContextUtils for the ServletContext.
  *
@@ -38,8 +38,8 @@
 public abstract class FacesContextUtils {
 
 	/**
-	 * Find the root WebApplicationContext for this web app, which is
-	 * typically loaded via ContextLoaderListener or ContextLoaderServlet.
+	 * Find the root {@link WebApplicationContext} for this web app, typically
+	 * loaded via {@link org.springframework.web.context.ContextLoaderListener}.
 	 * <p>Will rethrow an exception that happened on root context startup,
 	 * to differentiate between a failed context startup and no context at all.
 	 * @param fc the FacesContext to find the web application context for
@@ -66,8 +66,8 @@ public static WebApplicationContext getWebApplicationContext(FacesContext fc) {
 	}
 
 	/**
-	 * Find the root WebApplicationContext for this web app, which is
-	 * typically loaded via ContextLoaderListener or ContextLoaderServlet.
+	 * Find the root {@link WebApplicationContext} for this web app, typically
+	 * loaded via {@link org.springframework.web.context.ContextLoaderListener}.
 	 * <p>Will rethrow an exception that happened on root context startup,
 	 * to differentiate between a failed context startup and no context at all.
 	 * @param fc the FacesContext to find the web application context for
@@ -75,9 +75,7 @@ public static WebApplicationContext getWebApplicationContext(FacesContext fc) {
 	 * @throws IllegalStateException if the root WebApplicationContext could not be found
 	 * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
 	 */
-	public static WebApplicationContext getRequiredWebApplicationContext(FacesContext fc)
-		throws IllegalStateException {
-
+	public static WebApplicationContext getRequiredWebApplicationContext(FacesContext fc) throws IllegalStateException {
 		WebApplicationContext wac = getWebApplicationContext(fc);
 		if (wac == null) {
 			throw new IllegalStateException("No WebApplicationContext found: no ContextLoaderListener registered?");
diff --git a/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java b/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java
index d1aa1a36d0..db9d5928a0 100644
--- a/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java
+++ b/spring-web/src/main/java/org/springframework/web/method/ControllerAdviceBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,9 +31,9 @@
  * Encapsulates information about an {@linkplain ControllerAdvice @ControllerAdvice}
  * Spring-managed bean without necessarily requiring it to be instantiated.
  *
- * <p>The {@link #findAnnotatedBeans(ApplicationContext)} method can be used to discover
- * such beans. However, an {@code ControllerAdviceBean} may be created from
- * any object, including ones without an {@code @ControllerAdvice}.
+ * <p>The {@link #findAnnotatedBeans(ApplicationContext)} method can be used to
+ * discover such beans. However, a {@code ControllerAdviceBean} may be created
+ * from any object, including ones without an {@code @ControllerAdvice}.
  *
  * @author Rossen Stoyanchev
  * @since 3.2
@@ -42,77 +42,58 @@ public class ControllerAdviceBean implements Ordered {
 
 	private final Object bean;
 
-	private final int order;
-
 	private final BeanFactory beanFactory;
 
+	private final int order;
 
-	/**
-	 * Create an instance using the given bean name.
-	 * @param beanName the name of the bean
-	 * @param beanFactory a BeanFactory that can be used later to resolve the bean
-	 */
-	public ControllerAdviceBean(String beanName, BeanFactory beanFactory) {
-		Assert.hasText(beanName, "'beanName' must not be null");
-		Assert.notNull(beanFactory, "'beanFactory' must not be null");
-		Assert.isTrue(beanFactory.containsBean(beanName),
-				"Bean factory [" + beanFactory + "] does not contain bean " + "with name [" + beanName + "]");
-		this.bean = beanName;
-		this.beanFactory = beanFactory;
-		this.order = initOrderFromBeanType(this.beanFactory.getType(beanName));
-	}
-
-	private static int initOrderFromBeanType(Class<?> beanType) {
-		Order annot = AnnotationUtils.findAnnotation(beanType, Order.class);
-		return (annot != null) ? annot.value() : Ordered.LOWEST_PRECEDENCE;
-	}
 
 	/**
-	 * Create an instance using the given bean instance.
-	 * @param bean the bean
+	 * Create a {@code ControllerAdviceBean} using the given bean instance.
+	 * @param bean the bean instance
 	 */
 	public ControllerAdviceBean(Object bean) {
-		Assert.notNull(bean, "'bean' must not be null");
+		Assert.notNull(bean, "Bean must not be null");
 		this.bean = bean;
 		this.order = initOrderFromBean(bean);
 		this.beanFactory = null;
 	}
 
-	private static int initOrderFromBean(Object bean) {
-		return (bean instanceof Ordered) ? ((Ordered) bean).getOrder() : initOrderFromBeanType(bean.getClass());
-	}
-
 	/**
-	 * Find the names of beans annotated with
-	 * {@linkplain ControllerAdvice @ControllerAdvice} in the given
-	 * ApplicationContext and wrap them as {@code ControllerAdviceBean} instances.
+	 * Create a {@code ControllerAdviceBean} using the given bean name.
+	 * @param beanName the name of the bean
+	 * @param beanFactory a BeanFactory that can be used later to resolve the bean
 	 */
-	public static List<ControllerAdviceBean> findAnnotatedBeans(ApplicationContext applicationContext) {
-		List<ControllerAdviceBean> beans = new ArrayList<ControllerAdviceBean>();
-		for (String name : applicationContext.getBeanDefinitionNames()) {
-			if (applicationContext.findAnnotationOnBean(name, ControllerAdvice.class) != null) {
-				beans.add(new ControllerAdviceBean(name, applicationContext));
-			}
+	public ControllerAdviceBean(String beanName, BeanFactory beanFactory) {
+		Assert.hasText(beanName, "Bean name must not be null");
+		Assert.notNull(beanFactory, "BeanFactory must not be null");
+
+		if (!beanFactory.containsBean(beanName)) {
+			throw new IllegalArgumentException(
+					"BeanFactory [" + beanFactory + "] does not contain bean with name '" + beanName + "'");
 		}
-		return beans;
+
+		this.bean = beanName;
+		this.beanFactory = beanFactory;
+		this.order = initOrderFromBeanType(this.beanFactory.getType(beanName));
 	}
 
+
 	/**
 	 * Returns the order value extracted from the {@link ControllerAdvice}
-	 * annotation or {@link Ordered#LOWEST_PRECEDENCE} otherwise.
+	 * annotation, or {@link Ordered#LOWEST_PRECEDENCE} otherwise.
 	 */
 	public int getOrder() {
 		return this.order;
 	}
 
 	/**
-	 * Returns the type of the contained bean.
-	 * If the bean type is a CGLIB-generated class, the original, user-defined class is returned.
+	 * Return the type of the contained bean.
+	 * <p>If the bean type is a CGLIB-generated class, the original
+	 * user-defined class is returned.
 	 */
 	public Class<?> getBeanType() {
-		Class<?> clazz = (this.bean instanceof String)
-				? this.beanFactory.getType((String) this.bean) : this.bean.getClass();
-
+		Class<?> clazz = (this.bean instanceof String ?
+				this.beanFactory.getType((String) this.bean) : this.bean.getClass());
 		return ClassUtils.getUserClass(clazz);
 	}
 
@@ -120,29 +101,49 @@ public Class<?> getBeanType() {
 	 * Return a bean instance if necessary resolving the bean name through the BeanFactory.
 	 */
 	public Object resolveBean() {
-		return (this.bean instanceof String) ? this.beanFactory.getBean((String) this.bean) : this.bean;
+		return (this.bean instanceof String ? this.beanFactory.getBean((String) this.bean) : this.bean);
 	}
 
+
 	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o != null && o instanceof ControllerAdviceBean) {
-			ControllerAdviceBean other = (ControllerAdviceBean) o;
-			return this.bean.equals(other.bean);
-		}
-		return false;
+	public boolean equals(Object other) {
+		return (this == other ||
+				(other instanceof ControllerAdviceBean && this.bean.equals(((ControllerAdviceBean) other).bean)));
 	}
 
 	@Override
 	public int hashCode() {
-		return 31 * this.bean.hashCode();
+		return this.bean.hashCode();
 	}
 
 	@Override
 	public String toString() {
-		return bean.toString();
+		return this.bean.toString();
+	}
+
+
+	/**
+	 * Find the names of beans annotated with
+	 * {@linkplain ControllerAdvice @ControllerAdvice} in the given
+	 * ApplicationContext and wrap them as {@code ControllerAdviceBean} instances.
+	 */
+	public static List<ControllerAdviceBean> findAnnotatedBeans(ApplicationContext applicationContext) {
+		List<ControllerAdviceBean> beans = new ArrayList<ControllerAdviceBean>();
+		for (String name : applicationContext.getBeanDefinitionNames()) {
+			if (applicationContext.findAnnotationOnBean(name, ControllerAdvice.class) != null) {
+				beans.add(new ControllerAdviceBean(name, applicationContext));
+			}
+		}
+		return beans;
+	}
+
+	private static int initOrderFromBean(Object bean) {
+		return (bean instanceof Ordered ? ((Ordered) bean).getOrder() : initOrderFromBeanType(bean.getClass()));
+	}
+
+	private static int initOrderFromBeanType(Class<?> beanType) {
+		Order ann = AnnotationUtils.findAnnotation(beanType, Order.class);
+		return (ann != null ? ann.value() : Ordered.LOWEST_PRECEDENCE);
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
index aec22e4d5a..a30347a1b0 100644
--- a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.core.BridgeMethodResolver;
 import org.springframework.core.MethodParameter;
@@ -29,15 +30,13 @@
 import org.springframework.util.ClassUtils;
 
 /**
- * Encapsulates information about a bean method consisting of a
- * {@linkplain #getMethod() method} and a {@linkplain #getBean() bean}. Provides
- * convenient access to method parameters, the method return value, method
- * annotations.
+ * Encapsulates information about a handler method consisting of a {@linkplain #getMethod() method}
+ * and a {@linkplain #getBean() bean}. Provides convenient access to method parameters,
+ * method return value, method annotations.
  *
- * <p>The class may be created with a bean instance or with a bean name (e.g. lazy
- * bean, prototype bean). Use {@link #createWithResolvedBean()} to obtain an
- * {@link HandlerMethod} instance with a bean instance initialized through the
- * bean factory.
+ * <p>The class may be created with a bean instance or with a bean name (e.g. lazy-init bean,
+ * prototype bean). Use {@link #createWithResolvedBean()} to obtain a {@link HandlerMethod}
+ * instance with a bean instance resolved through the associated {@link BeanFactory}.
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
@@ -50,21 +49,21 @@ public class HandlerMethod {
 
 	private final Object bean;
 
-	private final Method method;
-
 	private final BeanFactory beanFactory;
 
-	private final MethodParameter[] parameters;
+	private final Method method;
 
 	private final Method bridgedMethod;
 
+	private final MethodParameter[] parameters;
+
 
 	/**
 	 * Create an instance from a bean instance and a method.
 	 */
 	public HandlerMethod(Object bean, Method method) {
-		Assert.notNull(bean, "bean is required");
-		Assert.notNull(method, "method is required");
+		Assert.notNull(bean, "Bean is required");
+		Assert.notNull(method, "Method is required");
 		this.bean = bean;
 		this.beanFactory = null;
 		this.method = method;
@@ -72,26 +71,17 @@ public HandlerMethod(Object bean, Method method) {
 		this.parameters = initMethodParameters();
 	}
 
-	private MethodParameter[] initMethodParameters() {
-		int count = this.bridgedMethod.getParameterTypes().length;
-		MethodParameter[] result = new MethodParameter[count];
-		for (int i = 0; i < count; i++) {
-			result[i] = new HandlerMethodParameter(i);
-		}
-		return result;
-	}
-
 	/**
 	 * Create an instance from a bean instance, method name, and parameter types.
 	 * @throws NoSuchMethodException when the method cannot be found
 	 */
 	public HandlerMethod(Object bean, String methodName, Class<?>... parameterTypes) throws NoSuchMethodException {
-		Assert.notNull(bean, "bean is required");
-		Assert.notNull(methodName, "method is required");
+		Assert.notNull(bean, "Bean is required");
+		Assert.notNull(methodName, "Method name is required");
 		this.bean = bean;
 		this.beanFactory = null;
 		this.method = bean.getClass().getMethod(methodName, parameterTypes);
-		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
+		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(this.method);
 		this.parameters = initMethodParameters();
 	}
 
@@ -101,11 +91,11 @@ public HandlerMethod(Object bean, String methodName, Class<?>... parameterTypes)
 	 * re-create the {@code HandlerMethod} with an initialized the bean.
 	 */
 	public HandlerMethod(String beanName, BeanFactory beanFactory, Method method) {
-		Assert.hasText(beanName, "beanName is required");
-		Assert.notNull(beanFactory, "beanFactory is required");
-		Assert.notNull(method, "method is required");
+		Assert.hasText(beanName, "Bean name is required");
+		Assert.notNull(beanFactory, "BeanFactory is required");
+		Assert.notNull(method, "Method is required");
 		Assert.isTrue(beanFactory.containsBean(beanName),
-				"Bean factory [" + beanFactory + "] does not contain bean [" + beanName + "]");
+				"BeanFactory [" + beanFactory + "] does not contain bean [" + beanName + "]");
 		this.bean = beanName;
 		this.beanFactory = beanFactory;
 		this.method = method;
@@ -129,8 +119,8 @@ protected HandlerMethod(HandlerMethod handlerMethod) {
 	 * Re-create HandlerMethod with the resolved handler.
 	 */
 	private HandlerMethod(HandlerMethod handlerMethod, Object handler) {
-		Assert.notNull(handlerMethod, "handlerMethod is required");
-		Assert.notNull(handler, "handler is required");
+		Assert.notNull(handlerMethod, "HandlerMethod is required");
+		Assert.notNull(handler, "Handler object is required");
 		this.bean = handler;
 		this.beanFactory = handlerMethod.beanFactory;
 		this.method = handlerMethod.method;
@@ -138,6 +128,16 @@ private HandlerMethod(HandlerMethod handlerMethod, Object handler) {
 		this.parameters = handlerMethod.parameters;
 	}
 
+
+	private MethodParameter[] initMethodParameters() {
+		int count = this.bridgedMethod.getParameterTypes().length;
+		MethodParameter[] result = new MethodParameter[count];
+		for (int i = 0; i < count; i++) {
+			result[i] = new HandlerMethodParameter(i);
+		}
+		return result;
+	}
+
 	/**
 	 * Returns the bean for this handler method.
 	 */
@@ -157,9 +157,8 @@ public Method getMethod() {
 	 * Note that if the bean type is a CGLIB-generated class, the original, user-defined class is returned.
 	 */
 	public Class<?> getBeanType() {
-		Class<?> clazz = (this.bean instanceof String)
-				? this.beanFactory.getType((String) this.bean) : this.bean.getClass();
-
+		Class<?> clazz = (this.bean instanceof String ?
+				this.beanFactory.getType((String) this.bean) : this.bean.getClass());
 		return ClassUtils.getUserClass(clazz);
 	}
 
@@ -223,33 +222,34 @@ public HandlerMethod createWithResolvedBean() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
+	public boolean equals(Object obj) {
+		if (this == obj) {
 			return true;
 		}
-		if (o != null && o instanceof HandlerMethod) {
-			HandlerMethod other = (HandlerMethod) o;
-			return this.bean.equals(other.bean) && this.method.equals(other.method);
+		if (obj != null && obj instanceof HandlerMethod) {
+			HandlerMethod other = (HandlerMethod) obj;
+			return (this.bean.equals(other.bean) && this.method.equals(other.method));
 		}
 		return false;
 	}
 
 	@Override
 	public int hashCode() {
-		return 31 * this.bean.hashCode() + this.method.hashCode();
+		return this.bean.hashCode() * 31 + this.method.hashCode();
 	}
 
 	@Override
 	public String toString() {
-		return method.toGenericString();
+		return this.method.toGenericString();
 	}
 
+
 	/**
 	 * A MethodParameter with HandlerMethod-specific behavior.
 	 */
 	private class HandlerMethodParameter extends MethodParameter {
 
-		protected HandlerMethodParameter(int index) {
+		public HandlerMethodParameter(int index) {
 			super(HandlerMethod.this.bridgedMethod, index);
 		}
 
@@ -264,6 +264,7 @@ public <T extends Annotation> T getMethodAnnotation(Class<T> annotationType) {
 		}
 	}
 
+
 	/**
 	 * A MethodParameter for a HandlerMethod return type based on an actual return value.
 	 */
@@ -278,7 +279,7 @@ public ReturnValueMethodParameter(Object returnValue) {
 
 		@Override
 		public Class<?> getParameterType() {
-			return (this.returnValue != null) ? this.returnValue.getClass() : super.getParameterType();
+			return (this.returnValue != null ? this.returnValue.getClass() : super.getParameterType());
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/method/HandlerMethodSelector.java b/spring-web/src/main/java/org/springframework/web/method/HandlerMethodSelector.java
index fc43fc5f8b..671f35a3ac 100644
--- a/spring-web/src/main/java/org/springframework/web/method/HandlerMethodSelector.java
+++ b/spring-web/src/main/java/org/springframework/web/method/HandlerMethodSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,9 +37,8 @@
 public abstract class HandlerMethodSelector {
 
 	/**
-	 * Selects handler methods for the given handler type. Callers of this method define handler methods
-	 * of interest through the {@link MethodFilter} parameter.
-	 *
+	 * Select handler methods for the given handler type.
+	 * <p>Callers define handler methods of interest through the {@link MethodFilter} parameter.
 	 * @param handlerType the handler type to search handler methods on
 	 * @param handlerMethodFilter a {@link MethodFilter} to help recognize handler methods of interest
 	 * @return the selected methods, or an empty set
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
index a515479210..e8d6fba1d6 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,6 +74,7 @@ public AbstractNamedValueMethodArgumentResolver(ConfigurableBeanFactory beanFact
 		this.expressionContext = (beanFactory != null) ? new BeanExpressionContext(beanFactory, new RequestScope()) : null;
 	}
 
+	@Override
 	public final Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java
index 626b0fe218..79b66d3f7e 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,24 +33,37 @@
 import org.springframework.web.method.HandlerMethodSelector;
 
 /**
- * Discovers {@linkplain ExceptionHandler @ExceptionHandler} methods in a given class
- * type, including all super types, and helps to resolve an Exception to the method
- * its mapped to. Exception mappings are defined through {@code @ExceptionHandler}
- * annotation or by looking at the signature of an {@code @ExceptionHandler} method.
+ * Discovers {@linkplain ExceptionHandler @ExceptionHandler} methods in a given class,
+ * including all of its superclasses, and helps to resolve a given {@link Exception}
+ * to the exception types supported by a given {@link Method}.
  *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
 public class ExceptionHandlerMethodResolver {
 
+	/**
+	 * A filter for selecting {@code @ExceptionHandler} methods.
+	 */
+	public static final MethodFilter EXCEPTION_HANDLER_METHODS = new MethodFilter() {
+		public boolean matches(Method method) {
+			return (AnnotationUtils.findAnnotation(method, ExceptionHandler.class) != null);
+		}
+	};
+
+	/**
+	 * Arbitrary {@link Method} reference, indicating no method found in the cache.
+	 */
 	private static final Method NO_METHOD_FOUND = ClassUtils.getMethodIfAvailable(System.class, "currentTimeMillis");
 
+
 	private final Map<Class<? extends Throwable>, Method> mappedMethods =
 			new ConcurrentHashMap<Class<? extends Throwable>, Method>(16);
 
 	private final Map<Class<? extends Throwable>, Method> exceptionLookupCache =
 			new ConcurrentHashMap<Class<? extends Throwable>, Method>(16);
 
+
 	/**
 	 * A constructor that finds {@link ExceptionHandler} methods in the given type.
 	 * @param handlerType the type to introspect
@@ -63,17 +76,15 @@ public ExceptionHandlerMethodResolver(Class<?> handlerType) {
 		}
 	}
 
+
 	/**
-	 * Extract exception mappings from the {@code @ExceptionHandler} annotation
-	 * first and as a fall-back from the method signature.
+	 * Extract exception mappings from the {@code @ExceptionHandler} annotation first,
+	 * and then as a fallback from the method signature itself.
 	 */
 	@SuppressWarnings("unchecked")
 	private List<Class<? extends Throwable>> detectExceptionMappings(Method method) {
 		List<Class<? extends Throwable>> result = new ArrayList<Class<? extends Throwable>>();
-
-		ExceptionHandler annotation = AnnotationUtils.findAnnotation(method, ExceptionHandler.class);
-		result.addAll(Arrays.asList(annotation.value()));
-
+		detectAnnotationExceptionMappings(method, result);
 		if (result.isEmpty()) {
 			for (Class<?> paramType : method.getParameterTypes()) {
 				if (Throwable.class.isAssignableFrom(paramType)) {
@@ -81,12 +92,15 @@ private List<Class<? extends Throwable>> detectExceptionMappings(Method method)
 				}
 			}
 		}
-
 		Assert.notEmpty(result, "No exception types mapped to {" + method + "}");
-
 		return result;
 	}
 
+	protected void detectAnnotationExceptionMappings(Method method, List<Class<? extends Throwable>> result) {
+		ExceptionHandler annot = AnnotationUtils.findAnnotation(method, ExceptionHandler.class);
+		result.addAll(Arrays.asList(annot.value()));
+	}
+
 	private void addExceptionMapping(Class<? extends Throwable> exceptionType, Method method) {
 		Method oldMethod = this.mappedMethods.put(exceptionType, method);
 		if (oldMethod != null && !oldMethod.equals(method)) {
@@ -100,52 +114,51 @@ private void addExceptionMapping(Class<? extends Throwable> exceptionType, Metho
 	 * Whether the contained type has any exception mappings.
 	 */
 	public boolean hasExceptionMappings() {
-		return (this.mappedMethods.size() > 0);
+		return !this.mappedMethods.isEmpty();
 	}
 
 	/**
-	 * Find a method to handle the given exception.
+	 * Find a {@link Method} to handle the given exception.
 	 * Use {@link ExceptionDepthComparator} if more than one match is found.
 	 * @param exception the exception
-	 * @return a method to handle the exception or {@code null}
+	 * @return a Method to handle the exception, or {@code null} if none found
 	 */
 	public Method resolveMethod(Exception exception) {
-		Class<? extends Exception> exceptionType = exception.getClass();
+		return resolveMethodByExceptionType(exception.getClass());
+	}
+
+	/**
+	 * Find a {@link Method} to handle the given exception type. This can be
+	 * useful if an {@link Exception} instance is not available (e.g. for tools).
+	 * @param exceptionType the exception type
+	 * @return a Method to handle the exception, or {@code null} if none found
+	 */
+	public Method resolveMethodByExceptionType(Class<? extends Exception> exceptionType) {
 		Method method = this.exceptionLookupCache.get(exceptionType);
 		if (method == null) {
 			method = getMappedMethod(exceptionType);
-			this.exceptionLookupCache.put(exceptionType, method != null ? method : NO_METHOD_FOUND);
+			this.exceptionLookupCache.put(exceptionType, (method != null ? method : NO_METHOD_FOUND));
 		}
-		return method != NO_METHOD_FOUND ? method : null;
+		return (method != NO_METHOD_FOUND ? method : null);
 	}
 
 	/**
-	 * Return the method mapped to the given exception type or {@code null}.
+	 * Return the {@link Method} mapped to the given exception type, or {@code null} if none.
 	 */
 	private Method getMappedMethod(Class<? extends Exception> exceptionType) {
 		List<Class<? extends Throwable>> matches = new ArrayList<Class<? extends Throwable>>();
-		for(Class<? extends Throwable> mappedException : this.mappedMethods.keySet()) {
+		for (Class<? extends Throwable> mappedException : this.mappedMethods.keySet()) {
 			if (mappedException.isAssignableFrom(exceptionType)) {
 				matches.add(mappedException);
 			}
 		}
 		if (!matches.isEmpty()) {
 			Collections.sort(matches, new ExceptionDepthComparator(exceptionType));
-			return mappedMethods.get(matches.get(0));
+			return this.mappedMethods.get(matches.get(0));
 		}
 		else {
 			return null;
 		}
 	}
 
-	/**
-	 * A filter for selecting {@code @ExceptionHandler} methods.
-	 */
-	public final static MethodFilter EXCEPTION_HANDLER_METHODS = new MethodFilter() {
-
-		public boolean matches(Method method) {
-			return AnnotationUtils.findAnnotation(method, ExceptionHandler.class) != null;
-		}
-	};
-
 }
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java
index d2e2529360..c8a54a7b52 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.AnnotationUtils;
@@ -36,29 +37,32 @@
 import org.springframework.web.method.support.ModelAndViewContainer;
 
 /**
- * Resolves method arguments annotated with {@code @ModelAttribute} and handles
- * return values from methods annotated with {@code @ModelAttribute}.
+ * Resolve {@code @ModelAttribute} annotated method arguments and handle
+ * return values from {@code @ModelAttribute} annotated methods.
  *
- * <p>Model attributes are obtained from the model or if not found possibly
- * created with a default constructor if it is available. Once created, the
- * attributed is populated with request data via data binding and also
- * validation may be applied if the argument is annotated with
- * {@code @javax.validation.Valid}.
+ * <p>Model attributes are obtained from the model or created with a default
+ * constructor (and then added to the model). Once created the attribute is
+ * populated via data binding to Servlet request parameters. Validation may be
+ * applied if the argument is annotated with {@code @javax.validation.Valid}.
+ * or Spring's own {@code @org.springframework.validation.annotation.Validated}.
  *
- * <p>When this handler is created with {@code annotationNotRequired=true},
+ * <p>When this handler is created with {@code annotationNotRequired=true}
  * any non-simple type argument and return value is regarded as a model
  * attribute with or without the presence of an {@code @ModelAttribute}.
  *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
-public class ModelAttributeMethodProcessor implements HandlerMethodArgumentResolver, HandlerMethodReturnValueHandler {
+public class ModelAttributeMethodProcessor
+		implements HandlerMethodArgumentResolver, HandlerMethodReturnValueHandler {
 
-	protected Log logger = LogFactory.getLog(this.getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
 	private final boolean annotationNotRequired;
 
+
 	/**
+	 * Class constructor.
 	 * @param annotationNotRequired if "true", non-simple method arguments and
 	 * return values are considered model attributes with or without a
 	 * {@code @ModelAttribute} annotation.
@@ -67,10 +71,13 @@ public ModelAttributeMethodProcessor(boolean annotationNotRequired) {
 		this.annotationNotRequired = annotationNotRequired;
 	}
 
+
 	/**
-	 * @return true if the parameter is annotated with {@link ModelAttribute}
-	 * or in default resolution mode also if it is not a simple type.
+	 * Returns {@code true} if the parameter is annotated with
+	 * {@link ModelAttribute} or, if in default resolution mode, for any
+	 * method parameter that is not a simple type.
 	 */
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		if (parameter.hasParameterAnnotation(ModelAttribute.class)) {
 			return true;
@@ -92,28 +99,23 @@ else if (this.annotationNotRequired) {
 	 * and the next method parameter is not of type {@link Errors}.
 	 * @throws Exception if WebDataBinder initialization fails.
 	 */
-	public final Object resolveArgument(
-			MethodParameter parameter, ModelAndViewContainer mavContainer,
-			NativeWebRequest request, WebDataBinderFactory binderFactory)
-			throws Exception {
+	public final Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
+			NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
 
 		String name = ModelFactory.getNameForParameter(parameter);
-		Object attribute = (mavContainer.containsAttribute(name)) ?
-				mavContainer.getModel().get(name) : createAttribute(name, parameter, binderFactory, request);
+		Object attribute = (mavContainer.containsAttribute(name) ? mavContainer.getModel().get(name) :
+				createAttribute(name, parameter, binderFactory, webRequest));
 
-		WebDataBinder binder = binderFactory.createBinder(request, attribute, name);
+		WebDataBinder binder = binderFactory.createBinder(webRequest, attribute, name);
 		if (binder.getTarget() != null) {
-			bindRequestParameters(binder, request);
+			bindRequestParameters(binder, webRequest);
 			validateIfApplicable(binder, parameter);
-			if (binder.getBindingResult().hasErrors()) {
-				if (isBindExceptionRequired(binder, parameter)) {
-					throw new BindException(binder.getBindingResult());
-				}
+			if (binder.getBindingResult().hasErrors() && isBindExceptionRequired(binder, parameter)) {
+				throw new BindException(binder.getBindingResult());
 			}
 		}
 
 		// Add resolved attribute and BindingResult at the end of the model
-
 		Map<String, Object> bindingResultModel = binder.getBindingResult().getModel();
 		mavContainer.removeAttributes(bindingResultModel);
 		mavContainer.addAllAttributes(bindingResultModel);
@@ -124,16 +126,16 @@ public final Object resolveArgument(
 	/**
 	 * Extension point to create the model attribute if not found in the model.
 	 * The default implementation uses the default constructor.
-	 * @param attributeName the name of the attribute, never {@code null}
-	 * @param parameter the method parameter
+	 * @param attributeName the name of the attribute (never {@code null})
+	 * @param methodParam the method parameter
 	 * @param binderFactory for creating WebDataBinder instance
 	 * @param request the current request
-	 * @return the created model attribute, never {@code null}
+	 * @return the created model attribute (never {@code null})
 	 */
-	protected Object createAttribute(String attributeName, MethodParameter parameter,
-			WebDataBinderFactory binderFactory,  NativeWebRequest request) throws Exception {
+	protected Object createAttribute(String attributeName, MethodParameter methodParam,
+			WebDataBinderFactory binderFactory, NativeWebRequest request) throws Exception {
 
-		return BeanUtils.instantiateClass(parameter.getParameterType());
+		return BeanUtils.instantiateClass(methodParam.getParameterType());
 	}
 
 	/**
@@ -147,15 +149,17 @@ protected void bindRequestParameters(WebDataBinder binder, NativeWebRequest requ
 
 	/**
 	 * Validate the model attribute if applicable.
-	 * <p>The default implementation checks for {@code @javax.validation.Valid}.
+	 * <p>The default implementation checks for {@code @javax.validation.Valid},
+	 * Spring's {@link org.springframework.validation.annotation.Validated},
+	 * and custom annotations whose name starts with "Valid".
 	 * @param binder the DataBinder to be used
-	 * @param parameter the method parameter
+	 * @param methodParam the method parameter
 	 */
-	protected void validateIfApplicable(WebDataBinder binder, MethodParameter parameter) {
-		Annotation[] annotations = parameter.getParameterAnnotations();
-		for (Annotation annot : annotations) {
-			if (annot.annotationType().getSimpleName().startsWith("Valid")) {
-				Object hints = AnnotationUtils.getValue(annot);
+	protected void validateIfApplicable(WebDataBinder binder, MethodParameter methodParam) {
+		Annotation[] annotations = methodParam.getParameterAnnotations();
+		for (Annotation ann : annotations) {
+			if (ann.annotationType().getSimpleName().startsWith("Valid")) {
+				Object hints = AnnotationUtils.getValue(ann);
 				binder.validate(hints instanceof Object[] ? (Object[]) hints : new Object[] {hints});
 				break;
 			}
@@ -163,22 +167,22 @@ protected void validateIfApplicable(WebDataBinder binder, MethodParameter parame
 	}
 
 	/**
-	 * Whether to raise a {@link BindException} on validation errors.
+	 * Whether to raise a fatal bind exception on validation errors.
 	 * @param binder the data binder used to perform data binding
-	 * @param parameter the method argument
-	 * @return {@code true} if the next method argument is not of type {@link Errors}.
+	 * @param methodParam the method argument
+	 * @return {@code true} if the next method argument is not of type {@link Errors}
 	 */
-	protected boolean isBindExceptionRequired(WebDataBinder binder, MethodParameter parameter) {
-		int i = parameter.getParameterIndex();
-		Class<?>[] paramTypes = parameter.getMethod().getParameterTypes();
+	protected boolean isBindExceptionRequired(WebDataBinder binder, MethodParameter methodParam) {
+		int i = methodParam.getParameterIndex();
+		Class<?>[] paramTypes = methodParam.getMethod().getParameterTypes();
 		boolean hasBindingResult = (paramTypes.length > (i + 1) && Errors.class.isAssignableFrom(paramTypes[i + 1]));
-
 		return !hasBindingResult;
 	}
 
 	/**
 	 * Return {@code true} if there is a method-level {@code @ModelAttribute}
-	 * or if it is a non-simple type when {@code annotationNotRequired=true}.
+	 * or, in default resolution mode, for any return value type that is not
+	 * a simple type.
 	 */
 	public boolean supportsReturnType(MethodParameter returnType) {
 		if (returnType.getMethodAnnotation(ModelAttribute.class) != null) {
@@ -195,14 +199,13 @@ else if (this.annotationNotRequired) {
 	/**
 	 * Add non-null return values to the {@link ModelAndViewContainer}.
 	 */
-	public void handleReturnValue(
-			Object returnValue, MethodParameter returnType,
-			ModelAndViewContainer mavContainer, NativeWebRequest webRequest)
-			throws Exception {
+	public void handleReturnValue(Object returnValue, MethodParameter returnType,
+			ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception {
 
 		if (returnValue != null) {
 			String name = ModelFactory.getNameForReturnValue(returnValue, returnType);
 			mavContainer.addAttribute(name, returnValue);
 		}
 	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolver.java
index 4843782efb..75e06fbe6c 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,8 +46,8 @@
 public class RequestHeaderMapMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
 	public boolean supportsParameter(MethodParameter parameter) {
-		return parameter.hasParameterAnnotation(RequestHeader.class)
-				&& Map.class.isAssignableFrom(parameter.getParameterType());
+		return (parameter.hasParameterAnnotation(RequestHeader.class) &&
+				Map.class.isAssignableFrom(parameter.getParameterType()));
 	}
 
 	public Object resolveArgument(
@@ -56,7 +56,6 @@ public Object resolveArgument(
 			throws Exception {
 
 		Class<?> paramType = parameter.getParameterType();
-
 		if (MultiValueMap.class.isAssignableFrom(paramType)) {
 			MultiValueMap<String, String> result;
 			if (HttpHeaders.class.isAssignableFrom(paramType)) {
@@ -67,8 +66,11 @@ public Object resolveArgument(
 			}
 			for (Iterator<String> iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
 				String headerName = iterator.next();
-				for (String headerValue : webRequest.getHeaderValues(headerName)) {
-					result.add(headerName, headerValue);
+				String[] headerValues = webRequest.getHeaderValues(headerName);
+				if (headerValues != null) {
+					for (String headerValue : headerValues) {
+						result.add(headerName, headerValue);
+					}
 				}
 			}
 			return result;
@@ -78,9 +80,12 @@ public Object resolveArgument(
 			for (Iterator<String> iterator = webRequest.getHeaderNames(); iterator.hasNext();) {
 				String headerName = iterator.next();
 				String headerValue = webRequest.getHeader(headerName);
-				result.put(headerName, headerValue);
+				if (headerValue != null) {
+					result.put(headerName, headerValue);
+				}
 			}
 			return result;
 		}
 	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
index 2a532f4bed..1cbc05679d 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
@@ -48,8 +47,8 @@
  * type {@link MultipartFile} in conjunction with Spring's {@link MultipartResolver}
  * abstraction, and arguments of type {@code javax.servlet.http.Part} in conjunction
  * with Servlet 3.0 multipart requests. This resolver can also be created in default
- * resolution mode in which simple types (int, long, etc.) not annotated
- * with @{@link RequestParam} are also treated as request parameters with the
+ * resolution mode in which simple types (int, long, etc.) not annotated with
+ * @{@link RequestParam} are also treated as request parameters with the
  * parameter name derived from the argument name.
  *
  * <p>If the method parameter type is {@link Map}, the name specified in the
@@ -72,34 +71,35 @@ public class RequestParamMethodArgumentResolver extends AbstractNamedValueMethod
 
 	private final boolean useDefaultResolution;
 
+
 	/**
 	 * @param beanFactory a bean factory used for resolving  ${...} placeholder
 	 * and #{...} SpEL expressions in default values, or {@code null} if default
 	 * values are not expected to contain expressions
 	 * @param useDefaultResolution in default resolution mode a method argument
 	 * that is a simple type, as defined in {@link BeanUtils#isSimpleProperty},
-	 * is treated as a request parameter even if it itsn't annotated, the
+	 * is treated as a request parameter even if it it isn't annotated, the
 	 * request parameter name is derived from the method parameter name.
 	 */
-	public RequestParamMethodArgumentResolver(ConfigurableBeanFactory beanFactory,
-											  boolean useDefaultResolution) {
+	public RequestParamMethodArgumentResolver(ConfigurableBeanFactory beanFactory, boolean useDefaultResolution) {
 		super(beanFactory);
 		this.useDefaultResolution = useDefaultResolution;
 	}
 
+
 	/**
 	 * Supports the following:
 	 * <ul>
-	 * 	<li>@RequestParam-annotated method arguments.
-	 * 		This excludes {@link Map} params where the annotation doesn't
-	 * 		specify a name.	See {@link RequestParamMapMethodArgumentResolver}
-	 * 		instead for such params.
-	 * 	<li>Arguments of type {@link MultipartFile}
-	 * 		unless annotated with @{@link RequestPart}.
-	 * 	<li>Arguments of type {@code javax.servlet.http.Part}
-	 * 		unless annotated with @{@link RequestPart}.
-	 * 	<li>In default resolution mode, simple type arguments
-	 * 		even if not with @{@link RequestParam}.
+	 * <li>@RequestParam-annotated method arguments.
+	 * This excludes {@link Map} params where the annotation doesn't
+	 * specify a name.	See {@link RequestParamMapMethodArgumentResolver}
+	 * instead for such params.
+	 * <li>Arguments of type {@link MultipartFile}
+	 * unless annotated with @{@link RequestPart}.
+	 * <li>Arguments of type {@code javax.servlet.http.Part}
+	 * unless annotated with @{@link RequestPart}.
+	 * <li>In default resolution mode, simple type arguments
+	 * even if not with @{@link RequestParam}.
 	 * </ul>
 	 */
 	public boolean supportsParameter(MethodParameter parameter) {
@@ -131,20 +131,16 @@ else if (this.useDefaultResolution) {
 
 	@Override
 	protected NamedValueInfo createNamedValueInfo(MethodParameter parameter) {
-		RequestParam annotation = parameter.getParameterAnnotation(RequestParam.class);
-		return (annotation != null) ?
-				new RequestParamNamedValueInfo(annotation) :
-				new RequestParamNamedValueInfo();
+		RequestParam ann = parameter.getParameterAnnotation(RequestParam.class);
+		return (ann != null ? new RequestParamNamedValueInfo(ann) : new RequestParamNamedValueInfo());
 	}
 
 	@Override
 	protected Object resolveName(String name, MethodParameter parameter, NativeWebRequest webRequest) throws Exception {
-
-		Object arg;
-
 		HttpServletRequest servletRequest = webRequest.getNativeRequest(HttpServletRequest.class);
 		MultipartHttpServletRequest multipartRequest =
-			WebUtils.getNativeRequest(servletRequest, MultipartHttpServletRequest.class);
+				WebUtils.getNativeRequest(servletRequest, MultipartHttpServletRequest.class);
+		Object arg;
 
 		if (MultipartFile.class.equals(parameter.getParameterType())) {
 			assertIsMultipartRequest(servletRequest);
@@ -171,7 +167,7 @@ else if ("javax.servlet.http.Part".equals(parameter.getParameterType().getName()
 			if (arg == null) {
 				String[] paramValues = webRequest.getParameterValues(name);
 				if (paramValues != null) {
-					arg = paramValues.length == 1 ? paramValues[0] : paramValues;
+					arg = (paramValues.length == 1 ? paramValues[0] : paramValues);
 				}
 			}
 		}
@@ -190,7 +186,7 @@ private boolean isMultipartFileCollection(MethodParameter parameter) {
 		Class<?> paramType = parameter.getParameterType();
 		if (Collection.class.equals(paramType) || List.class.isAssignableFrom(paramType)){
 			Class<?> valueType = GenericCollectionTypeResolver.getCollectionParameterType(parameter);
-			if (valueType != null && valueType.equals(MultipartFile.class)) {
+			if (MultipartFile.class.equals(valueType)) {
 				return true;
 			}
 		}
@@ -202,13 +198,14 @@ protected void handleMissingValue(String paramName, MethodParameter parameter) t
 		throw new MissingServletRequestParameterException(paramName, parameter.getParameterType().getSimpleName());
 	}
 
-	private class RequestParamNamedValueInfo extends NamedValueInfo {
 
-		private RequestParamNamedValueInfo() {
+	private static class RequestParamNamedValueInfo extends NamedValueInfo {
+
+		public RequestParamNamedValueInfo() {
 			super("", false, ValueConstants.DEFAULT_NONE);
 		}
 
-		private RequestParamNamedValueInfo(RequestParam annotation) {
+		public RequestParamNamedValueInfo(RequestParam annotation) {
 			super(annotation.value(), annotation.required(), annotation.defaultValue());
 		}
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java
index b3c3442791..57823245fe 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ public interface HandlerMethodArgumentResolver {
 	/**
 	 * Whether the given {@linkplain MethodParameter method parameter} is
 	 * supported by this resolver.
-	 *
 	 * @param parameter the method parameter to check
 	 * @return {@code true} if this resolver supports the supplied parameter;
 	 * {@code false} otherwise
@@ -46,7 +45,6 @@ public interface HandlerMethodArgumentResolver {
 	 * request. A {@link WebDataBinderFactory} provides a way to create
 	 * a {@link WebDataBinder} instance when needed for data binding and
 	 * type conversion purposes.
-	 *
 	 * @param parameter the method parameter to resolve. This parameter must
 	 * have previously been passed to
 	 * {@link #supportsParameter(org.springframework.core.MethodParameter)}
@@ -57,9 +55,7 @@ public interface HandlerMethodArgumentResolver {
 	 * @return the resolved argument value, or {@code null}.
 	 * @throws Exception in case of errors with the preparation of argument values
 	 */
-	Object resolveArgument(MethodParameter parameter,
-						   ModelAndViewContainer mavContainer,
-						   NativeWebRequest webRequest,
-						   WebDataBinderFactory binderFactory) throws Exception;
+	Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
+			NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception;
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java
index ae1afc1155..55ee1e30a8 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,6 @@ public interface HandlerMethodReturnValueHandler {
 	/**
 	 * Whether the given {@linkplain MethodParameter method return type} is
 	 * supported by this handler.
-	 *
 	 * @param returnType the method return type to check
 	 * @return {@code true} if this handler supports the supplied return type;
 	 * {@code false} otherwise
@@ -43,7 +42,6 @@ public interface HandlerMethodReturnValueHandler {
 	 * setting a view or setting the
 	 * {@link ModelAndViewContainer#setRequestHandled} flag to {@code true}
 	 * to indicate the response has been handled directly.
-	 *
 	 * @param returnValue the value returned from the handler method
 	 * @param returnType the type of the return value. This type must have
 	 * previously been passed to
@@ -53,9 +51,7 @@ public interface HandlerMethodReturnValueHandler {
 	 * @param webRequest the current request
 	 * @throws Exception if the return value handling results in an error
 	 */
-	void handleReturnValue(Object returnValue,
-						   MethodParameter returnType,
-						   ModelAndViewContainer mavContainer,
-						   NativeWebRequest webRequest) throws Exception;
+	void handleReturnValue(Object returnValue, MethodParameter returnType,
+			ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception;
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
index 8ec8dbb858..4d93ad3705 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,56 +32,58 @@
 import org.springframework.web.method.HandlerMethod;
 
 /**
- * Provides a method for invoking the handler method for a given request after resolving its method argument
- * values through registered {@link HandlerMethodArgumentResolver}s.
+ * Provides a method for invoking the handler method for a given request after resolving its
+ * method argument values through registered {@link HandlerMethodArgumentResolver}s.
  *
- * <p>Argument resolution often requires a {@link WebDataBinder} for data binding or for type conversion.
- * Use the {@link #setDataBinderFactory(WebDataBinderFactory)} property to supply a binder factory to pass to
- * argument resolvers.
+ * <p>Argument resolution often requires a {@link WebDataBinder} for data binding or for type
+ * conversion. Use the {@link #setDataBinderFactory(WebDataBinderFactory)} property to supply
+ * a binder factory to pass to argument resolvers.
  *
- * <p>Use {@link #setHandlerMethodArgumentResolvers(HandlerMethodArgumentResolverComposite)} to customize
- * the list of argument resolvers.
+ * <p>Use {@link #setHandlerMethodArgumentResolvers(HandlerMethodArgumentResolverComposite)}
+ * to customize the list of argument resolvers.
  *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
 public class InvocableHandlerMethod extends HandlerMethod {
 
-	private HandlerMethodArgumentResolverComposite argumentResolvers = new HandlerMethodArgumentResolverComposite();
-
 	private WebDataBinderFactory dataBinderFactory;
 
+	private HandlerMethodArgumentResolverComposite argumentResolvers = new HandlerMethodArgumentResolverComposite();
+
 	private ParameterNameDiscoverer parameterNameDiscoverer = new LocalVariableTableParameterNameDiscoverer();
 
 
 	/**
-	 * Creates an instance from the given handler and method.
+	 * Create an instance from a {@code HandlerMethod}.
 	 */
-	public InvocableHandlerMethod(Object bean, Method method) {
-		super(bean, method);
+	public InvocableHandlerMethod(HandlerMethod handlerMethod) {
+		super(handlerMethod);
 	}
 
 	/**
-	 * Create an instance from a {@code HandlerMethod}.
+	 * Create an instance from a bean instance and a method.
 	 */
-	public InvocableHandlerMethod(HandlerMethod handlerMethod) {
-		super(handlerMethod);
+	public InvocableHandlerMethod(Object bean, Method method) {
+		super(bean, method);
 	}
 
 	/**
-	 * Constructs a new handler method with the given bean instance, method name and parameters.
+	 * Construct a new handler method with the given bean instance, method name and parameters.
 	 * @param bean the object bean
 	 * @param methodName the method name
 	 * @param parameterTypes the method parameter types
 	 * @throws NoSuchMethodException when the method cannot be found
 	 */
-	public InvocableHandlerMethod(
-			Object bean, String methodName, Class<?>... parameterTypes) throws NoSuchMethodException {
+	public InvocableHandlerMethod(Object bean, String methodName, Class<?>... parameterTypes)
+			throws NoSuchMethodException {
+
 		super(bean, methodName, parameterTypes);
 	}
 
+
 	/**
-	 * Sets the {@link WebDataBinderFactory} to be passed to argument resolvers allowing them to create
+	 * Set the {@link WebDataBinderFactory} to be passed to argument resolvers allowing them to create
 	 * a {@link WebDataBinder} for data binding and type conversion purposes.
 	 * @param dataBinderFactory the data binder factory.
 	 */
@@ -97,78 +99,76 @@ public void setHandlerMethodArgumentResolvers(HandlerMethodArgumentResolverCompo
 	}
 
 	/**
-	 * Set the ParameterNameDiscoverer for resolving parameter names when needed (e.g. default request attribute name).
-	 * <p>Default is an {@link org.springframework.core.LocalVariableTableParameterNameDiscoverer} instance.
+	 * Set the ParameterNameDiscoverer for resolving parameter names when needed
+	 * (e.g. default request attribute name).
+	 * <p>Default is a {@link org.springframework.core.LocalVariableTableParameterNameDiscoverer} instance.
 	 */
 	public void setParameterNameDiscoverer(ParameterNameDiscoverer parameterNameDiscoverer) {
 		this.parameterNameDiscoverer = parameterNameDiscoverer;
 	}
 
+
 	/**
-	 * Invoke the method after resolving its argument values in the context of the given request. <p>Argument
-	 * values are commonly resolved through {@link HandlerMethodArgumentResolver}s. The {@code provideArgs}
-	 * parameter however may supply argument values to be used directly, i.e. without argument resolution.
-	 * Examples of provided argument values include a {@link WebDataBinder}, a {@link SessionStatus}, or
-	 * a thrown exception instance. Provided argument values are checked before argument resolvers.
-	 *
+	 * Invoke the method after resolving its argument values in the context of the given request.
+	 * <p>Argument values are commonly resolved through {@link HandlerMethodArgumentResolver}s.
+	 * The {@code providedArgs} parameter however may supply argument values to be used directly,
+	 * i.e. without argument resolution. Examples of provided argument values include a
+	 * {@link WebDataBinder}, a {@link SessionStatus}, or a thrown exception instance.
+	 * Provided argument values are checked before argument resolvers.
 	 * @param request the current request
 	 * @param mavContainer the ModelAndViewContainer for this request
 	 * @param providedArgs "given" arguments matched by type, not resolved
 	 * @return the raw value returned by the invoked method
-	 * @exception Exception raised if no suitable argument resolver can be found, or the method raised an exception
+	 * @exception Exception raised if no suitable argument resolver can be found,
+	 * or if the method raised an exception
 	 */
-	public final Object invokeForRequest(NativeWebRequest request,
-										 ModelAndViewContainer mavContainer,
-										 Object... providedArgs) throws Exception {
-		Object[] args = getMethodArgumentValues(request, mavContainer, providedArgs);
+	public final Object invokeForRequest(NativeWebRequest request, ModelAndViewContainer mavContainer,
+			Object... providedArgs) throws Exception {
 
+		Object[] args = getMethodArgumentValues(request, mavContainer, providedArgs);
 		if (logger.isTraceEnabled()) {
-			StringBuilder builder = new StringBuilder("Invoking [");
-			builder.append(this.getMethod().getName()).append("] method with arguments ");
-			builder.append(Arrays.asList(args));
-			logger.trace(builder.toString());
+			StringBuilder sb = new StringBuilder("Invoking [");
+			sb.append(getBeanType().getSimpleName()).append(".");
+			sb.append(getMethod().getName()).append("] method with arguments ");
+			sb.append(Arrays.asList(args));
+			logger.trace(sb.toString());
 		}
-
-		Object returnValue = invoke(args);
-
+		Object returnValue = doInvoke(args);
 		if (logger.isTraceEnabled()) {
-			logger.trace("Method [" + this.getMethod().getName() + "] returned [" + returnValue + "]");
+			logger.trace("Method [" + getMethod().getName() + "] returned [" + returnValue + "]");
 		}
-
 		return returnValue;
 	}
 
 	/**
 	 * Get the method argument values for the current request.
 	 */
-	private Object[] getMethodArgumentValues(
-			NativeWebRequest request, ModelAndViewContainer mavContainer,
+	private Object[] getMethodArgumentValues(NativeWebRequest request, ModelAndViewContainer mavContainer,
 			Object... providedArgs) throws Exception {
 
 		MethodParameter[] parameters = getMethodParameters();
 		Object[] args = new Object[parameters.length];
 		for (int i = 0; i < parameters.length; i++) {
 			MethodParameter parameter = parameters[i];
-			parameter.initParameterNameDiscovery(parameterNameDiscoverer);
+			parameter.initParameterNameDiscovery(this.parameterNameDiscoverer);
 			GenericTypeResolver.resolveParameterType(parameter, getBean().getClass());
-
 			args[i] = resolveProvidedArgument(parameter, providedArgs);
 			if (args[i] != null) {
 				continue;
 			}
-
-			if (argumentResolvers.supportsParameter(parameter)) {
+			if (this.argumentResolvers.supportsParameter(parameter)) {
 				try {
-					args[i] = argumentResolvers.resolveArgument(parameter, mavContainer, request, dataBinderFactory);
+					args[i] = this.argumentResolvers.resolveArgument(
+							parameter, mavContainer, request, this.dataBinderFactory);
 					continue;
-				} catch (Exception ex) {
-					if (logger.isTraceEnabled()) {
-						logger.trace(getArgumentResolutionErrorMessage("Error resolving argument", i), ex);
+				}
+				catch (Exception ex) {
+					if (logger.isDebugEnabled()) {
+						logger.debug(getArgumentResolutionErrorMessage("Error resolving argument", i), ex);
 					}
 					throw ex;
 				}
 			}
-
 			if (args[i] == null) {
 				String msg = getArgumentResolutionErrorMessage("No suitable resolver for argument", i);
 				throw new IllegalStateException(msg);
@@ -184,7 +184,8 @@ private String getArgumentResolutionErrorMessage(String message, int index) {
 	}
 
 	/**
-	 * Adds HandlerMethod details such as the controller type and method signature to the given error message.
+	 * Adds HandlerMethod details such as the controller type and method
+	 * signature to the given error message.
 	 * @param message error message to append the HandlerMethod details to
 	 */
 	protected String getDetailedErrorMessage(String message) {
@@ -210,21 +211,23 @@ private Object resolveProvidedArgument(MethodParameter parameter, Object... prov
 		return null;
 	}
 
+
 	/**
 	 * Invoke the handler method with the given argument values.
 	 */
-	private Object invoke(Object... args) throws Exception {
-		ReflectionUtils.makeAccessible(this.getBridgedMethod());
+	protected Object doInvoke(Object... args) throws Exception {
+		ReflectionUtils.makeAccessible(getBridgedMethod());
 		try {
 			return getBridgedMethod().invoke(getBean(), args);
 		}
-		catch (IllegalArgumentException e) {
-			String msg = getInvocationErrorMessage(e.getMessage(), args);
-			throw new IllegalArgumentException(msg, e);
+		catch (IllegalArgumentException ex) {
+			assertTargetBean(getBridgedMethod(), getBean(), args);
+			String message = (ex.getMessage() != null ? ex.getMessage() : "Illegal argument");
+			throw new IllegalStateException(getInvocationErrorMessage(message, args), ex);
 		}
-		catch (InvocationTargetException e) {
+		catch (InvocationTargetException ex) {
 			// Unwrap for HandlerExceptionResolvers ...
-			Throwable targetException = e.getTargetException();
+			Throwable targetException = ex.getTargetException();
 			if (targetException instanceof RuntimeException) {
 				throw (RuntimeException) targetException;
 			}
@@ -241,10 +244,29 @@ else if (targetException instanceof Exception) {
 		}
 	}
 
+	/**
+	 * Assert that the target bean class is an instance of the class where the given
+	 * method is declared. In some cases the actual controller instance at request-
+	 * processing time may be a JDK dynamic proxy (lazy initialization, prototype
+	 * beans, and others). {@code @Controller}'s that require proxying should prefer
+	 * class-based proxy mechanisms.
+	 */
+	private void assertTargetBean(Method method, Object targetBean, Object[] args) {
+		Class<?> methodDeclaringClass = method.getDeclaringClass();
+		Class<?> targetBeanClass = targetBean.getClass();
+		if (!methodDeclaringClass.isAssignableFrom(targetBeanClass)) {
+			String msg = "The mapped controller method class '" + methodDeclaringClass.getName() +
+					"' is not an instance of the actual controller bean class '" +
+					targetBeanClass.getName() + "'. If the controller requires proxying " +
+					"(e.g. due to @Transactional), please use class-based proxying.";
+			throw new IllegalStateException(getInvocationErrorMessage(msg, args));
+		}
+	}
+
 	private String getInvocationErrorMessage(String message, Object[] resolvedArgs) {
 		StringBuilder sb = new StringBuilder(getDetailedErrorMessage(message));
 		sb.append("Resolved arguments: \n");
-		for (int i=0; i < resolvedArgs.length; i++) {
+		for (int i = 0; i < resolvedArgs.length; i++) {
 			sb.append("[").append(i).append("] ");
 			if (resolvedArgs[i] == null) {
 				sb.append("[null] \n");
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java b/spring-web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java
index 721ccf0bf6..8bab1a7dd1 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,9 +44,9 @@
  */
 public class ModelAndViewContainer {
 
-	private Object view;
+	private boolean ignoreDefaultModelOnRedirect = false;
 
-	private boolean requestHandled = false;
+	private Object view;
 
 	private final ModelMap defaultModel = new BindingAwareModelMap();
 
@@ -54,14 +54,25 @@ public class ModelAndViewContainer {
 
 	private boolean redirectModelScenario = false;
 
-	private boolean ignoreDefaultModelOnRedirect = false;
-
 	private final SessionStatus sessionStatus = new SimpleSessionStatus();
 
+	private boolean requestHandled = false;
+
+
 	/**
-	 * Create a new instance.
+	 * By default the content of the "default" model is used both during
+	 * rendering and redirect scenarios. Alternatively controller methods
+	 * can declare an argument of type {@code RedirectAttributes} and use
+	 * it to provide attributes to prepare the redirect URL.
+	 * <p>Setting this flag to {@code true} guarantees the "default" model is
+	 * never used in a redirect scenario even if a RedirectAttributes argument
+	 * is not declared. Setting it to {@code false} means the "default" model
+	 * may be used in a redirect if the controller method doesn't declare a
+	 * RedirectAttributes argument.
+	 * <p>The default setting is {@code false}.
 	 */
-	public ModelAndViewContainer() {
+	public void setIgnoreDefaultModelOnRedirect(boolean ignoreDefaultModelOnRedirect) {
+		this.ignoreDefaultModelOnRedirect = ignoreDefaultModelOnRedirect;
 	}
 
 	/**
@@ -105,39 +116,20 @@ public boolean isViewReference() {
 	}
 
 	/**
-	 * Signal a scenario where the request is handled directly.
-	 * <p>A {@link HandlerMethodReturnValueHandler} may use this flag to
-	 * indicate the response has been fully handled and view resolution
-	 * is not required (e.g. {@code @ResponseBody}).
-	 * <p>A {@link HandlerMethodArgumentResolver} may also use this flag
-	 * to indicate the presence of an argument (e.g.
-	 * {@code ServletResponse} or {@code OutputStream}) that may lead to
-	 * a complete response depending on the method return value.
-	 * <p>The default value is {@code true}.
-	 */
-	public void setRequestHandled(boolean requestHandled) {
-		this.requestHandled = requestHandled;
-	}
-
-	/**
-	 * Whether the request is handled directly.
-	 */
-	public boolean isRequestHandled() {
-		return this.requestHandled;
-	}
-
-	/**
-	 * Return the model to use: the "default" or the "redirect" model.
-	 * <p>The default model is used if {@code "redirectModelScenario=false"} or
-	 * if the redirect model is {@code null} (i.e. it wasn't declared as a
-	 * method argument) and {@code ignoreDefaultModelOnRedirect=false}.
+	 * Return the model to use: either the "default" or the "redirect" model.
+	 * The default model is used if {@code redirectModelScenario=false} or
+	 * there is no redirect model (i.e. RedirectAttributes was not declared as
+	 * a method argument) and {@code ignoreDefaultModelOnRedirect=false}.
 	 */
 	public ModelMap getModel() {
 		if (useDefaultModel()) {
 			return this.defaultModel;
 		}
 		else {
-			return (this.redirectModel != null) ? this.redirectModel : new ModelMap();
+			if (this.redirectModel == null) {
+				this.redirectModel = new ModelMap();
+			}
+			return this.redirectModel;
 		}
 	}
 
@@ -145,7 +137,7 @@ public ModelMap getModel() {
 	 * Whether to use the default model or the redirect model.
 	 */
 	private boolean useDefaultModel() {
-		return !this.redirectModelScenario || ((this.redirectModel == null) && !this.ignoreDefaultModelOnRedirect);
+		return (!this.redirectModelScenario || (this.redirectModel == null && !this.ignoreDefaultModelOnRedirect));
 	}
 
 	/**
@@ -159,31 +151,37 @@ public void setRedirectModel(ModelMap redirectModel) {
 	}
 
 	/**
-	 * Signal the conditions are in place for using a redirect model.
-	 * Typically that means the controller has returned a redirect instruction.
+	 * Whether the controller has returned a redirect instruction, e.g. a
+	 * "redirect:" prefixed view name, a RedirectView instance, etc.
 	 */
 	public void setRedirectModelScenario(boolean redirectModelScenario) {
 		this.redirectModelScenario = redirectModelScenario;
 	}
 
 	/**
-	 * When set to {@code true} the default model is never used in a redirect
-	 * scenario. So if a redirect model is not available, an empty model is
-	 * used instead.
-	 * <p>When set to {@code false} the default model can be used in a redirect
-	 * scenario if a redirect model is not available.
-	 * <p>The default setting is {@code false}.
+	 * Return the {@link SessionStatus} instance to use that can be used to
+	 * signal that session processing is complete.
 	 */
-	public void setIgnoreDefaultModelOnRedirect(boolean ignoreDefaultModelOnRedirect) {
-		this.ignoreDefaultModelOnRedirect = ignoreDefaultModelOnRedirect;
+	public SessionStatus getSessionStatus() {
+		return this.sessionStatus;
 	}
 
 	/**
-	 * Return the {@link SessionStatus} instance to use that can be used to
-	 * signal that session processing is complete.
+	 * Whether the request has been handled fully within the handler, e.g.
+	 * {@code @ResponseBody} method, and therefore view resolution is not
+	 * necessary. This flag can also be set when controller methods declare an
+	 * argument of type {@code ServletResponse} or {@code OutputStream}).
+	 * <p>The default value is {@code false}.
 	 */
-	public SessionStatus getSessionStatus() {
-		return sessionStatus;
+	public void setRequestHandled(boolean requestHandled) {
+		this.requestHandled = requestHandled;
+	}
+
+	/**
+	 * Whether the request has been handled fully within the handler.
+	 */
+	public boolean isRequestHandled() {
+		return this.requestHandled;
 	}
 
 	/**
@@ -243,6 +241,7 @@ public boolean containsAttribute(String name) {
 		return getModel().containsAttribute(name);
 	}
 
+
 	/**
 	 * Return diagnostic information.
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java b/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java
index 36eb573b57..fce2453446 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public MaxUploadSizeExceededException(long maxUploadSize, Throwable ex) {
 	 * Return the maximum upload size allowed.
 	 */
 	public long getMaxUploadSize() {
-		return maxUploadSize;
+		return this.maxUploadSize;
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
index 86f73591a4..4d4a04503e 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,6 +94,9 @@ public interface MultipartFile {
 	 * <p>If the file has been moved in the filesystem, this operation cannot
 	 * be invoked again. Therefore, call this method just once to be able to
 	 * work with any storage mechanism.
+	 * <p><strong>Note:</strong> when using Servlet 3.0 multipart support you
+	 * need to configure the location relative to which files will be copied
+	 * as explained in {@link javax.servlet.http.Part#write}.
 	 * @param dest the destination file
 	 * @throws IOException in case of reading or writing errors
 	 * @throws IllegalStateException if the file has already been moved
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
index 3fd05f9151..79898d9646 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,10 @@
  *
  * <p>There are two concrete implementations included in Spring, as of Spring 3.1:
  * <ul>
- * <li>{@link org.springframework.web.multipart.commons.CommonsMultipartResolver} for Jakarta Commons FileUpload
- * <li>{@link org.springframework.web.multipart.support.StandardServletMultipartResolver} for Servlet 3.0 Part API
+ * <li>{@link org.springframework.web.multipart.commons.CommonsMultipartResolver}
+ * for Apache Commons FileUpload
+ * <li>{@link org.springframework.web.multipart.support.StandardServletMultipartResolver}
+ * for the Servlet 3.0+ Part API
  * </ul>
  *
  * <p>There is no default resolver implementation used for Spring
@@ -38,14 +40,11 @@
  * application context. Such a resolver gets applied to all requests handled
  * by that {@link org.springframework.web.servlet.DispatcherServlet}.
  *
- * <p>If a {@link org.springframework.web.servlet.DispatcherServlet} detects
- * a multipart request, it will resolve it via the configured
- * {@link MultipartResolver} and pass on a
- * wrapped {@link javax.servlet.http.HttpServletRequest}.
- * Controllers can then cast their given request to the
- * {@link MultipartHttpServletRequest}
- * interface, which permits access to any
- * {@link MultipartFile MultipartFiles}.
+ * <p>If a {@link org.springframework.web.servlet.DispatcherServlet} detects a
+ * multipart request, it will resolve it via the configured {@link MultipartResolver}
+ * and pass on a wrapped {@link javax.servlet.http.HttpServletRequest}. Controllers
+ * can then cast their given request to the {@link MultipartHttpServletRequest}
+ * interface, which allows for access to any {@link MultipartFile MultipartFiles}.
  * Note that this cast is only supported in case of an actual multipart request.
  *
  * <pre class="code">
@@ -58,23 +57,19 @@
  * Instead of direct access, command or form controllers can register a
  * {@link org.springframework.web.multipart.support.ByteArrayMultipartFileEditor}
  * or {@link org.springframework.web.multipart.support.StringMultipartFileEditor}
- * with their data binder, to automatically apply multipart content to command
+ * with their data binder, to automatically apply multipart content to form
  * bean properties.
  *
- * <p>As an alternative to using a
- * {@link MultipartResolver} with a
+ * <p>As an alternative to using a {@link MultipartResolver} with a
  * {@link org.springframework.web.servlet.DispatcherServlet},
  * a {@link org.springframework.web.multipart.support.MultipartFilter} can be
  * registered in {@code web.xml}. It will delegate to a corresponding
- * {@link MultipartResolver} bean in the root
- * application context. This is mainly intended for applications that do not
- * use Spring's own web MVC framework.
+ * {@link MultipartResolver} bean in the root application context. This is mainly
+ * intended for applications that do not use Spring's own web MVC framework.
  *
- * <p>Note: There is hardly ever a need to access the
- * {@link MultipartResolver} itself
- * from application code. It will simply do its work behind the scenes,
- * making
- * {@link MultipartHttpServletRequest MultipartHttpServletRequests}
+ * <p>Note: There is hardly ever a need to access the {@link MultipartResolver}
+ * itself from application code. It will simply do its work behind the scenes,
+ * making {@link MultipartHttpServletRequest MultipartHttpServletRequests}
  * available to controllers.
  *
  * @author Juergen Hoeller
@@ -101,8 +96,8 @@ public interface MultipartResolver {
 	/**
 	 * Parse the given HTTP request into multipart files and parameters,
 	 * and wrap the request inside a
-	 * {@link org.springframework.web.multipart.MultipartHttpServletRequest} object
-	 * that provides access to file descriptors and makes contained
+	 * {@link org.springframework.web.multipart.MultipartHttpServletRequest}
+	 * object that provides access to file descriptors and makes contained
 	 * parameters accessible via the standard ServletRequest methods.
 	 * @param request the servlet request to wrap (must be of a multipart content type)
 	 * @return the wrapped servlet request
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
index e05e110a7d..f6e6f6c6bc 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * Base class for multipart resolvers that use Jakarta Commons FileUpload
+ * Base class for multipart resolvers that use Apache Commons FileUpload
  * 1.2 or above.
  *
  * <p>Provides common configuration properties and parsing functionality
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java
index ae9ae6ecf1..546f7252c4 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
+
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.disk.DiskFileItem;
@@ -30,7 +31,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 /**
- * MultipartFile implementation for Jakarta Commons FileUpload.
+ * {@link MultipartFile} implementation for Apache Commons FileUpload.
  *
  * @author Trevor D. Cook
  * @author Juergen Hoeller
@@ -56,6 +57,7 @@ public CommonsMultipartFile(FileItem fileItem) {
 		this.size = this.fileItem.getSize();
 	}
 
+
 	/**
 	 * Return the underlying {@code org.apache.commons.fileupload.FileItem}
 	 * instance. There is hardly any need to access this.
@@ -75,18 +77,19 @@ public String getOriginalFilename() {
 			// Should never happen.
 			return "";
 		}
-		// check for Unix-style path
-		int pos = filename.lastIndexOf("/");
-		if (pos == -1) {
-			// check for Windows-style path
-			pos = filename.lastIndexOf("\\");
-		}
+
+		// Check for Unix-style path
+		int unixSep = filename.lastIndexOf("/");
+		// Check for Windows-style path
+		int winSep = filename.lastIndexOf("\\");
+		// Cut off at latest possible point
+		int pos = (winSep > unixSep ? winSep : unixSep);
 		if (pos != -1)  {
-			// any sort of path separator found
+			// Any sort of path separator found...
 			return filename.substring(pos + 1);
 		}
 		else {
-			// plain name
+			// A plain name
 			return filename;
 		}
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
index 25f743befc..80f266ed26 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,8 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * Servlet-based {@link org.springframework.web.multipart.MultipartResolver} implementation
- * for <a href="http://jakarta.apache.org/commons/fileupload">Jakarta Commons FileUpload</a>
+ * Servlet-based {@link MultipartResolver} implementation for
+ * <a href="http://commons.apache.org/proper/commons-fileupload">Apache Commons FileUpload</a>
  * 1.2 or above.
  *
  * <p>Provides "maxUploadSize", "maxInMemorySize" and "defaultEncoding" settings as
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
index 931eaf305a..001283a1fe 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/package-info.java
@@ -1,9 +1,5 @@
-
 /**
- *
  * MultipartResolver implementation for
- * <a href="http://jakarta.apache.org/commons/fileupload">Jakarta Commons FileUpload</a>.
- *
+ * <a href="http://commons.apache.org/proper/commons-fileupload">Apache Commons FileUpload</a>.
  */
 package org.springframework.web.multipart.commons;
-
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
index ee0a9b7f65..1a9a96e045 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
 
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
@@ -33,6 +33,8 @@
  * {@link org.springframework.web.multipart.MultipartHttpServletRequest}
  * interface. Provides management of pre-generated parameter values.
  *
+ * <p>Used by {@link org.springframework.web.multipart.commons.CommonsMultipartResolver}.
+ *
  * @author Trevor D. Cook
  * @author Juergen Hoeller
  * @author Arjen Poutsma
@@ -73,17 +75,6 @@ public DefaultMultipartHttpServletRequest(HttpServletRequest request) {
 	}
 
 
-	@Override
-	public Enumeration<String> getParameterNames() {
-		Set<String> paramNames = new HashSet<String>();
-		Enumeration paramEnum = super.getParameterNames();
-		while (paramEnum.hasMoreElements()) {
-			paramNames.add((String) paramEnum.nextElement());
-		}
-		paramNames.addAll(getMultipartParameters().keySet());
-		return Collections.enumeration(paramNames);
-	}
-
 	@Override
 	public String getParameter(String name) {
 		String[] values = getMultipartParameters().get(name);
@@ -102,11 +93,32 @@ public String[] getParameterValues(String name) {
 		return super.getParameterValues(name);
 	}
 
+	@Override
+	public Enumeration<String> getParameterNames() {
+		Map<String, String[]> multipartParameters = getMultipartParameters();
+		if (multipartParameters.isEmpty()) {
+			return super.getParameterNames();
+		}
+
+		Set<String> paramNames = new LinkedHashSet<String>();
+		Enumeration<String> paramEnum = super.getParameterNames();
+		while (paramEnum.hasMoreElements()) {
+			paramNames.add(paramEnum.nextElement());
+		}
+		paramNames.addAll(multipartParameters.keySet());
+		return Collections.enumeration(paramNames);
+	}
+
 	@Override
 	public Map<String, String[]> getParameterMap() {
-		Map<String, String[]> paramMap = new HashMap<String, String[]>();
+		Map<String, String[]> multipartParameters = getMultipartParameters();
+		if (multipartParameters.isEmpty()) {
+			return super.getParameterMap();
+		}
+
+		Map<String, String[]> paramMap = new LinkedHashMap<String, String[]>();
 		paramMap.putAll(super.getParameterMap());
-		paramMap.putAll(getMultipartParameters());
+		paramMap.putAll(multipartParameters);
 		return paramMap;
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java b/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
index b78ad775f9..db70bfae0d 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,9 +34,7 @@
  *
  * <p>Looks up the MultipartResolver in Spring's root web application context.
  * Supports a "multipartResolverBeanName" filter init-param in {@code web.xml};
- * the default bean name is "filterMultipartResolver". Looks up the MultipartResolver
- * on each request, to avoid initialization order issues (when using ContextLoaderServlet,
- * the root application context will get initialized <i>after</i> this filter).
+ * the default bean name is "filterMultipartResolver".
  *
  * <p>If no MultipartResolver bean is found, this filter falls back to a default
  * MultipartResolver: {@link StandardServletMultipartResolver} for Servlet 3.0,
@@ -110,6 +108,7 @@ protected void doFilterInternal(
 			processedRequest = multipartResolver.resolveMultipart(processedRequest);
 		}
 		else {
+			// A regular request...
 			if (logger.isDebugEnabled()) {
 				logger.debug("Request [" + processedRequest.getRequestURI() + "] is not a multipart request");
 			}
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
index 38287b4f95..c8c9146d46 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,15 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.Part;
 
@@ -45,22 +52,47 @@ public class StandardMultipartHttpServletRequest extends AbstractMultipartHttpSe
 
 	private static final String FILENAME_KEY = "filename=";
 
+	private Set<String> multipartParameterNames;
+
 
 	/**
-	 * Create a new StandardMultipartHttpServletRequest wrapper for the given request.
+	 * Create a new StandardMultipartHttpServletRequest wrapper for the given request,
+	 * immediately parsing the multipart content.
 	 * @param request the servlet request to wrap
 	 * @throws MultipartException if parsing failed
 	 */
 	public StandardMultipartHttpServletRequest(HttpServletRequest request) throws MultipartException {
+		this(request, false);
+	}
+
+	/**
+	 * Create a new StandardMultipartHttpServletRequest wrapper for the given request.
+	 * @param request the servlet request to wrap
+	 * @param lazyParsing whether multipart parsing should be triggered lazily on
+	 * first access of multipart files or parameters
+	 * @throws MultipartException if an immediate parsing attempt failed
+	 */
+	public StandardMultipartHttpServletRequest(HttpServletRequest request, boolean lazyParsing) throws MultipartException {
 		super(request);
+		if (!lazyParsing) {
+			parseRequest(request);
+		}
+	}
+
+
+	private void parseRequest(HttpServletRequest request) {
 		try {
 			Collection<Part> parts = request.getParts();
+			this.multipartParameterNames = new LinkedHashSet<String>(parts.size());
 			MultiValueMap<String, MultipartFile> files = new LinkedMultiValueMap<String, MultipartFile>(parts.size());
 			for (Part part : parts) {
 				String filename = extractFilename(part.getHeader(CONTENT_DISPOSITION));
 				if (filename != null) {
 					files.add(part.getName(), new StandardMultipartFile(part, filename));
 				}
+				else {
+					this.multipartParameterNames.add(part.getName());
+				}
 			}
 			setMultipartFiles(files);
 		}
@@ -95,6 +127,53 @@ private String extractFilename(String contentDisposition) {
 	}
 
 
+	@Override
+	protected void initializeMultipart() {
+		parseRequest(getRequest());
+	}
+
+	@Override
+	public Enumeration<String> getParameterNames() {
+		if (this.multipartParameterNames == null) {
+			initializeMultipart();
+		}
+		if (this.multipartParameterNames.isEmpty()) {
+			return super.getParameterNames();
+		}
+
+		// Servlet 3.0 getParameterNames() not guaranteed to include multipart form items
+		// (e.g. on WebLogic 12) -> need to merge them here to be on the safe side
+		Set<String> paramNames = new LinkedHashSet<String>();
+		Enumeration<String> paramEnum = super.getParameterNames();
+		while (paramEnum.hasMoreElements()) {
+			paramNames.add(paramEnum.nextElement());
+		}
+		paramNames.addAll(this.multipartParameterNames);
+		return Collections.enumeration(paramNames);
+	}
+
+	@Override
+	public Map<String, String[]> getParameterMap() {
+		if (this.multipartParameterNames == null) {
+			initializeMultipart();
+		}
+		if (this.multipartParameterNames.isEmpty()) {
+			return super.getParameterMap();
+		}
+
+		// Servlet 3.0 getParameterMap() not guaranteed to include multipart form items
+		// (e.g. on WebLogic 12) -> need to merge them here to be on the safe side
+		Map<String, String[]> paramMap = new LinkedHashMap<String, String[]>();
+		paramMap.putAll(super.getParameterMap());
+		for (String paramName : this.multipartParameterNames) {
+			if (!paramMap.containsKey(paramName)) {
+				paramMap.put(paramName, getParameterValues(paramName));
+			}
+		}
+		return paramMap;
+	}
+
+	@Override
 	public String getMultipartContentType(String paramOrFileName) {
 		try {
 			Part part = getPart(paramOrFileName);
@@ -128,7 +207,8 @@ public HttpHeaders getMultipartHeaders(String paramOrFileName) {
 	/**
 	 * Spring MultipartFile adapter, wrapping a Servlet 3.0 Part object.
 	 */
-	private static class StandardMultipartFile implements MultipartFile {
+	@SuppressWarnings("serial")
+	private static class StandardMultipartFile implements MultipartFile, Serializable {
 
 		private final Part part;
 
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
index f2b564e1c6..368791e14a 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +45,23 @@
  */
 public class StandardServletMultipartResolver implements MultipartResolver {
 
+	private boolean resolveLazily = false;
+
+
+	/**
+	 * Set whether to resolve the multipart request lazily at the time of
+	 * file or parameter access.
+	 * <p>Default is "false", resolving the multipart elements immediately, throwing
+	 * corresponding exceptions at the time of the {@link #resolveMultipart} call.
+	 * Switch this to "true" for lazy multipart parsing, throwing parse exceptions
+	 * once the application attempts to obtain multipart files or parameters.
+	 */
+	public void setResolveLazily(boolean resolveLazily) {
+		this.resolveLazily = resolveLazily;
+	}
+
+
+	@Override
 	public boolean isMultipart(HttpServletRequest request) {
 		// Same check as in Commons FileUpload...
 		if (!"post".equals(request.getMethod().toLowerCase())) {
@@ -55,7 +72,7 @@ public boolean isMultipart(HttpServletRequest request) {
 	}
 
 	public MultipartHttpServletRequest resolveMultipart(HttpServletRequest request) throws MultipartException {
-		return new StandardMultipartHttpServletRequest(request);
+		return new StandardMultipartHttpServletRequest(request, this.resolveLazily);
 	}
 
 	public void cleanupMultipart(MultipartHttpServletRequest request) {
diff --git a/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java b/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
index c9662a365b..c79a59e6a2 100644
--- a/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
+++ b/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,15 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.util.Assert;
+
 /**
  * Helper class for cookie generation, carrying cookie descriptor settings
  * as bean properties and being able to add and remove cookie to/from a
  * given response.
  *
  * <p>Can serve as base class for components that generate specific cookies,
- * like CookieLocaleResolcer and CookieThemeResolver.
+ * such as CookieLocaleResolver and CookieThemeResolver.
  *
  * @author Juergen Hoeller
  * @since 1.1.4
@@ -177,6 +179,7 @@ public boolean isCookieHttpOnly() {
 	 * @see #setCookieMaxAge
 	 */
 	public void addCookie(HttpServletResponse response, String cookieValue) {
+		Assert.notNull(response, "HttpServletResponse must not be null");
 		Cookie cookie = createCookie(cookieValue);
 		Integer maxAge = getCookieMaxAge();
 		if (maxAge != null) {
@@ -204,6 +207,7 @@ public void addCookie(HttpServletResponse response, String cookieValue) {
 	 * @see #setCookiePath
 	 */
 	public void removeCookie(HttpServletResponse response) {
+		Assert.notNull(response, "HttpServletResponse must not be null");
 		Cookie cookie = createCookie("");
 		cookie.setMaxAge(0);
 		response.addCookie(cookie);
diff --git a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
index 60e67878b3..a5ccdefa88 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -176,15 +176,14 @@ public MultiValueMap<String, String> getQueryParams() {
 	 */
 	@Override
 	public HierarchicalUriComponents encode(String encoding) throws UnsupportedEncodingException {
-		Assert.hasLength(encoding, "'encoding' must not be empty");
-
+		Assert.hasLength(encoding, "Encoding must not be empty");
 		if (this.encoded) {
 			return this;
 		}
-
-		String encodedScheme = encodeUriComponent(this.getScheme(), encoding, Type.SCHEME);
+		String encodedScheme = encodeUriComponent(getScheme(), encoding, Type.SCHEME);
 		String encodedUserInfo = encodeUriComponent(this.userInfo, encoding, Type.USER_INFO);
 		String encodedHost = encodeUriComponent(this.host, encoding, Type.HOST);
+
 		PathComponent encodedPath = this.path.encode(encoding);
 		MultiValueMap<String, String> encodedQueryParams =
 				new LinkedMultiValueMap<String, String>(this.queryParams.size());
@@ -198,7 +197,6 @@ public HierarchicalUriComponents encode(String encoding) throws UnsupportedEncod
 			encodedQueryParams.put(encodedName, encodedValues);
 		}
 		String encodedFragment = encodeUriComponent(this.getFragment(), encoding, Type.FRAGMENT);
-
 		return new HierarchicalUriComponents(encodedScheme, encodedUserInfo, encodedHost, this.port, encodedPath,
 				encodedQueryParams, encodedFragment, true, false);
 	}
@@ -212,25 +210,20 @@ public HierarchicalUriComponents encode(String encoding) throws UnsupportedEncod
 	 * @return the encoded URI
 	 * @throws IllegalArgumentException when the given uri parameter is not a valid URI
 	 */
-	static String encodeUriComponent(String source, String encoding, Type type)
-			throws UnsupportedEncodingException {
-
+	static String encodeUriComponent(String source, String encoding, Type type) throws UnsupportedEncodingException {
 		if (source == null) {
 			return null;
 		}
-
-		Assert.hasLength(encoding, "'encoding' must not be empty");
-
+		Assert.hasLength(encoding, "Encoding must not be empty");
 		byte[] bytes = encodeBytes(source.getBytes(encoding), type);
 		return new String(bytes, "US-ASCII");
 	}
 
 	private static byte[] encodeBytes(byte[] source, Type type) {
-		Assert.notNull(source, "'source' must not be null");
-		Assert.notNull(type, "'type' must not be null");
+		Assert.notNull(source, "Source must not be null");
+		Assert.notNull(type, "Type must not be null");
 		ByteArrayOutputStream bos = new ByteArrayOutputStream(source.length);
-		for (int i = 0; i < source.length; i++) {
-			int b = source[i];
+		for (byte b : source) {
 			if (b < 0) {
 				b += 256;
 			}
@@ -261,8 +254,8 @@ private void verify() {
 			return;
 		}
 		verifyUriComponent(getScheme(), Type.SCHEME);
-		verifyUriComponent(userInfo, Type.USER_INFO);
-		verifyUriComponent(host, Type.HOST);
+		verifyUriComponent(this.userInfo, Type.USER_INFO);
+		verifyUriComponent(this.host, Type.HOST);
 		this.path.verify();
 		for (Map.Entry<String, List<String>> entry : queryParams.entrySet()) {
 			verifyUriComponent(entry.getKey(), Type.QUERY_PARAM);
@@ -277,9 +270,7 @@ private static void verifyUriComponent(String source, Type type) {
 		if (source == null) {
 			return;
 		}
-
 		int length = source.length();
-
 		for (int i=0; i < length; i++) {
 			char ch = source.charAt(i);
 			if (ch == '%') {
@@ -309,9 +300,8 @@ else if (!type.isAllowed(ch)) {
 
 	@Override
 	protected HierarchicalUriComponents expandInternal(UriTemplateVariables uriVariables) {
-		Assert.state(!encoded, "Cannot expand an already encoded UriComponents object");
-
-		String expandedScheme = expandUriComponent(this.getScheme(), uriVariables);
+		Assert.state(!this.encoded, "Cannot expand an already encoded UriComponents object");
+		String expandedScheme = expandUriComponent(getScheme(), uriVariables);
 		String expandedUserInfo = expandUriComponent(this.userInfo, uriVariables);
 		String expandedHost = expandUriComponent(this.host, uriVariables);
 		PathComponent expandedPath = this.path.expand(uriVariables);
@@ -327,7 +317,6 @@ protected HierarchicalUriComponents expandInternal(UriTemplateVariables uriVaria
 			expandedQueryParams.put(expandedName, expandedValues);
 		}
 		String expandedFragment = expandUriComponent(this.getFragment(), uriVariables);
-
 		return new HierarchicalUriComponents(expandedScheme, expandedUserInfo, expandedHost, this.port, expandedPath,
 				expandedQueryParams, expandedFragment, false, false);
 	}
@@ -353,12 +342,10 @@ this.port, new FullPathComponent(normalizedPath), this.queryParams,
 	@Override
 	public String toUriString() {
 		StringBuilder uriBuilder = new StringBuilder();
-
 		if (getScheme() != null) {
 			uriBuilder.append(getScheme());
 			uriBuilder.append(':');
 		}
-
 		if (this.userInfo != null || this.host != null) {
 			uriBuilder.append("//");
 			if (this.userInfo != null) {
@@ -373,7 +360,6 @@ public String toUriString() {
 				uriBuilder.append(port);
 			}
 		}
-
 		String path = getPath();
 		if (StringUtils.hasLength(path)) {
 			if (uriBuilder.length() != 0 && path.charAt(0) != PATH_DELIMITER) {
@@ -381,18 +367,15 @@ public String toUriString() {
 			}
 			uriBuilder.append(path);
 		}
-
 		String query = getQuery();
 		if (query != null) {
 			uriBuilder.append('?');
 			uriBuilder.append(query);
 		}
-
 		if (getFragment() != null) {
 			uriBuilder.append('#');
 			uriBuilder.append(getFragment());
 		}
-
 		return uriBuilder.toString();
 	}
 
@@ -409,7 +392,7 @@ public URI toUri() {
 				String path = getPath();
 				if (StringUtils.hasLength(path) && path.charAt(0) != PATH_DELIMITER) {
 					// Only prefix the path delimiter if something exists before it
-					if(getScheme() != null || getUserInfo() != null || getHost() != null || getPort() != -1) {
+					if (getScheme() != null || getUserInfo() != null || getHost() != null || getPort() != -1) {
 						path = PATH_DELIMITER + path;
 					}
 				}
@@ -431,15 +414,13 @@ public boolean equals(Object obj) {
 			return false;
 		}
 		HierarchicalUriComponents other = (HierarchicalUriComponents) obj;
-		boolean rtn = true;
-		rtn &= ObjectUtils.nullSafeEquals(getScheme(), other.getScheme());
-		rtn &= ObjectUtils.nullSafeEquals(getUserInfo(), other.getUserInfo());
-		rtn &= ObjectUtils.nullSafeEquals(getHost(), other.getHost());
-		rtn &= getPort() == other.getPort();
-		rtn &= this.path.equals(other.path);
-		rtn &= this.queryParams.equals(other.queryParams);
-		rtn &= ObjectUtils.nullSafeEquals(getFragment(), other.getFragment());
-		return rtn;
+		return ObjectUtils.nullSafeEquals(getScheme(), other.getScheme()) &&
+				ObjectUtils.nullSafeEquals(getUserInfo(), other.getUserInfo()) &&
+				ObjectUtils.nullSafeEquals(getHost(), other.getHost()) &&
+				getPort() == other.getPort() &&
+				this.path.equals(other.path) &&
+				this.queryParams.equals(other.queryParams) &&
+				ObjectUtils.nullSafeEquals(getFragment(), other.getFragment());
 	}
 
 	@Override
@@ -532,15 +513,12 @@ public boolean isAllowed(int c) {
 
 		/**
 		 * Indicates whether the given character is allowed in this URI component.
-		 *
-		 * @param c the character
 		 * @return {@code true} if the character is allowed; {@code false} otherwise
 		 */
 		public abstract boolean isAllowed(int c);
 
 		/**
 		 * Indicates whether the given character is in the {@code ALPHA} set.
-		 *
 		 * @see <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986, appendix A</a>
 		 */
 		protected boolean isAlpha(int c) {
@@ -549,7 +527,6 @@ protected boolean isAlpha(int c) {
 
 		/**
 		 * Indicates whether the given character is in the {@code DIGIT} set.
-		 *
 		 * @see <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986, appendix A</a>
 		 */
 		protected boolean isDigit(int c) {
@@ -558,7 +535,6 @@ protected boolean isDigit(int c) {
 
 		/**
 		 * Indicates whether the given character is in the {@code gen-delims} set.
-		 *
 		 * @see <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986, appendix A</a>
 		 */
 		protected boolean isGenericDelimiter(int c) {
@@ -567,7 +543,6 @@ protected boolean isGenericDelimiter(int c) {
 
 		/**
 		 * Indicates whether the given character is in the {@code sub-delims} set.
-		 *
 		 * @see <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986, appendix A</a>
 		 */
 		protected boolean isSubDelimiter(int c) {
@@ -577,7 +552,6 @@ protected boolean isSubDelimiter(int c) {
 
 		/**
 		 * Indicates whether the given character is in the {@code reserved} set.
-		 *
 		 * @see <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986, appendix A</a>
 		 */
 		protected boolean isReserved(char c) {
@@ -586,7 +560,6 @@ protected boolean isReserved(char c) {
 
 		/**
 		 * Indicates whether the given character is in the {@code unreserved} set.
-		 *
 		 * @see <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986, appendix A</a>
 		 */
 		protected boolean isUnreserved(int c) {
@@ -595,7 +568,6 @@ protected boolean isUnreserved(int c) {
 
 		/**
 		 * Indicates whether the given character is in the {@code pchar} set.
-		 *
 		 * @see <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986, appendix A</a>
 		 */
 		protected boolean isPchar(int c) {
@@ -624,16 +596,16 @@ interface PathComponent extends Serializable {
 	/**
 	 * Represents a path backed by a string.
 	 */
-	final static class FullPathComponent implements PathComponent {
+	static final class FullPathComponent implements PathComponent {
 
 		private final String path;
 
-		FullPathComponent(String path) {
+		public FullPathComponent(String path) {
 			this.path = path;
 		}
 
 		public String getPath() {
-			return path;
+			return this.path;
 		}
 
 		public List<String> getPathSegments() {
@@ -668,15 +640,16 @@ public int hashCode() {
 		}
 	}
 
+
 	/**
 	 * Represents a path backed by a string list (i.e. path segments).
 	 */
-	final static class PathSegmentComponent implements PathComponent {
+	static final class PathSegmentComponent implements PathComponent {
 
 		private final List<String> pathSegments;
 
-		PathSegmentComponent(List<String> pathSegments) {
-			this.pathSegments = Collections.unmodifiableList(pathSegments);
+		public PathSegmentComponent(List<String> pathSegments) {
+			this.pathSegments = Collections.unmodifiableList(new ArrayList<String>(pathSegments));
 		}
 
 		public String getPath() {
@@ -732,17 +705,17 @@ public boolean equals(Object obj) {
 		public int hashCode() {
 			return getPathSegments().hashCode();
 		}
-
 	}
 
+
 	/**
 	 * Represents a collection of PathComponents.
 	 */
-	final static class PathComponentComposite implements PathComponent {
+	static final class PathComponentComposite implements PathComponent {
 
 		private final List<PathComponent> pathComponents;
 
-		PathComponentComposite(List<PathComponent> pathComponents) {
+		public PathComponentComposite(List<PathComponent> pathComponents) {
 			this.pathComponents = pathComponents;
 		}
 
@@ -763,15 +736,15 @@ public List<String> getPathSegments() {
 		}
 
 		public PathComponent encode(String encoding) throws UnsupportedEncodingException {
-			List<PathComponent> encodedComponents = new ArrayList<PathComponent>(pathComponents.size());
-			for (PathComponent pathComponent : pathComponents) {
+			List<PathComponent> encodedComponents = new ArrayList<PathComponent>(this.pathComponents.size());
+			for (PathComponent pathComponent : this.pathComponents) {
 				encodedComponents.add(pathComponent.encode(encoding));
 			}
 			return new PathComponentComposite(encodedComponents);
 		}
 
 		public void verify() {
-			for (PathComponent pathComponent : pathComponents) {
+			for (PathComponent pathComponent : this.pathComponents) {
 				pathComponent.verify();
 			}
 		}
@@ -786,41 +759,32 @@ public PathComponent expand(UriTemplateVariables uriVariables) {
 	}
 
 
-
 	/**
 	 * Represents an empty path.
 	 */
-	final static PathComponent NULL_PATH_COMPONENT = new PathComponent() {
-
+	static final PathComponent NULL_PATH_COMPONENT = new PathComponent() {
 		public String getPath() {
 			return null;
 		}
-
 		public List<String> getPathSegments() {
 			return Collections.emptyList();
 		}
-
 		public PathComponent encode(String encoding) throws UnsupportedEncodingException {
 			return this;
 		}
-
 		public void verify() {
 		}
-
 		public PathComponent expand(UriTemplateVariables uriVariables) {
 			return this;
 		}
-
 		@Override
 		public boolean equals(Object obj) {
 			return (this == obj);
 		}
-
 		@Override
 		public int hashCode() {
 			return 42;
 		}
-
 	};
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
index 2c93058c5b..067d1052f7 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
  * <a href="http://www.w3.org/TR/html4/charset.html">http://www.w3.org/TR/html4/charset.html</a>
  *
  * <p>For a comprehensive set of String escaping utilities,
- * consider Jakarta Commons Lang and its StringEscapeUtils class.
+ * consider Apache Commons Lang and its StringEscapeUtils class.
  * We are not using that class here to avoid a runtime dependency
  * on Commons Lang just for HTML escaping. Furthermore, Spring's
  * HTML escaping is more flexible and 100% HTML 4.0 compliant.
@@ -33,7 +33,6 @@
  * @author Juergen Hoeller
  * @author Martin Kersten
  * @since 01.03.2003
- * @see org.apache.commons.lang.StringEscapeUtils
  */
 public abstract class HtmlUtils {
 
diff --git a/spring-web/src/main/java/org/springframework/web/util/Log4jWebConfigurer.java b/spring-web/src/main/java/org/springframework/web/util/Log4jWebConfigurer.java
index 8b50ac6fda..5fe7a6ae09 100644
--- a/spring-web/src/main/java/org/springframework/web/util/Log4jWebConfigurer.java
+++ b/spring-web/src/main/java/org/springframework/web/util/Log4jWebConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 
 import org.springframework.util.Log4jConfigurer;
 import org.springframework.util.ResourceUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * Convenience class that performs custom log4j initialization for web environments,
@@ -126,8 +127,7 @@ public static void initLogging(ServletContext servletContext) {
 
 				// Leave a URL (e.g. "classpath:" or "file:") as-is.
 				if (!ResourceUtils.isUrl(location)) {
-					// Consider a plain file path as relative to the web
-					// application root directory.
+					// Consider a plain file path as relative to the web application root directory.
 					location = WebUtils.getRealPath(servletContext, location);
 				}
 
@@ -136,7 +136,7 @@ public static void initLogging(ServletContext servletContext) {
 
 				// Check whether refresh interval was specified.
 				String intervalString = servletContext.getInitParameter(REFRESH_INTERVAL_PARAM);
-				if (intervalString != null) {
+				if (StringUtils.hasText(intervalString)) {
 					// Initialize with refresh interval, i.e. with log4j's watchdog thread,
 					// checking the file in the background.
 					try {
diff --git a/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java
index 54d788d624..438ec0b1b7 100644
--- a/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java
+++ b/spring-web/src/main/java/org/springframework/web/util/OpaqueUriComponents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,11 +95,15 @@ public UriComponents encode(String encoding) throws UnsupportedEncodingException
 
 	@Override
 	protected UriComponents expandInternal(UriTemplateVariables uriVariables) {
-		String expandedScheme = expandUriComponent(this.getScheme(), uriVariables);
-		String expandedSSp = expandUriComponent(this.ssp, uriVariables);
-		String expandedFragment = expandUriComponent(this.getFragment(), uriVariables);
+		String expandedScheme = expandUriComponent(getScheme(), uriVariables);
+		String expandedSsp = expandUriComponent(getSchemeSpecificPart(), uriVariables);
+		String expandedFragment = expandUriComponent(getFragment(), uriVariables);
+		return new OpaqueUriComponents(expandedScheme, expandedSsp, expandedFragment);
+	}
 
-		return new OpaqueUriComponents(expandedScheme, expandedSSp, expandedFragment);
+	@Override
+	public UriComponents normalize() {
+		return this;
 	}
 
 	@Override
@@ -131,10 +135,6 @@ public URI toUri() {
 		}
 	}
 
-	@Override
-	public UriComponents normalize() {
-		return this;
-	}
 
 	@Override
 	public boolean equals(Object obj) {
@@ -146,11 +146,10 @@ public boolean equals(Object obj) {
 		}
 
 		OpaqueUriComponents other = (OpaqueUriComponents) obj;
-		boolean rtn = true;
-		rtn &= ObjectUtils.nullSafeEquals(getScheme(), other.getScheme());
-		rtn &= ObjectUtils.nullSafeEquals(this.ssp, other.ssp);
-		rtn &= ObjectUtils.nullSafeEquals(getFragment(), other.getFragment());
-		return rtn;
+		return ObjectUtils.nullSafeEquals(getScheme(), other.getScheme()) &&
+				ObjectUtils.nullSafeEquals(this.ssp, other.ssp) &&
+				ObjectUtils.nullSafeEquals(getFragment(), other.getFragment());
+
 	}
 
 	@Override
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponents.java b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java
index 2a2b300bfa..e6c631d3d8 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriComponents.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,15 +30,16 @@
 import org.springframework.util.MultiValueMap;
 
 /**
- * Represents an immutable collection of URI components, mapping component type to string
- * values. Contains convenience getters for all components. Effectively similar to {@link
- * java.net.URI}, but with more powerful encoding options and support for URI template
- * variables.
+ * Represents an immutable collection of URI components, mapping component type to
+ * String values. Contains convenience getters for all components. Effectively similar
+ * to {@link java.net.URI}, but with more powerful encoding options and support for
+ * URI template variables.
  *
  * @author Arjen Poutsma
  * @since 3.1
  * @see UriComponentsBuilder
  */
+@SuppressWarnings("serial")
 public abstract class UriComponents implements Serializable {
 
 	private static final String DEFAULT_ENCODING = "UTF-8";
@@ -64,7 +65,7 @@ protected UriComponents(String scheme, String fragment) {
 	 * Returns the scheme. Can be {@code null}.
 	 */
 	public final String getScheme() {
-		return scheme;
+		return this.scheme;
 	}
 
 	/**
@@ -115,19 +116,18 @@ public final String getFragment() {
 	}
 
 
-	// encoding
-
 	/**
-	 * Encode all URI components using their specific encoding rules, and returns the result
-	 * as a new {@code UriComponents} instance. This method uses UTF-8 to encode.
-	 * @return the encoded uri components
+	 * Encode all URI components using their specific encoding rules, and returns the
+	 * result as a new {@code UriComponents} instance. This method uses UTF-8 to encode.
+	 * @return the encoded URI components
 	 */
 	public final UriComponents encode() {
 		try {
 			return encode(DEFAULT_ENCODING);
 		}
-		catch (UnsupportedEncodingException e) {
-			throw new InternalError("\"" + DEFAULT_ENCODING + "\" not supported");
+		catch (UnsupportedEncodingException ex) {
+			// should not occur
+			throw new IllegalStateException(ex);
 		}
 	}
 
@@ -135,20 +135,17 @@ public final UriComponents encode() {
 	 * Encode all URI components using their specific encoding rules, and
 	 * returns the result as a new {@code UriComponents} instance.
 	 * @param encoding the encoding of the values contained in this map
-	 * @return the encoded uri components
+	 * @return the encoded URI components
 	 * @throws UnsupportedEncodingException if the given encoding is not supported
 	 */
 	public abstract UriComponents encode(String encoding) throws UnsupportedEncodingException;
 
-
-	// expanding
-
 	/**
-	 * Replaces all URI template variables with the values from a given map. The map keys
-	 * represent variable names; the values variable values. The order of variables is not
-	 * significant.
+	 * Replace all URI template variables with the values from a given map.
+	 * <p>The given map keys represent variable names; the corresponding values
+	 * represent variable values. The order of variables is not significant.
 	 * @param uriVariables the map of URI variables
-	 * @return the expanded uri components
+	 * @return the expanded URI components
 	 */
 	public final UriComponents expand(Map<String, ?> uriVariables) {
 		Assert.notNull(uriVariables, "'uriVariables' must not be null");
@@ -156,10 +153,10 @@ public final UriComponents expand(Map<String, ?> uriVariables) {
 	}
 
 	/**
-	 * Replaces all URI template variables with the values from a given array. The array
-	 * represent variable values. The order of variables is significant.
-	 * @param uriVariableValues URI variable values
-	 * @return the expanded uri components
+	 * Replace all URI template variables with the values from a given array.
+	 * <p>The given array represents variable values. The order of variables is significant.
+	 * @param uriVariableValues the URI variable values
+	 * @return the expanded URI components
 	 */
 	public final UriComponents expand(Object... uriVariableValues) {
 		Assert.notNull(uriVariableValues, "'uriVariableValues' must not be null");
@@ -167,13 +164,37 @@ public final UriComponents expand(Object... uriVariableValues) {
 	}
 
 	/**
-	 * Replaces all URI template variables with the values from the given {@link
-	 * UriTemplateVariables}
-	 * @param uriVariables URI template values
-	 * @return the expanded uri components
+	 * Replace all URI template variables with the values from the given
+	 * {@link UriTemplateVariables}.
+	 * @param uriVariables the URI template values
+	 * @return the expanded URI components
 	 */
 	abstract UriComponents expandInternal(UriTemplateVariables uriVariables);
 
+	/**
+	 * Normalize the path removing sequences like "path/..".
+	 * @see org.springframework.util.StringUtils#cleanPath(String)
+	 */
+	public abstract UriComponents normalize();
+
+	/**
+	 * Return a URI string from this {@code UriComponents} instance.
+	 */
+	public abstract String toUriString();
+
+	/**
+	 * Return a {@code URI} from this {@code UriComponents} instance.
+	 */
+	public abstract URI toUri();
+
+	@Override
+	public final String toString() {
+		return toUriString();
+	}
+
+
+	// static expansion helpers
+
 	static String expandUriComponent(String source, UriTemplateVariables uriVariables) {
 		if (source == null) {
 			return null;
@@ -197,34 +218,13 @@ static String expandUriComponent(String source, UriTemplateVariables uriVariable
 
 	private static String getVariableName(String match) {
 		int colonIdx = match.indexOf(':');
-		return colonIdx == -1 ? match : match.substring(0, colonIdx);
+		return (colonIdx != -1 ? match.substring(0, colonIdx) : match);
 	}
 
 	private static String getVariableValueAsString(Object variableValue) {
-		return variableValue != null ? variableValue.toString() : "";
-	}
-
-	/**
-	 * Returns a URI string from this {@code UriComponents} instance.
-	 */
-	public abstract String toUriString();
-
-	/**
-	 * Returns a {@code URI} from this {@code UriComponents} instance.
-	 */
-	public abstract URI toUri();
-
-	@Override
-	public final String toString() {
-		return toUriString();
+		return (variableValue != null ? variableValue.toString() : "");
 	}
 
-	/**
-	 * Normalize the path removing sequences like "path/..".
-	 * @see org.springframework.util.StringUtils#cleanPath(String)
-	 */
-	public abstract UriComponents normalize();
-
 
 	/**
 	 * Defines the contract for URI Template variables
@@ -233,9 +233,9 @@ public final String toString() {
 	interface UriTemplateVariables {
 
 		Object getValue(String name);
-
 	}
 
+
 	/**
 	 * URI template variables backed by a map.
 	 */
@@ -268,11 +268,10 @@ public VarArgsTemplateVariables(Object... uriVariableValues) {
 		}
 
 		public Object getValue(String name) {
-			if (!valueIterator.hasNext()) {
-				throw new IllegalArgumentException(
-						"Not enough variable values available to expand '" + name + "'");
+			if (!this.valueIterator.hasNext()) {
+				throw new IllegalArgumentException("Not enough variable values available to expand '" + name + "'");
 			}
-			return valueIterator.next();
+			return this.valueIterator.next();
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
index 7fbd0178f2..7d8703247a 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,15 +34,15 @@
 /**
  * Builder for {@link UriComponents}.
  *
- * <p></p>Typical usage involves:
+ * <p>Typical usage involves:
  * <ol>
- *     <li>Create a {@code UriComponentsBuilder} with one of the static factory methods (such as
- *     {@link #fromPath(String)} or {@link #fromUri(URI)})</li>
- *     <li>Set the various URI components through the respective methods ({@link #scheme(String)},
- *     {@link #userInfo(String)}, {@link #host(String)}, {@link #port(int)}, {@link #path(String)},
- *     {@link #pathSegment(String...)}, {@link #queryParam(String, Object...)}, and
- *     {@link #fragment(String)}.</li>
- *     <li>Build the {@link UriComponents} instance with the {@link #build()} method.</li>
+ * <li>Create a {@code UriComponentsBuilder} with one of the static factory methods
+ * (such as {@link #fromPath(String)} or {@link #fromUri(URI)})</li>
+ * <li>Set the various URI components through the respective methods ({@link #scheme(String)},
+ * {@link #userInfo(String)}, {@link #host(String)}, {@link #port(int)}, {@link #path(String)},
+ * {@link #pathSegment(String...)}, {@link #queryParam(String, Object...)}, and
+ * {@link #fragment(String)}.</li>
+ * <li>Build the {@link UriComponents} instance with the {@link #build()} method.</li>
  * </ol>
  *
  * @author Arjen Poutsma
@@ -60,9 +60,9 @@ public class UriComponentsBuilder {
 
 	private static final String SCHEME_PATTERN = "([^:/?#]+):";
 
-	private static final String HTTP_PATTERN = "(http|https):";
+	private static final String HTTP_PATTERN = "(?i)(http|https):";
 
-	private static final String USERINFO_PATTERN = "([^@/]*)";
+	private static final String USERINFO_PATTERN = "([^@\\[/?#]*)";
 
 	private static final String HOST_PATTERN = "([^/?#:]*)";
 
@@ -100,9 +100,9 @@ public class UriComponentsBuilder {
 
 	private String fragment;
 
+
 	/**
 	 * Default constructor. Protected to prevent direct instantiation.
-	 *
 	 * @see #newInstance()
 	 * @see #fromPath(String)
 	 * @see #fromUri(URI)
@@ -110,11 +110,11 @@ public class UriComponentsBuilder {
 	protected UriComponentsBuilder() {
 	}
 
+
 	// Factory methods
 
 	/**
 	 * Returns a new, empty builder.
-	 *
 	 * @return the new {@code UriComponentsBuilder}
 	 */
 	public static UriComponentsBuilder newInstance() {
@@ -123,7 +123,6 @@ public static UriComponentsBuilder newInstance() {
 
 	/**
 	 * Returns a builder that is initialized with the given path.
-	 *
 	 * @param path the path to initialize with
 	 * @return the new {@code UriComponentsBuilder}
 	 */
@@ -135,7 +134,6 @@ public static UriComponentsBuilder fromPath(String path) {
 
 	/**
 	 * Returns a builder that is initialized with the given {@code URI}.
-	 *
 	 * @param uri the URI to initialize with
 	 * @return the new {@code UriComponentsBuilder}
 	 */
@@ -147,48 +145,38 @@ public static UriComponentsBuilder fromUri(URI uri) {
 
 	/**
 	 * Returns a builder that is initialized with the given URI string.
-	 *
 	 * <p><strong>Note:</strong> The presence of reserved characters can prevent
 	 * correct parsing of the URI string. For example if a query parameter
 	 * contains {@code '='} or {@code '&'} characters, the query string cannot
 	 * be parsed unambiguously. Such values should be substituted for URI
 	 * variables to enable correct parsing:
-	 *
-	 * <pre>
+	 * <pre class="code">
 	 * String uriString = &quot;/hotels/42?filter={value}&quot;;
 	 * UriComponentsBuilder.fromUriString(uriString).buildAndExpand(&quot;hot&amp;cold&quot;);
 	 * </pre>
-	 *
-	 * @param uri
-	 *            the URI string to initialize with
+	 * @param uri the URI string to initialize with
 	 * @return the new {@code UriComponentsBuilder}
 	 */
 	public static UriComponentsBuilder fromUriString(String uri) {
 		Assert.hasLength(uri, "'uri' must not be empty");
-		Matcher m = URI_PATTERN.matcher(uri);
-		if (m.matches()) {
+		Matcher matcher = URI_PATTERN.matcher(uri);
+		if (matcher.matches()) {
 			UriComponentsBuilder builder = new UriComponentsBuilder();
-
-			String scheme = m.group(2);
-			String userInfo = m.group(5);
-			String host = m.group(6);
-			String port = m.group(8);
-			String path = m.group(9);
-			String query = m.group(11);
-			String fragment = m.group(13);
-
+			String scheme = matcher.group(2);
+			String userInfo = matcher.group(5);
+			String host = matcher.group(6);
+			String port = matcher.group(8);
+			String path = matcher.group(9);
+			String query = matcher.group(11);
+			String fragment = matcher.group(13);
 			boolean opaque = false;
-
 			if (StringUtils.hasLength(scheme)) {
-				String s = uri.substring(scheme.length());
-				if (!s.startsWith(":/")) {
+				String rest = uri.substring(scheme.length());
+				if (!rest.startsWith(":/")) {
 					opaque = true;
 				}
 			}
-
 			builder.scheme(scheme);
-
-
 			if (opaque) {
 				String ssp = uri.substring(scheme.length()).substring(1);
 				if (StringUtils.hasLength(fragment)) {
@@ -205,11 +193,9 @@ public static UriComponentsBuilder fromUriString(String uri) {
 				builder.path(path);
 				builder.query(query);
 			}
-
 			if (StringUtils.hasText(fragment)) {
 				builder.fragment(fragment);
 			}
-
 			return builder;
 		}
 		else {
@@ -219,37 +205,33 @@ public static UriComponentsBuilder fromUriString(String uri) {
 
 	/**
 	 * Creates a new {@code UriComponents} object from the string HTTP URL.
-	 *
 	 * <p><strong>Note:</strong> The presence of reserved characters can prevent
 	 * correct parsing of the URI string. For example if a query parameter
 	 * contains {@code '='} or {@code '&'} characters, the query string cannot
 	 * be parsed unambiguously. Such values should be substituted for URI
 	 * variables to enable correct parsing:
-	 *
-	 * <pre>
+	 * <pre class="code">
 	 * String uriString = &quot;/hotels/42?filter={value}&quot;;
 	 * UriComponentsBuilder.fromUriString(uriString).buildAndExpand(&quot;hot&amp;cold&quot;);
 	 * </pre>
-	 *
 	 * @param httpUrl the source URI
 	 * @return the URI components of the URI
 	 */
 	public static UriComponentsBuilder fromHttpUrl(String httpUrl) {
 		Assert.notNull(httpUrl, "'httpUrl' must not be null");
-		Matcher m = HTTP_URL_PATTERN.matcher(httpUrl);
-		if (m.matches()) {
+		Matcher matcher = HTTP_URL_PATTERN.matcher(httpUrl);
+		if (matcher.matches()) {
 			UriComponentsBuilder builder = new UriComponentsBuilder();
-
-			builder.scheme(m.group(1));
-			builder.userInfo(m.group(4));
-			builder.host(m.group(5));
-			String port = m.group(7);
+			String scheme = matcher.group(1);
+			builder.scheme(scheme != null ? scheme.toLowerCase() : null);
+			builder.userInfo(matcher.group(4));
+			builder.host(matcher.group(5));
+			String port = matcher.group(7);
 			if (StringUtils.hasLength(port)) {
 				builder.port(Integer.parseInt(port));
 			}
-			builder.path(m.group(8));
-			builder.query(m.group(10));
-
+			builder.path(matcher.group(8));
+			builder.query(matcher.group(10));
 			return builder;
 		}
 		else {
@@ -258,12 +240,10 @@ public static UriComponentsBuilder fromHttpUrl(String httpUrl) {
 	}
 
 
-
 	// build methods
 
 	/**
-	 * Builds a {@code UriComponents} instance from the various components contained in this builder.
-	 *
+	 * Build a {@code UriComponents} instance from the various components contained in this builder.
 	 * @return the URI components
 	 */
 	public UriComponents build() {
@@ -271,28 +251,26 @@ public UriComponents build() {
 	}
 
 	/**
-	 * Builds a {@code UriComponents} instance from the various components
+	 * Build a {@code UriComponents} instance from the various components
 	 * contained in this builder.
-	 *
 	 * @param encoded whether all the components set in this builder are
-	 * 	encoded ({@code true}) or not ({@code false}).
+	 * encoded ({@code true}) or not ({@code false})
 	 * @return the URI components
 	 */
 	public UriComponents build(boolean encoded) {
-		if (ssp != null) {
-			return new OpaqueUriComponents(scheme, ssp, fragment);
+		if (this.ssp != null) {
+			return new OpaqueUriComponents(this.scheme, this.ssp, this.fragment);
 		}
 		else {
-			return new HierarchicalUriComponents(
-					scheme, userInfo, host, port, pathBuilder.build(), queryParams, fragment, encoded, true);
+			return new HierarchicalUriComponents(this.scheme, this.userInfo, this.host, this.port,
+					this.pathBuilder.build(), this.queryParams, this.fragment, encoded, true);
 		}
 	}
 
 	/**
-	 * Builds a {@code UriComponents} instance and replaces URI template variables
-	 * with the values from a map. This is a shortcut method, which combines
+	 * Build a {@code UriComponents} instance and replaces URI template variables
+	 * with the values from a map. This is a shortcut method which combines
 	 * calls to {@link #build()} and then {@link UriComponents#expand(Map)}.
-	 *
 	 * @param uriVariables the map of URI variables
 	 * @return the URI components with expanded values
 	 */
@@ -301,10 +279,9 @@ public UriComponents buildAndExpand(Map<String, ?> uriVariables) {
 	}
 
 	/**
-	 * Builds a {@code UriComponents} instance and replaces URI template variables
-	 * with the values from an array. This is a shortcut method, which combines
+	 * Build a {@code UriComponents} instance and replaces URI template variables
+	 * with the values from an array. This is a shortcut method which combines
 	 * calls to {@link #build()} and then {@link UriComponents#expand(Object...)}.
-	 *
 	 * @param uriVariableValues URI variable values
 	 * @return the URI components with expanded values
 	 */
@@ -312,19 +289,17 @@ public UriComponents buildAndExpand(Object... uriVariableValues) {
 		return build(false).expand(uriVariableValues);
 	}
 
+
 	// URI components methods
 
 	/**
-	 * Initializes all components of this URI builder with the components of the given URI.
-	 *
+	 * Initialize all components of this URI builder with the components of the given URI.
 	 * @param uri the URI
 	 * @return this UriComponentsBuilder
 	 */
 	public UriComponentsBuilder uri(URI uri) {
 		Assert.notNull(uri, "'uri' must not be null");
-
 		this.scheme = uri.getScheme();
-
 		if (uri.isOpaque()) {
 			this.ssp = uri.getRawSchemeSpecificPart();
 			resetHierarchicalComponents();
@@ -367,11 +342,9 @@ private void resetSchemeSpecificPart() {
 	}
 
 	/**
-	 * Sets the URI scheme. The given scheme may contain URI template variables,
+	 * Set the URI scheme. The given scheme may contain URI template variables,
 	 * and may also be {@code null} to clear the scheme of this builder.
-	 *
-	 * @param scheme
-	 *            the URI scheme
+	 * @param scheme the URI scheme
 	 * @return this UriComponentsBuilder
 	 */
 	public UriComponentsBuilder scheme(String scheme) {
@@ -384,7 +357,6 @@ public UriComponentsBuilder scheme(String scheme) {
 	 * {@linkplain #userInfo(String) user-info}, {@linkplain #host(String) host},
 	 * {@linkplain #port(int) port}, {@linkplain #path(String) path}, and
 	 * {@link #query(String) query}.
-	 *
 	 * @param ssp the URI scheme-specific-part, may contain URI template parameters
 	 * @return this UriComponentsBuilder
 	 */
@@ -395,10 +367,8 @@ public UriComponentsBuilder schemeSpecificPart(String ssp) {
 	}
 
 	/**
-	 * Sets the URI user info. The given user info may contain URI template
-	 * variables, and may also be {@code null} to clear the user info of this
-	 * builder.
-	 *
+	 * Set the URI user info. The given user info may contain URI template variables,
+	 * and may also be {@code null} to clear the user info of this builder.
 	 * @param userInfo the URI user info
 	 * @return this UriComponentsBuilder
 	 */
@@ -409,9 +379,8 @@ public UriComponentsBuilder userInfo(String userInfo) {
 	}
 
 	/**
-	 * Sets the URI host. The given host may contain URI template variables, and
-	 * may also be {@code null} to clear the host of this builder.
-	 *
+	 * Set the URI host. The given host may contain URI template variables,
+	 * and may also be {@code null} to clear the host of this builder.
 	 * @param host the URI host
 	 * @return this UriComponentsBuilder
 	 */
@@ -422,8 +391,7 @@ public UriComponentsBuilder host(String host) {
 	}
 
 	/**
-	 * Sets the URI port. Passing {@code -1} will clear the port of this builder.
-	 *
+	 * Set the URI port. Passing {@code -1} will clear the port of this builder.
 	 * @param port the URI port
 	 * @return this UriComponentsBuilder
 	 */
@@ -435,9 +403,8 @@ public UriComponentsBuilder port(int port) {
 	}
 
 	/**
-	 * Appends the given path to the existing path of this builder. The given
-	 * path may contain URI template variables.
-	 *
+	 * Append the given path to the existing path of this builder.
+	 * The given path may contain URI template variables.
 	 * @param path the URI path
 	 * @return this UriComponentsBuilder
 	 */
@@ -448,8 +415,7 @@ public UriComponentsBuilder path(String path) {
 	}
 
 	/**
-	 * Sets the path of this builder overriding all existing path and path segment values.
-	 *
+	 * Set the path of this builder overriding all existing path and path segment values.
 	 * @param path the URI path; a {@code null} value results in an empty path.
 	 * @return this UriComponentsBuilder
 	 */
@@ -460,9 +426,8 @@ public UriComponentsBuilder replacePath(String path) {
 	}
 
 	/**
-	 * Appends the given path segments to the existing path of this builder. Each given
-	 * path segments may contain URI template variables.
-	 *
+	 * Append the given path segments to the existing path of this builder.
+	 * Each given path segment may contain URI template variables.
 	 * @param pathSegments the URI path segments
 	 * @return this UriComponentsBuilder
 	 */
@@ -474,32 +439,28 @@ public UriComponentsBuilder pathSegment(String... pathSegments) throws IllegalAr
 	}
 
 	/**
-	 * Appends the given query to the existing query of this builder.
+	 * Append the given query to the existing query of this builder.
 	 * The given query may contain URI template variables.
-	 *
 	 * <p><strong>Note:</strong> The presence of reserved characters can prevent
 	 * correct parsing of the URI string. For example if a query parameter
 	 * contains {@code '='} or {@code '&'} characters, the query string cannot
 	 * be parsed unambiguously. Such values should be substituted for URI
 	 * variables to enable correct parsing:
-	 *
-	 * <pre>
+	 * <pre class="code">
 	 * String uriString = &quot;/hotels/42?filter={value}&quot;;
 	 * UriComponentsBuilder.fromUriString(uriString).buildAndExpand(&quot;hot&amp;cold&quot;);
 	 * </pre>
-	 *
 	 * @param query the query string
 	 * @return this UriComponentsBuilder
 	 */
 	public UriComponentsBuilder query(String query) {
 		if (query != null) {
-			Matcher m = QUERY_PARAM_PATTERN.matcher(query);
-			while (m.find()) {
-				String name = m.group(1);
-				String eq = m.group(2);
-				String value = m.group(3);
-				queryParam(name, (value != null ? value :
-					(StringUtils.hasLength(eq) ? "" : null)));
+			Matcher matcher = QUERY_PARAM_PATTERN.matcher(query);
+			while (matcher.find()) {
+				String name = matcher.group(1);
+				String eq = matcher.group(2);
+				String value = matcher.group(3);
+				queryParam(name, (value != null ? value : (StringUtils.hasLength(eq) ? "" : null)));
 			}
 		}
 		else {
@@ -510,8 +471,7 @@ public UriComponentsBuilder query(String query) {
 	}
 
 	/**
-	 * Sets the query of this builder overriding all existing query parameters.
-	 *
+	 * Set the query of this builder overriding all existing query parameters.
 	 * @param query the query string; a {@code null} value removes all query parameters.
 	 * @return this UriComponentsBuilder
 	 */
@@ -523,22 +483,19 @@ public UriComponentsBuilder replaceQuery(String query) {
 	}
 
 	/**
-	 * Appends the given query parameter to the existing query parameters. The
+	 * Append the given query parameter to the existing query parameters. The
 	 * given name or any of the values may contain URI template variables. If no
 	 * values are given, the resulting URI will contain the query parameter name
 	 * only (i.e. {@code ?foo} instead of {@code ?foo=bar}.
-	 *
-	 * @param name
-	 *            the query parameter name
-	 * @param values
-	 *            the query parameter values
+	 * @param name the query parameter name
+	 * @param values the query parameter values
 	 * @return this UriComponentsBuilder
 	 */
 	public UriComponentsBuilder queryParam(String name, Object... values) {
 		Assert.notNull(name, "'name' must not be null");
 		if (!ObjectUtils.isEmpty(values)) {
 			for (Object value : values) {
-				String valueAsString = value != null ? value.toString() : null;
+				String valueAsString = (value != null ? value.toString() : null);
 				this.queryParams.add(name, valueAsString);
 			}
 		}
@@ -550,14 +507,10 @@ public UriComponentsBuilder queryParam(String name, Object... values) {
 	}
 
 	/**
-	 * Sets the query parameter values overriding all existing query values for
-	 * the same parameter. If no values are given, the query parameter is
-	 * removed.
-	 *
-	 * @param name
-	 *            the query parameter name
-	 * @param values
-	 *            the query parameter values
+	 * Set the query parameter values overriding all existing query values for
+	 * the same parameter. If no values are given, the query parameter is removed.
+	 * @param name the query parameter name
+	 * @param values the query parameter values
 	 * @return this UriComponentsBuilder
 	 */
 	public UriComponentsBuilder replaceQueryParam(String name, Object... values) {
@@ -571,12 +524,9 @@ public UriComponentsBuilder replaceQueryParam(String name, Object... values) {
 	}
 
 	/**
-	 * Sets the URI fragment. The given fragment may contain URI template
-	 * variables, and may also be {@code null} to clear the fragment of this
-	 * builder.
-	 *
-	 * @param fragment
-	 *            the URI fragment
+	 * Set the URI fragment. The given fragment may contain URI template variables,
+	 * and may also be {@code null} to clear the fragment of this builder.
+	 * @param fragment the URI fragment
 	 * @return this UriComponentsBuilder
 	 */
 	public UriComponentsBuilder fragment(String fragment) {
@@ -592,12 +542,14 @@ public UriComponentsBuilder fragment(String fragment) {
 
 
 	private interface PathComponentBuilder {
+
 		PathComponent build();
 	}
 
+
 	private static class CompositePathComponentBuilder implements PathComponentBuilder {
 
-		private LinkedList<PathComponentBuilder> componentBuilders = new LinkedList<PathComponentBuilder>();
+		private final LinkedList<PathComponentBuilder> componentBuilders = new LinkedList<PathComponentBuilder>();
 
 		public CompositePathComponentBuilder() {
 		}
@@ -650,8 +602,8 @@ private <T> T getLastBuilder(Class<T> builderClass) {
 		public PathComponent build() {
 			int size = this.componentBuilders.size();
 			List<PathComponent> components = new ArrayList<PathComponent>(size);
-			for (int i = 0; i < size; i++) {
-				PathComponent pathComponent = this.componentBuilders.get(i).build();
+			for (PathComponentBuilder componentBuilder : this.componentBuilders) {
+				PathComponent pathComponent = componentBuilder.build();
 				if (pathComponent != null) {
 					components.add(pathComponent);
 				}
@@ -666,9 +618,10 @@ public PathComponent build() {
 		}
 	}
 
+
 	private static class FullPathComponentBuilder implements PathComponentBuilder {
 
-		private StringBuilder path = new StringBuilder();
+		private final StringBuilder path = new StringBuilder();
 
 		public void append(String path) {
 			this.path.append(path);
@@ -690,9 +643,10 @@ public void removeTrailingSlash() {
 		}
 	}
 
+
 	private static class PathSegmentComponentBuilder implements PathComponentBuilder {
 
-		private List<String> pathSegments = new LinkedList<String>();
+		private final List<String> pathSegments = new LinkedList<String>();
 
 		public void append(String... pathSegments) {
 			for (String pathSegment : pathSegments) {
@@ -703,8 +657,8 @@ public void append(String... pathSegments) {
 		}
 
 		public PathComponent build() {
-			return this.pathSegments.isEmpty() ?
-					null : new HierarchicalUriComponents.PathSegmentComponent(this.pathSegments);
+			return (this.pathSegments.isEmpty() ? null :
+					new HierarchicalUriComponents.PathSegmentComponent(this.pathSegments));
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
index 3aacd60559..632e2bda2c 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,6 +71,7 @@ public UriTemplate(String uriTemplate) {
 		this.uriComponents = UriComponentsBuilder.fromUriString(uriTemplate).build();
 	}
 
+
 	/**
 	 * Return the names of the variables in the template, in order.
 	 * @return the template variable names
@@ -79,8 +80,6 @@ public List<String> getVariableNames() {
 		return this.variableNames;
 	}
 
-	// expanding
-
 	/**
 	 * Given the Map of variables, expands this template into a URI. The Map keys represent variable names,
 	 * the Map values variable values. The order of variables is not significant.
@@ -89,17 +88,17 @@ public List<String> getVariableNames() {
 	 * UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
 	 * Map&lt;String, String&gt; uriVariables = new HashMap&lt;String, String&gt;();
 	 * uriVariables.put("booking", "42");
-	 * uriVariables.put("hotel", "1");
+	 * uriVariables.put("hotel", "Rest & Relax");
 	 * System.out.println(template.expand(uriVariables));
 	 * </pre>
-	 * will print: <blockquote>{@code http://example.com/hotels/1/bookings/42}</blockquote>
+	 * will print: <blockquote>{@code http://example.com/hotels/Rest%20%26%20Relax/bookings/42}</blockquote>
 	 * @param uriVariables the map of URI variables
 	 * @return the expanded URI
 	 * @throws IllegalArgumentException if {@code uriVariables} is {@code null};
 	 * or if it does not contain values for all the variable names
 	 */
 	public URI expand(Map<String, ?> uriVariables) {
-		UriComponents expandedComponents = uriComponents.expand(uriVariables);
+		UriComponents expandedComponents = this.uriComponents.expand(uriVariables);
 		UriComponents encodedComponents = expandedComponents.encode();
 		return encodedComponents.toUri();
 	}
@@ -110,22 +109,20 @@ public URI expand(Map<String, ?> uriVariables) {
      * <p>Example:
      * <pre class="code">
      * UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
-     * System.out.println(template.expand("1", "42));
+     * System.out.println(template.expand("Rest & Relax", "42));
      * </pre>
-     * will print: <blockquote>{@code http://example.com/hotels/1/bookings/42}</blockquote>
+     * will print: <blockquote>{@code http://example.com/hotels/Rest%20%26%20Relax/bookings/42}</blockquote>
      * @param uriVariableValues the array of URI variables
      * @return the expanded URI
      * @throws IllegalArgumentException if {@code uriVariables} is {@code null}
      * or if it does not contain sufficient variables
      */
 	public URI expand(Object... uriVariableValues) {
-		UriComponents expandedComponents = uriComponents.expand(uriVariableValues);
+		UriComponents expandedComponents = this.uriComponents.expand(uriVariableValues);
 		UriComponents encodedComponents = expandedComponents.encode();
 		return encodedComponents.toUri();
 	}
 
-	// matching
-
 	/**
 	 * Indicate whether the given URI matches this template.
 	 * @param uri the URI to match to
@@ -170,7 +167,7 @@ public Map<String, String> match(String uri) {
 	 * <p>Defaults to {@link UriUtils#encodeUri(String, String)}.
 	 * @param uri the URI to encode
 	 * @return the encoded URI
-	 * @deprecated No longer in use, with no direct replacement
+	 * @deprecated No longer in use; to be removed in Spring 4.0.
 	 */
 	@Deprecated
 	protected URI encodeUri(String uri) {
@@ -204,11 +201,11 @@ private static class Parser {
 
 		private Parser(String uriTemplate) {
 			Assert.hasText(uriTemplate, "'uriTemplate' must not be null");
-			Matcher m = NAMES_PATTERN.matcher(uriTemplate);
+			Matcher matcher = NAMES_PATTERN.matcher(uriTemplate);
 			int end = 0;
-			while (m.find()) {
-				this.patternBuilder.append(quote(uriTemplate, end, m.start()));
-				String match = m.group(1);
+			while (matcher.find()) {
+				this.patternBuilder.append(quote(uriTemplate, end, matcher.start()));
+				String match = matcher.group(1);
 				int colonIdx = match.indexOf(':');
 				if (colonIdx == -1) {
 					this.patternBuilder.append(DEFAULT_VARIABLE_PATTERN);
@@ -216,7 +213,8 @@ private Parser(String uriTemplate) {
 				}
 				else {
 					if (colonIdx + 1 == match.length()) {
-						throw new IllegalArgumentException("No custom regular expression specified after ':' in \"" + match	+ "\"");
+						throw new IllegalArgumentException(
+								"No custom regular expression specified after ':' in \"" + match + "\"");
 					}
 					String variablePattern = match.substring(colonIdx + 1, match.length());
 					this.patternBuilder.append('(');
@@ -225,7 +223,7 @@ private Parser(String uriTemplate) {
 					String variableName = match.substring(0, colonIdx);
 					this.variableNames.add(variableName);
 				}
-				end = m.end();
+				end = matcher.end();
 			}
 			this.patternBuilder.append(quote(uriTemplate, end, uriTemplate.length()));
 			int lastIdx = this.patternBuilder.length() - 1;
@@ -250,5 +248,4 @@ private Pattern getMatchPattern() {
 		}
 	}
 
-
 }
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
index 79951a64c7..e3a0fca8f8 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,14 +24,15 @@
 import org.springframework.util.Assert;
 
 /**
- * Utility class for URI encoding and decoding based on RFC 3986. Offers encoding methods for the various URI
- * components.
+ * Utility class for URI encoding and decoding based on RFC 3986.
+ * Offers encoding methods for the various URI components.
  *
  * <p>All {@code encode*(String, String} methods in this class operate in a similar way:
  * <ul>
  * <li>Valid characters for the specific URI component as defined in RFC 3986 stay the same.</li>
- * <li>All other characters are converted into one or more bytes in the given encoding scheme. Each of the
- * resulting bytes is written as a hexadecimal string in the "{@code %<i>xy</i>}" format.</li>
+ * <li>All other characters are converted into one or more bytes in the given encoding scheme.
+ * Each of the resulting bytes is written as a hexadecimal string in the "{@code %<i>xy</i>}"
+ * format.</li>
  * </ul>
  *
  * @author Arjen Poutsma
@@ -65,6 +66,7 @@ public abstract class UriUtils {
 			"^" + HTTP_PATTERN + "(//(" + USERINFO_PATTERN + "@)?" + HOST_PATTERN + "(:" + PORT_PATTERN + ")?" + ")?" +
 					PATH_PATTERN + "(\\?" + LAST_PATTERN + ")?");
 
+
 	// encoding
 
 	/**
@@ -73,7 +75,7 @@ public abstract class UriUtils {
 	 * <p><strong>Note</strong> that this method does not attempt to encode "=" and "&"
 	 * characters in query parameter names and query parameter values because they cannot
 	 * be parsed in a reliable way. Instead use:
-	 * <pre>
+	 * <pre class="code">
 	 * UriComponents uriComponents = UriComponentsBuilder.fromUri("/path?name={value}").buildAndExpand("a=b");
 	 * String encodedUri = uriComponents.encode().toUriString();
 	 * </pre>
@@ -86,19 +88,18 @@ public abstract class UriUtils {
 	 */
 	@Deprecated
 	public static String encodeUri(String uri, String encoding) throws UnsupportedEncodingException {
-		Assert.notNull(uri, "'uri' must not be null");
-		Assert.hasLength(encoding, "'encoding' must not be empty");
-		Matcher m = URI_PATTERN.matcher(uri);
-		if (m.matches()) {
-			String scheme = m.group(2);
-			String authority = m.group(3);
-			String userinfo = m.group(5);
-			String host = m.group(6);
-			String port = m.group(8);
-			String path = m.group(9);
-			String query = m.group(11);
-			String fragment = m.group(13);
-
+		Assert.notNull(uri, "URI must not be null");
+		Assert.hasLength(encoding, "Encoding must not be empty");
+		Matcher matcher = URI_PATTERN.matcher(uri);
+		if (matcher.matches()) {
+			String scheme = matcher.group(2);
+			String authority = matcher.group(3);
+			String userinfo = matcher.group(5);
+			String host = matcher.group(6);
+			String port = matcher.group(8);
+			String path = matcher.group(9);
+			String query = matcher.group(11);
+			String fragment = matcher.group(13);
 			return encodeUriComponents(scheme, authority, userinfo, host, port, path, query, fragment, encoding);
 		}
 		else {
@@ -114,7 +115,7 @@ public static String encodeUri(String uri, String encoding) throws UnsupportedEn
 	 * <p><strong>Note</strong> that this method does not attempt to encode "=" and "&"
 	 * characters in query parameter names and query parameter values because they cannot
 	 * be parsed in a reliable way. Instead use:
-	 * <pre>
+	 * <pre class="code">
 	 * UriComponents uriComponents = UriComponentsBuilder.fromHttpUrl("/path?name={value}").buildAndExpand("a=b");
 	 * String encodedUri = uriComponents.encode().toUriString();
 	 * </pre>
@@ -127,18 +128,17 @@ public static String encodeUri(String uri, String encoding) throws UnsupportedEn
 	 */
 	@Deprecated
 	public static String encodeHttpUrl(String httpUrl, String encoding) throws UnsupportedEncodingException {
-		Assert.notNull(httpUrl, "'httpUrl' must not be null");
-		Assert.hasLength(encoding, "'encoding' must not be empty");
-		Matcher m = HTTP_URL_PATTERN.matcher(httpUrl);
-		if (m.matches()) {
-			String scheme = m.group(1);
-			String authority = m.group(2);
-			String userinfo = m.group(4);
-			String host = m.group(5);
-			String portString = m.group(7);
-			String path = m.group(8);
-			String query = m.group(10);
-
+		Assert.notNull(httpUrl, "HTTP URL must not be null");
+		Assert.hasLength(encoding, "Encoding must not be empty");
+		Matcher matcher = HTTP_URL_PATTERN.matcher(httpUrl);
+		if (matcher.matches()) {
+			String scheme = matcher.group(1);
+			String authority = matcher.group(2);
+			String userinfo = matcher.group(4);
+			String host = matcher.group(5);
+			String portString = matcher.group(7);
+			String path = matcher.group(8);
+			String query = matcher.group(10);
 			return encodeUriComponents(scheme, authority, userinfo, host, portString, path, query, null, encoding);
 		}
 		else {
@@ -168,7 +168,7 @@ public static String encodeUriComponents(String scheme, String authority, String
 			String host, String port, String path, String query, String fragment, String encoding)
 			throws UnsupportedEncodingException {
 
-		Assert.hasLength(encoding, "'encoding' must not be empty");
+		Assert.hasLength(encoding, "Encoding must not be empty");
 		StringBuilder sb = new StringBuilder();
 
 		if (scheme != null) {
@@ -217,8 +217,7 @@ public static String encodeUriComponents(String scheme, String authority, String
 	 * @throws UnsupportedEncodingException when the given encoding parameter is not supported
 	 */
 	public static String encodeScheme(String scheme, String encoding) throws UnsupportedEncodingException {
-		return HierarchicalUriComponents.encodeUriComponent(scheme, encoding,
-				HierarchicalUriComponents.Type.SCHEME);
+		return HierarchicalUriComponents.encodeUriComponent(scheme, encoding, HierarchicalUriComponents.Type.SCHEME);
 	}
 
 	/**
@@ -229,8 +228,7 @@ public static String encodeScheme(String scheme, String encoding) throws Unsuppo
 	 * @throws UnsupportedEncodingException when the given encoding parameter is not supported
 	 */
 	public static String encodeAuthority(String authority, String encoding) throws UnsupportedEncodingException {
-		return HierarchicalUriComponents.encodeUriComponent(authority, encoding,
-				HierarchicalUriComponents.Type.AUTHORITY);
+		return HierarchicalUriComponents.encodeUriComponent(authority, encoding, HierarchicalUriComponents.Type.AUTHORITY);
 	}
 
 	/**
@@ -241,8 +239,7 @@ public static String encodeAuthority(String authority, String encoding) throws U
 	 * @throws UnsupportedEncodingException when the given encoding parameter is not supported
 	 */
 	public static String encodeUserInfo(String userInfo, String encoding) throws UnsupportedEncodingException {
-		return HierarchicalUriComponents.encodeUriComponent(userInfo, encoding,
-				HierarchicalUriComponents.Type.USER_INFO);
+		return HierarchicalUriComponents.encodeUriComponent(userInfo, encoding, HierarchicalUriComponents.Type.USER_INFO);
 	}
 
 	/**
@@ -253,8 +250,7 @@ public static String encodeUserInfo(String userInfo, String encoding) throws Uns
 	 * @throws UnsupportedEncodingException when the given encoding parameter is not supported
 	 */
 	public static String encodeHost(String host, String encoding) throws UnsupportedEncodingException {
-		return HierarchicalUriComponents
-				.encodeUriComponent(host, encoding, HierarchicalUriComponents.Type.HOST);
+		return HierarchicalUriComponents.encodeUriComponent(host, encoding, HierarchicalUriComponents.Type.HOST);
 	}
 
 	/**
@@ -265,8 +261,7 @@ public static String encodeHost(String host, String encoding) throws Unsupported
 	 * @throws UnsupportedEncodingException when the given encoding parameter is not supported
 	 */
 	public static String encodePort(String port, String encoding) throws UnsupportedEncodingException {
-		return HierarchicalUriComponents
-				.encodeUriComponent(port, encoding, HierarchicalUriComponents.Type.PORT);
+		return HierarchicalUriComponents.encodeUriComponent(port, encoding, HierarchicalUriComponents.Type.PORT);
 	}
 
 	/**
@@ -277,8 +272,7 @@ public static String encodePort(String port, String encoding) throws Unsupported
 	 * @throws UnsupportedEncodingException when the given encoding parameter is not supported
 	 */
 	public static String encodePath(String path, String encoding) throws UnsupportedEncodingException {
-		return HierarchicalUriComponents
-				.encodeUriComponent(path, encoding, HierarchicalUriComponents.Type.PATH);
+		return HierarchicalUriComponents.encodeUriComponent(path, encoding, HierarchicalUriComponents.Type.PATH);
 	}
 
 	/**
@@ -289,8 +283,7 @@ public static String encodePath(String path, String encoding) throws Unsupported
 	 * @throws UnsupportedEncodingException when the given encoding parameter is not supported
 	 */
 	public static String encodePathSegment(String segment, String encoding) throws UnsupportedEncodingException {
-		return HierarchicalUriComponents.encodeUriComponent(segment, encoding,
-				HierarchicalUriComponents.Type.PATH_SEGMENT);
+		return HierarchicalUriComponents.encodeUriComponent(segment, encoding, HierarchicalUriComponents.Type.PATH_SEGMENT);
 	}
 
 	/**
@@ -301,8 +294,7 @@ public static String encodePathSegment(String segment, String encoding) throws U
 	 * @throws UnsupportedEncodingException when the given encoding parameter is not supported
 	 */
 	public static String encodeQuery(String query, String encoding) throws UnsupportedEncodingException {
-		return HierarchicalUriComponents
-				.encodeUriComponent(query, encoding, HierarchicalUriComponents.Type.QUERY);
+		return HierarchicalUriComponents.encodeUriComponent(query, encoding, HierarchicalUriComponents.Type.QUERY);
 	}
 
 	/**
@@ -313,8 +305,7 @@ public static String encodeQuery(String query, String encoding) throws Unsupport
 	 * @throws UnsupportedEncodingException when the given encoding parameter is not supported
 	 */
 	public static String encodeQueryParam(String queryParam, String encoding) throws UnsupportedEncodingException {
-		return HierarchicalUriComponents.encodeUriComponent(queryParam, encoding,
-				HierarchicalUriComponents.Type.QUERY_PARAM);
+		return HierarchicalUriComponents.encodeUriComponent(queryParam, encoding, HierarchicalUriComponents.Type.QUERY_PARAM);
 	}
 
 	/**
@@ -325,8 +316,7 @@ public static String encodeQueryParam(String queryParam, String encoding) throws
 	 * @throws UnsupportedEncodingException when the given encoding parameter is not supported
 	 */
 	public static String encodeFragment(String fragment, String encoding) throws UnsupportedEncodingException {
-		return HierarchicalUriComponents.encodeUriComponent(fragment, encoding,
-				HierarchicalUriComponents.Type.FRAGMENT);
+		return HierarchicalUriComponents.encodeUriComponent(fragment, encoding, HierarchicalUriComponents.Type.FRAGMENT);
 	}
 
 
@@ -348,8 +338,8 @@ public static String encodeFragment(String fragment, String encoding) throws Uns
 	 * @see java.net.URLDecoder#decode(String, String)
 	 */
 	public static String decode(String source, String encoding) throws UnsupportedEncodingException {
-		Assert.notNull(source, "'source' must not be null");
-		Assert.hasLength(encoding, "'encoding' must not be empty");
+		Assert.notNull(source, "Source must not be null");
+		Assert.hasLength(encoding, "Encoding must not be empty");
 		int length = source.length();
 		ByteArrayOutputStream bos = new ByteArrayOutputStream(length);
 		boolean changed = false;
@@ -376,7 +366,7 @@ public static String decode(String source, String encoding) throws UnsupportedEn
 				bos.write(ch);
 			}
 		}
-		return changed ? new String(bos.toByteArray(), encoding) : source;
+		return (changed ? new String(bos.toByteArray(), encoding) : source);
 	}
 
 }
diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index 362b933658..3307698bc3 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;
@@ -181,11 +181,24 @@ public String getPathWithinServletMapping(HttpServletRequest request) {
 		}
 		else {
 			// Special case: URI is different from servlet path.
-			// Can happen e.g. with index page: URI="/", servletPath="/index.html"
-			// Use path info if available, as it indicates an index page within
-			// a servlet mapping. Otherwise, use the full servlet path.
 			String pathInfo = request.getPathInfo();
-			return (pathInfo != null ? pathInfo : servletPath);
+			if (pathInfo != null) {
+				// Use path info if available. Indicates index page within a servlet mapping?
+				// e.g. with index page: URI="/", servletPath="/index.html"
+				return pathInfo;
+			}
+			if (!this.urlDecode) {
+				// No path info... (not mapped by prefix, nor by extension, nor "/*")
+				// For the default servlet mapping (i.e. "/"), urlDecode=false can
+				// cause issues since getServletPath() returns a decoded path.
+				// If decoding pathWithinApp yields a match just use pathWithinApp.
+				path = getRemainingPath(decodeInternal(request, pathWithinApp), servletPath, false);
+				if (path != null) {
+					return pathWithinApp;
+				}
+			}
+			// Otherwise, use the full servlet path.
+			return servletPath;
 		}
 	}
 
@@ -217,7 +230,7 @@ public String getPathWithinApplication(HttpServletRequest request) {
 	private String getRemainingPath(String requestUri, String mapping, boolean ignoreCase) {
 		int index1 = 0;
 		int index2 = 0;
-		for ( ; (index1 < requestUri.length()) && (index2 < mapping.length()); index1++, index2++) {
+		for (; (index1 < requestUri.length()) && (index2 < mapping.length()); index1++, index2++) {
 			char c1 = requestUri.charAt(index1);
 			char c2 = mapping.charAt(index2);
 			if (c1 == ';') {
@@ -230,7 +243,7 @@ private String getRemainingPath(String requestUri, String mapping, boolean ignor
 			if (c1 == c2) {
 				continue;
 			}
-			if (ignoreCase && (Character.toLowerCase(c1) == Character.toLowerCase(c2))) {
+			else if (ignoreCase && (Character.toLowerCase(c1) == Character.toLowerCase(c2))) {
 				continue;
 			}
 			return null;
@@ -238,13 +251,13 @@ private String getRemainingPath(String requestUri, String mapping, boolean ignor
 		if (index2 != mapping.length()) {
 			return null;
 		}
-		if (index1 == requestUri.length()) {
+		else if (index1 == requestUri.length()) {
 			return "";
 		}
 		else if (requestUri.charAt(index1) == ';') {
 			index1 = requestUri.indexOf('/', index1);
 		}
-		return (index1 != -1) ? requestUri.substring(index1) : "";
+		return (index1 != -1 ? requestUri.substring(index1) : "");
 	}
 
 	/**
@@ -299,8 +312,7 @@ public String getServletPath(HttpServletRequest request) {
 		if (servletPath == null) {
 			servletPath = request.getServletPath();
 		}
-		if (servletPath.length() > 1 && servletPath.endsWith("/") &&
-				shouldRemoveTrailingServletPathSlash(request)) {
+		if (servletPath.length() > 1 && servletPath.endsWith("/") && shouldRemoveTrailingServletPathSlash(request)) {
 			// On WebSphere, in non-compliant mode, for a "/foo/" case that would be "/foo"
 			// on all other servlet containers: removing trailing slash, proceeding with
 			// that remaining slash as final lookup path...
@@ -393,7 +405,7 @@ private String decodeAndCleanUriString(HttpServletRequest request, String uri) {
 	 * @see java.net.URLDecoder#decode(String)
 	 */
 	public String decodeRequestString(HttpServletRequest request, String source) {
-		if (this.urlDecode) {
+		if (this.urlDecode && source != null) {
 			return decodeInternal(request, source);
 		}
 		return source;
@@ -436,13 +448,12 @@ protected String determineEncoding(HttpServletRequest request) {
 	 * Remove ";" (semicolon) content from the given request URI if the
 	 * {@linkplain #setRemoveSemicolonContent(boolean) removeSemicolonContent}
 	 * property is set to "true". Note that "jssessionid" is always removed.
-	 *
 	 * @param requestUri the request URI string to remove ";" content from
 	 * @return the updated URI string
 	 */
 	public String removeSemicolonContent(String requestUri) {
-		return this.removeSemicolonContent ?
-				removeSemicolonContentInternal(requestUri) : removeJsessionid(requestUri);
+		return (this.removeSemicolonContent ?
+				removeSemicolonContentInternal(requestUri) : removeJsessionid(requestUri));
 	}
 
 	private String removeSemicolonContentInternal(String requestUri) {
@@ -457,7 +468,7 @@ private String removeSemicolonContentInternal(String requestUri) {
 	}
 
 	private String removeJsessionid(String requestUri) {
-		int startIndex = requestUri.indexOf(";jsessionid=");
+		int startIndex = requestUri.toLowerCase().indexOf(";jsessionid=");
 		if (startIndex != -1) {
 			int endIndex = requestUri.indexOf(';', startIndex + 12);
 			String start = requestUri.substring(0, startIndex);
@@ -473,7 +484,6 @@ private String removeJsessionid(String requestUri) {
 	 * assumed the URL path from which the variables were extracted is already
 	 * decoded through a call to
 	 * {@link #getLookupPathForRequest(HttpServletRequest)}.
-	 *
 	 * @param request current HTTP request
 	 * @param vars URI variables extracted from the URL path
 	 * @return the same Map or a new Map instance
@@ -498,7 +508,6 @@ public Map<String, String> decodePathVariables(HttpServletRequest request, Map<S
 	 * assumed the URL path from which the variables were extracted is already
 	 * decoded through a call to
 	 * {@link #getLookupPathForRequest(HttpServletRequest)}.
-	 *
 	 * @param request current HTTP request
 	 * @param vars URI variables extracted from the URL path
 	 * @return the same Map or a new Map instance
diff --git a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
index c7acf09502..7bf5fd2562 100644
--- a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
-
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletRequestWrapper;
@@ -175,7 +174,7 @@ public static void removeWebAppRootSystemProperty(ServletContext servletContext)
 	 * i.e. the value of the "defaultHtmlEscape" context-param in {@code web.xml}
 	 * (if any). Falls back to {@code false} in case of no explicit default given.
 	 * @param servletContext the servlet context of the web application
-	 * @return whether default HTML escaping is enabled (default is false)
+	 * @return whether default HTML escaping is enabled (default is {@code false})
 	 */
 	public static boolean isDefaultHtmlEscape(ServletContext servletContext) {
 		if (servletContext == null) {
@@ -193,15 +192,15 @@ public static boolean isDefaultHtmlEscape(ServletContext servletContext) {
 	 * an actual boolean value specified, allowing to have a context-specific
 	 * default in case of no setting at the global level.
 	 * @param servletContext the servlet context of the web application
-	 * @return whether default HTML escaping is enabled (null = no explicit default)
+	 * @return whether default HTML escaping is enabled for the given application
+	 * ({@code null} = no explicit default)
 	 */
 	public static Boolean getDefaultHtmlEscape(ServletContext servletContext) {
 		if (servletContext == null) {
 			return null;
 		}
-		Assert.notNull(servletContext, "ServletContext must not be null");
 		String param = servletContext.getInitParameter(HTML_ESCAPE_CONTEXT_PARAM);
-		return (StringUtils.hasText(param)? Boolean.valueOf(param) : null);
+		return (StringUtils.hasText(param) ? Boolean.valueOf(param) : null);
 	}
 
 	/**
@@ -279,7 +278,7 @@ public static Object getSessionAttribute(HttpServletRequest request, String name
 	 * @throws IllegalStateException if the session attribute could not be found
 	 */
 	public static Object getRequiredSessionAttribute(HttpServletRequest request, String name)
-		throws IllegalStateException {
+			throws IllegalStateException {
 
 		Object attr = getSessionAttribute(request, name);
 		if (attr == null) {
@@ -319,7 +318,7 @@ public static void setSessionAttribute(HttpServletRequest request, String name,
 	 * @return the value of the session attribute, newly created if not found
 	 * @throws IllegalArgumentException if the session attribute could not be instantiated
 	 */
-	public static Object getOrCreateSessionAttribute(HttpSession session, String name, Class clazz)
+	public static Object getOrCreateSessionAttribute(HttpSession session, String name, Class<?> clazz)
 			throws IllegalArgumentException {
 
 		Assert.notNull(session, "Session must not be null");
@@ -710,20 +709,23 @@ public static String extractFilenameFromUrlPath(String urlPath) {
 	}
 
 	/**
-	 * Extract the full URL filename (including file extension) from the given request URL path.
-	 * Correctly resolves nested paths such as "/products/view.html" as well.
+	 * Extract the full URL filename (including file extension) from the given
+	 * request URL path. Correctly resolve nested paths such as
+	 * "/products/view.html" and remove any path and or query parameters.
 	 * @param urlPath the request URL path (e.g. "/products/index.html")
 	 * @return the extracted URI filename (e.g. "index.html")
 	 */
 	public static String extractFullFilenameFromUrlPath(String urlPath) {
-		int end = urlPath.indexOf(';');
+		int end = urlPath.indexOf('?');
 		if (end == -1) {
-			end = urlPath.indexOf('?');
+			end = urlPath.indexOf('#');
 			if (end == -1) {
 				end = urlPath.length();
 			}
 		}
 		int begin = urlPath.lastIndexOf('/', end) + 1;
+		int paramIndex = urlPath.indexOf(';', begin);
+		end = (paramIndex != -1 && paramIndex < end ? paramIndex : end);
 		return urlPath.substring(begin, end);
 	}
 
@@ -732,9 +734,9 @@ public static String extractFullFilenameFromUrlPath(String urlPath) {
 	 * like this {@code "q1=a;q1=b;q2=a,b,c"}. The resulting map would contain
 	 * keys {@code "q1"} and {@code "q2"} with values {@code ["a","b"]} and
 	 * {@code ["a","b","c"]} respectively.
-	 *
 	 * @param matrixVariables the unparsed matrix variables string
-	 * @return a map with matrix variable names and values, never {@code null}
+	 * @return a map with matrix variable names and values (never {@code null})
+	 * @since 3.2
 	 */
 	public static MultiValueMap<String, String> parseMatrixVariables(String matrixVariables) {
 		MultiValueMap<String, String> result = new LinkedMultiValueMap<String, String>();
diff --git a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
index 2b6ef1035f..086cbfba6e 100644
--- a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
+++ b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,18 +22,23 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.EnumSet;
 import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.TimeZone;
 
+import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 
-/** @author Arjen Poutsma */
+/**
+ * @author Arjen Poutsma
+ */
 public class HttpHeadersTests {
 
 	private HttpHeaders headers;
@@ -210,6 +215,14 @@ public void expires() {
 		assertEquals("Invalid Expires header", "Thu, 18 Dec 2008 10:20:00 GMT", headers.getFirst("expires"));
 	}
 
+	// SPR-10648 (example is from INT-3063)
+
+	@Test
+	public void expiresInvalidDate() {
+		headers.set("Expires", "-1");
+		assertEquals(-1, headers.getExpires());
+	}
+
 	@Test
 	public void ifModifiedSince() {
 		Calendar calendar = new GregorianCalendar(2008, 11, 18, 11, 20);
@@ -248,5 +261,13 @@ public void contentDisposition() {
 				headers.getFirst("Content-Disposition"));
 	}
 
+	// SPR-11917
+
+	@Test
+	public void getAllowEmptySet() {
+		headers.setAllow(Collections.<HttpMethod> emptySet());
+
+		assertThat(headers.getAllow(), Matchers.emptyCollectionOf(HttpMethod.class));
+	}
 
 }
diff --git a/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
index 8d8f38516b..f8c60a94b4 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java
@@ -17,11 +17,11 @@
 package org.springframework.http.converter;
 
 import java.io.IOException;
+import java.util.Arrays;
 
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
-
+import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
@@ -29,6 +29,8 @@
 import org.springframework.http.MockHttpOutputMessage;
 import org.springframework.util.FileCopyUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Arjen Poutsma
  */
@@ -70,4 +72,15 @@ public void write() throws IOException {
 		assertEquals("Invalid content-length", body.getFile().length(), outputMessage.getHeaders().getContentLength());
 	}
 
+	// SPR-10848
+
+	@Test
+	public void writeByteArrayNullMediaType() throws IOException {
+		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
+		byte[] byteArray = {1, 2, 3};
+		Resource body = new ByteArrayResource(byteArray);
+		converter.write(body, null, outputMessage);
+		assertTrue(Arrays.equals(byteArray, outputMessage.getBodyAsBytes()));
+	}
+
 }
diff --git a/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java
index 57ffc51f35..59d12895ad 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,7 @@
 
 import com.sun.syndication.feed.atom.Entry;
 import com.sun.syndication.feed.atom.Feed;
-import static org.custommonkey.xmlunit.XMLAssert.*;
 import org.custommonkey.xmlunit.XMLUnit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
 import org.xml.sax.SAXException;
@@ -36,7 +33,13 @@
 import org.springframework.http.MockHttpInputMessage;
 import org.springframework.http.MockHttpOutputMessage;
 
-/** @author Arjen Poutsma */
+import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Arjen Poutsma
+ */
 public class AtomFeedHttpMessageConverterTests {
 
 	private AtomFeedHttpMessageConverter converter;
@@ -70,7 +73,7 @@ public void read() throws IOException {
 		Feed result = converter.read(Feed.class, inputMessage);
 		assertEquals("title", result.getTitle());
 		assertEquals("subtitle", result.getSubtitle().getValue());
-		List entries = result.getEntries();
+		List<?> entries = result.getEntries();
 		assertEquals(2, entries.size());
 
 		Entry entry1 = (Entry) entries.get(0);
@@ -95,7 +98,7 @@ public void write() throws IOException, SAXException {
 		entry2.setId("id2");
 		entry2.setTitle("title2");
 
-		List entries = new ArrayList(2);
+		List<Entry> entries = new ArrayList<Entry>(2);
 		entries.add(entry1);
 		entries.add(entry2);
 		feed.setEntries(entries);
@@ -109,7 +112,6 @@ public void write() throws IOException, SAXException {
 				"<entry><id>id1</id><title>title1</title></entry>" +
 				"<entry><id>id2</id><title>title2</title></entry></feed>";
 		assertXMLEqual(expected, outputMessage.getBodyAsString(utf8));
-
 	}
 
 	@Test
@@ -126,5 +128,4 @@ public void writeOtherCharset() throws IOException, SAXException {
 				outputMessage.getHeaders().getContentType());
 	}
 
-
 }
diff --git a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
index 6f7cf78cd3..d29991a685 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,7 @@
 
 import com.sun.syndication.feed.rss.Channel;
 import com.sun.syndication.feed.rss.Item;
-import static org.custommonkey.xmlunit.XMLAssert.*;
 import org.custommonkey.xmlunit.XMLUnit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
 import org.xml.sax.SAXException;
@@ -36,7 +33,13 @@
 import org.springframework.http.MockHttpInputMessage;
 import org.springframework.http.MockHttpOutputMessage;
 
-/** @author Arjen Poutsma */
+import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Arjen Poutsma
+ */
 public class RssChannelHttpMessageConverterTests {
 
 	private RssChannelHttpMessageConverter converter;
@@ -72,7 +75,7 @@ public void read() throws IOException {
 		assertEquals("http://example.com", result.getLink());
 		assertEquals("description", result.getDescription());
 
-		List items = result.getItems();
+		List<?> items = result.getItems();
 		assertEquals(2, items.size());
 
 		Item item1 = (Item) items.get(0);
@@ -95,7 +98,7 @@ public void write() throws IOException, SAXException {
 		Item item2 = new Item();
 		item2.setTitle("title2");
 
-		List items = new ArrayList(2);
+		List<Item> items = new ArrayList<Item>(2);
 		items.add(item1);
 		items.add(item2);
 		channel.setItems(items);
@@ -111,7 +114,6 @@ public void write() throws IOException, SAXException {
 				"<item><title>title2</title></item>" +
 				"</channel></rss>";
 		assertXMLEqual(expected, outputMessage.getBodyAsString(utf8));
-
 	}
 
 	@Test
@@ -134,5 +136,4 @@ public void writeOtherCharset() throws IOException, SAXException {
 				outputMessage.getHeaders().getContentType());
 	}
 
-
-}
\ No newline at end of file
+}
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java
index da72170f55..e36244bfb8 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,6 @@
 
 package org.springframework.http.converter.json;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -35,6 +31,8 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 
+import static org.junit.Assert.*;
+
 /**
  * Base class for Jackson and Jackson 2 converter tests.
  *
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
index a755a7458f..03aad0272a 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,16 +22,17 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import static org.junit.Assert.*;
 import org.junit.Test;
-
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.MediaType;
 import org.springframework.http.MockHttpInputMessage;
 import org.springframework.http.MockHttpOutputMessage;
 
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import static org.junit.Assert.*;
+
 /**
  * Jackson 2.x converter tests.
  *
@@ -112,6 +113,24 @@ public void prettyPrint() throws Exception {
 		assertEquals("{" + NEWLINE_SYSTEM_PROPERTY + "  \"name\" : \"Jason\"" + NEWLINE_SYSTEM_PROPERTY + "}", result);
 	}
 
+	@Test
+	public void prefixJson() throws Exception {
+		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
+		getConverter().setPrefixJson(true);
+		getConverter().writeInternal("foo", outputMessage);
+
+		assertEquals("{} && \"foo\"", outputMessage.getBodyAsString(Charset.forName("UTF-8")));
+	}
+
+	@Test
+	public void prefixJsonCustom() throws Exception {
+		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
+		getConverter().setJsonPrefix(")]}',");
+		getConverter().writeInternal("foo", outputMessage);
+
+		assertEquals(")]}',\"foo\"", outputMessage.getBodyAsString(Charset.forName("UTF-8")));
+	}
+
 
 	public static class PrettyPrintBean {
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java
index 424bb885c8..08d20668b9 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java
@@ -24,14 +24,14 @@
 
 import org.codehaus.jackson.map.type.TypeFactory;
 import org.codehaus.jackson.type.JavaType;
-import static org.junit.Assert.*;
 import org.junit.Test;
-
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.MediaType;
 import org.springframework.http.MockHttpInputMessage;
 import org.springframework.http.MockHttpOutputMessage;
 
+import static org.junit.Assert.*;
+
 /**
  * Jackson 1.x converter tests.
  *
@@ -109,6 +109,24 @@ public void prettyPrint() throws Exception {
 		assertEquals("{" + NEWLINE_SYSTEM_PROPERTY + "  \"name\" : \"Jason\"" + NEWLINE_SYSTEM_PROPERTY + "}", result);
 	}
 
+	@Test
+	public void prefixJson() throws Exception {
+		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
+		getConverter().setPrefixJson(true);
+		getConverter().writeInternal("foo", outputMessage);
+
+		assertEquals("{} && \"foo\"", outputMessage.getBodyAsString(Charset.forName("UTF-8")));
+	}
+
+	@Test
+	public void prefixJsonCustom() throws Exception {
+		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
+		getConverter().setJsonPrefix(")]}',");
+		getConverter().writeInternal("foo", outputMessage);
+
+		assertEquals(")]}',\"foo\"", outputMessage.getBodyAsString(Charset.forName("UTF-8")));
+	}
+
 
 	public static class PrettyPrintBean {
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
index ad189fd662..7f2c6442ae 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,28 +16,34 @@
 
 package org.springframework.http.converter.xml;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import javax.xml.stream.XMLInputFactory;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.springframework.http.MockHttpInputMessage;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+
+import static org.junit.Assert.*;
 
 /**
  * Test fixture for {@link Jaxb2CollectionHttpMessageConverter}.
  *
  * @author Arjen Poutsma
+ * @author Rossen Stoyanchev
  */
 public class Jaxb2CollectionHttpMessageConverterTests {
 
@@ -51,6 +57,9 @@ public class Jaxb2CollectionHttpMessageConverterTests {
 
 	private Type typeSetType;
 
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
 
 	@Before
 	public void setUp() {
@@ -61,6 +70,7 @@ public void setUp() {
 		typeSetType = new ParameterizedTypeReference<Set<TestType>>() {}.getType();
 	}
 
+
 	@Test
 	public void canRead() throws Exception {
 		assertTrue(converter.canRead(rootElementListType, null, null));
@@ -73,7 +83,6 @@ public void canRead() throws Exception {
 	public void readXmlRootElementList() throws Exception {
 		String content = "<list><rootElement><type s=\"1\"/></rootElement><rootElement><type s=\"2\"/></rootElement></list>";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
-
 		List<RootElement> result = (List<RootElement>) converter.read(rootElementListType, null, inputMessage);
 
 		assertEquals("Invalid result", 2, result.size());
@@ -86,7 +95,6 @@ public void readXmlRootElementList() throws Exception {
 	public void readXmlRootElementSet() throws Exception {
 		String content = "<set><rootElement><type s=\"1\"/></rootElement><rootElement><type s=\"2\"/></rootElement></set>";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
-
 		Set<RootElement> result = (Set<RootElement>) converter.read(rootElementSetType, null, inputMessage);
 
 		assertEquals("Invalid result", 2, result.size());
@@ -99,7 +107,6 @@ public void readXmlRootElementSet() throws Exception {
 	public void readXmlTypeList() throws Exception {
 		String content = "<list><foo s=\"1\"/><bar s=\"2\"/></list>";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
-
 		List<TestType> result = (List<TestType>) converter.read(typeListType, null, inputMessage);
 
 		assertEquals("Invalid result", 2, result.size());
@@ -112,7 +119,6 @@ public void readXmlTypeList() throws Exception {
 	public void readXmlTypeSet() throws Exception {
 		String content = "<set><foo s=\"1\"/><bar s=\"2\"/></set>";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
-
 		Set<TestType> result = (Set<TestType>) converter.read(typeSetType, null, inputMessage);
 
 		assertEquals("Invalid result", 2, result.size());
@@ -120,6 +126,84 @@ public void readXmlTypeSet() throws Exception {
 		assertTrue("Invalid result", result.contains(new TestType("2")));
 	}
 
+	@Test
+	@SuppressWarnings("unchecked")
+	public void readXmlRootElementExternalEntityDisabled() throws Exception {
+		Resource external = new ClassPathResource("external.txt", getClass());
+		String content =  "<!DOCTYPE root [" +
+				"  <!ELEMENT external ANY >\n" +
+				"  <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]>" +
+				"  <list><rootElement><type s=\"1\"/><external>&ext;</external></rootElement></list>";
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+
+		converter = new Jaxb2CollectionHttpMessageConverter<Collection<Object>>() {
+			@Override
+			protected XMLInputFactory createXmlInputFactory() {
+				XMLInputFactory inputFactory = super.createXmlInputFactory();
+				inputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, true);
+				return inputFactory;
+			}
+		};
+
+		try {
+			Collection<RootElement> result = converter.read(rootElementListType, null, inputMessage);
+			assertEquals(1, result.size());
+			assertEquals("", result.iterator().next().external);
+		}
+		catch (HttpMessageNotReadableException ex) {
+			// Some parsers raise an exception
+		}
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	public void readXmlRootElementExternalEntityEnabled() throws Exception {
+		Resource external = new ClassPathResource("external.txt", getClass());
+		String content =  "<!DOCTYPE root [" +
+				"  <!ELEMENT external ANY >\n" +
+				"  <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]>" +
+				"  <list><rootElement><type s=\"1\"/><external>&ext;</external></rootElement></list>";
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+
+		Jaxb2CollectionHttpMessageConverter<?> c = new Jaxb2CollectionHttpMessageConverter<Collection<Object>>() {
+			@Override
+			protected XMLInputFactory createXmlInputFactory() {
+				XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+				inputFactory.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, true);
+				return inputFactory;
+			}
+		};
+
+		Collection<RootElement> result = c.read(rootElementListType, null, inputMessage);
+		assertEquals(1, result.size());
+		assertEquals("Foo Bar", result.iterator().next().external);
+	}
+
+	@Test
+	public void testXmlBomb() throws Exception {
+		// https://en.wikipedia.org/wiki/Billion_laughs
+		// https://msdn.microsoft.com/en-us/magazine/ee335713.aspx
+		String content = "<?xml version=\"1.0\"?>\n" +
+				"<!DOCTYPE lolz [\n" +
+				" <!ENTITY lol \"lol\">\n" +
+				" <!ELEMENT lolz (#PCDATA)>\n" +
+				" <!ENTITY lol1 \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\">\n" +
+				" <!ENTITY lol2 \"&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;\">\n" +
+				" <!ENTITY lol3 \"&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;\">\n" +
+				" <!ENTITY lol4 \"&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;\">\n" +
+				" <!ENTITY lol5 \"&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;\">\n" +
+				" <!ENTITY lol6 \"&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;\">\n" +
+				" <!ENTITY lol7 \"&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;\">\n" +
+				" <!ENTITY lol8 \"&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;\">\n" +
+				" <!ENTITY lol9 \"&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;\">\n" +
+				"]>\n" +
+				"<list><rootElement><external>&lol9;</external></rootElement></list>";
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		this.thrown.expect(HttpMessageNotReadableException.class);
+		this.thrown.expectMessage("\"lol9\"");
+		this.converter.read(this.rootElementListType, null, inputMessage);
+	}
+
 
 	@XmlRootElement
 	public static class RootElement {
@@ -134,6 +218,9 @@ public RootElement(String s) {
 		@XmlElement
 		public TestType type = new TestType();
 
+		@XmlElement(required=false)
+		public String external;
+
 		@Override
 		public boolean equals(Object o) {
 			if (this == o) {
@@ -152,6 +239,7 @@ public int hashCode() {
 		}
 	}
 
+
 	@XmlType
 	public static class TestType {
 
@@ -181,9 +269,6 @@ public boolean equals(Object o) {
 		public int hashCode() {
 			return s.hashCode();
 		}
-
-
-
 	}
 
-}
+}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
similarity index 60%
rename from spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java
rename to spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
index 2f12bc988b..321c7a3536 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,22 +22,31 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import org.springframework.aop.framework.AdvisedSupport;
 import org.springframework.aop.framework.AopProxy;
 import org.springframework.aop.framework.DefaultAopProxyFactory;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.http.MockHttpInputMessage;
 import org.springframework.http.MockHttpOutputMessage;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+
+import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-/** @author Arjen Poutsma */
-public class Jaxb2RootElementHttpMessageConverterTest {
+/**
+ * @author Arjen Poutsma
+ * @author Rossen Stoyanchev
+ */
+public class Jaxb2RootElementHttpMessageConverterTests {
 
 	private Jaxb2RootElementHttpMessageConverter converter;
 
@@ -45,6 +54,10 @@ public class Jaxb2RootElementHttpMessageConverterTest {
 
 	private RootElement rootElementCglib;
 
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+
 	@Before
 	public void setUp() {
 		converter = new Jaxb2RootElementHttpMessageConverter();
@@ -57,6 +70,7 @@ public void setUp() {
 		rootElementCglib = (RootElement) proxy.getProxy();
 	}
 
+
 	@Test
 	public void canRead() throws Exception {
 		assertTrue("Converter does not support reading @XmlRootElement", converter.canRead(RootElement.class, null));
@@ -95,6 +109,59 @@ public void readXmlType() throws Exception {
 		assertEquals("Invalid result", "Hello World", result.s);
 	}
 
+	@Test
+	public void readXmlRootElementExternalEntityDisabled() throws Exception {
+		Resource external = new ClassPathResource("external.txt", getClass());
+		String content =  "<!DOCTYPE root SYSTEM \"http://192.168.28.42/1.jsp\" [" +
+				"  <!ELEMENT external ANY >\n" +
+				"  <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]>" +
+				"  <rootElement><external>&ext;</external></rootElement>";
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		converter.setSupportDtd(true);
+		RootElement rootElement = (RootElement) converter.read(RootElement.class, inputMessage);
+
+		assertEquals("", rootElement.external);
+	}
+
+	@Test
+	public void readXmlRootElementExternalEntityEnabled() throws Exception {
+		Resource external = new ClassPathResource("external.txt", getClass());
+		String content =  "<!DOCTYPE root [" +
+				"  <!ELEMENT external ANY >\n" +
+				"  <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]>" +
+				"  <rootElement><external>&ext;</external></rootElement>";
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		this.converter.setProcessExternalEntities(true);
+		RootElement rootElement = (RootElement) converter.read(RootElement.class, inputMessage);
+
+		assertEquals("Foo Bar", rootElement.external);
+	}
+
+	@Test
+	public void testXmlBomb() throws Exception {
+		// https://en.wikipedia.org/wiki/Billion_laughs
+		// https://msdn.microsoft.com/en-us/magazine/ee335713.aspx
+		String content = "<?xml version=\"1.0\"?>\n" +
+				"<!DOCTYPE lolz [\n" +
+				" <!ENTITY lol \"lol\">\n" +
+				" <!ELEMENT lolz (#PCDATA)>\n" +
+				" <!ENTITY lol1 \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\">\n" +
+				" <!ENTITY lol2 \"&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;\">\n" +
+				" <!ENTITY lol3 \"&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;\">\n" +
+				" <!ENTITY lol4 \"&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;\">\n" +
+				" <!ENTITY lol5 \"&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;\">\n" +
+				" <!ENTITY lol6 \"&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;\">\n" +
+				" <!ENTITY lol7 \"&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;\">\n" +
+				" <!ENTITY lol8 \"&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;\">\n" +
+				" <!ENTITY lol9 \"&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;\">\n" +
+				"]>\n" +
+				"<rootElement><external>&lol9;</external></rootElement>";
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		this.thrown.expect(HttpMessageNotReadableException.class);
+		this.thrown.expectMessage("DOCTYPE");
+		this.converter.read(RootElement.class, inputMessage);
+	}
+
 	@Test
 	public void writeXmlRootElement() throws Exception {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
@@ -115,24 +182,27 @@ public void writeXmlRootElementSubclass() throws Exception {
 				outputMessage.getBodyAsString(Charset.forName("UTF-8")));
 	}
 
+
 	@XmlRootElement
 	public static class RootElement {
 
 		@XmlElement
 		public Type type = new Type();
 
+		@XmlElement(required=false)
+		public String external;
 	}
 
+
 	@XmlType
 	public static class Type {
 
 		@XmlAttribute
 		public String s = "Hello World";
-
 	}
 
-	public static class RootElementSubclass extends RootElement {
 
+	public static class RootElementSubclass extends RootElement {
 	}
 
 }
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
index c34e202330..69d6624444 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,10 @@
 
 package org.springframework.http.converter.xml;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.nio.charset.Charset;
-
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
@@ -31,27 +27,55 @@
 import javax.xml.transform.stream.StreamSource;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.http.MockHttpInputMessage;
 import org.springframework.http.MockHttpOutputMessage;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.util.FileCopyUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
+
+import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Arjen Poutsma
+ * @author Rossen Stoyanchev
  */
 public class SourceHttpMessageConverterTests {
 
+	private static final String BODY = "<root>Hello World</root>";
+
 	private SourceHttpMessageConverter<Source> converter;
 
+	private String bodyExternal;
+
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+
 	@Before
-	public void setUp() {
+	public void setUp() throws IOException {
 		converter = new SourceHttpMessageConverter<Source>();
+		Resource external = new ClassPathResource("external.txt", getClass());
+		bodyExternal = "<!DOCTYPE root SYSTEM \"http://192.168.28.42/1.jsp\" [" +
+				"  <!ELEMENT root ANY >\n" +
+				"  <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]><root>&ext;</root>";
 	}
 
+
 	@Test
 	public void canRead() {
 		assertTrue(converter.canRead(Source.class, new MediaType("application", "xml")));
@@ -67,39 +91,122 @@ public void canWrite() {
 
 	@Test
 	public void readDOMSource() throws Exception {
-		String body = "<root>Hello World</root>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes("UTF-8"));
+		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		DOMSource result = (DOMSource) converter.read(DOMSource.class, inputMessage);
+		Document document = (Document) result.getNode();
+		assertEquals("Invalid result", "root", document.getDocumentElement().getLocalName());
+	}
+
+	@Test
+	public void readDOMSourceExternal() throws Exception {
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(bodyExternal.getBytes("UTF-8"));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		converter.setSupportDtd(true);
 		DOMSource result = (DOMSource) converter.read(DOMSource.class, inputMessage);
 		Document document = (Document) result.getNode();
 		assertEquals("Invalid result", "root", document.getDocumentElement().getLocalName());
+		assertNotEquals("Invalid result", "Foo Bar", document.getDocumentElement().getTextContent());
+	}
+
+	@Test
+	public void readDomSourceWithXmlBomb() throws Exception {
+		// https://en.wikipedia.org/wiki/Billion_laughs
+		// https://msdn.microsoft.com/en-us/magazine/ee335713.aspx
+		String content = "<?xml version=\"1.0\"?>\n" +
+				"<!DOCTYPE lolz [\n" +
+				" <!ENTITY lol \"lol\">\n" +
+				" <!ELEMENT lolz (#PCDATA)>\n" +
+				" <!ENTITY lol1 \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\">\n" +
+				" <!ENTITY lol2 \"&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;\">\n" +
+				" <!ENTITY lol3 \"&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;\">\n" +
+				" <!ENTITY lol4 \"&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;\">\n" +
+				" <!ENTITY lol5 \"&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;\">\n" +
+				" <!ENTITY lol6 \"&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;\">\n" +
+				" <!ENTITY lol7 \"&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;\">\n" +
+				" <!ENTITY lol8 \"&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;\">\n" +
+				" <!ENTITY lol9 \"&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;\">\n" +
+				"]>\n" +
+				"<root>&lol9;</root>";
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+
+		this.thrown.expect(HttpMessageNotReadableException.class);
+		this.thrown.expectMessage("DOCTYPE");
+
+		this.converter.read(DOMSource.class, inputMessage);
 	}
 
 	@Test
 	public void readSAXSource() throws Exception {
-		String body = "<root>Hello World</root>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes("UTF-8"));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
 		SAXSource result = (SAXSource) converter.read(SAXSource.class, inputMessage);
 		InputSource inputSource = result.getInputSource();
 		String s = FileCopyUtils.copyToString(new InputStreamReader(inputSource.getByteStream()));
-		assertXMLEqual("Invalid result", body, s);
+		assertXMLEqual("Invalid result", BODY, s);
+	}
+
+	@Test
+	public void readSAXSourceExternal() throws Exception {
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(bodyExternal.getBytes("UTF-8"));
+		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		converter.setSupportDtd(true);
+		SAXSource result = (SAXSource) converter.read(SAXSource.class, inputMessage);
+		InputSource inputSource = result.getInputSource();
+		XMLReader reader = result.getXMLReader();
+		reader.setContentHandler(new DefaultHandler() {
+			@Override
+			public void characters(char[] ch, int start, int length) throws SAXException {
+				String s = new String(ch, start, length);
+				assertNotEquals("Invalid result", "Foo Bar", s);
+			}
+		});
+		reader.parse(inputSource);
+	}
+
+	@Test
+	public void readSAXSourceWithXmlBomb() throws Exception {
+		// https://en.wikipedia.org/wiki/Billion_laughs
+		// https://msdn.microsoft.com/en-us/magazine/ee335713.aspx
+		String content = "<?xml version=\"1.0\"?>\n" +
+				"<!DOCTYPE lolz [\n" +
+				" <!ENTITY lol \"lol\">\n" +
+				" <!ELEMENT lolz (#PCDATA)>\n" +
+				" <!ENTITY lol1 \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\">\n" +
+				" <!ENTITY lol2 \"&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;\">\n" +
+				" <!ENTITY lol3 \"&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;\">\n" +
+				" <!ENTITY lol4 \"&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;\">\n" +
+				" <!ENTITY lol5 \"&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;\">\n" +
+				" <!ENTITY lol6 \"&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;\">\n" +
+				" <!ENTITY lol7 \"&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;\">\n" +
+				" <!ENTITY lol8 \"&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;\">\n" +
+				" <!ENTITY lol9 \"&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;\">\n" +
+				"]>\n" +
+				"<root>&lol9;</root>";
+
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes("UTF-8"));
+		SAXSource result = (SAXSource) this.converter.read(SAXSource.class, inputMessage);
+
+		this.thrown.expect(SAXException.class);
+		this.thrown.expectMessage("DOCTYPE");
+
+		InputSource inputSource = result.getInputSource();
+		XMLReader reader = result.getXMLReader();
+		reader.parse(inputSource);
 	}
 
 	@Test
 	public void readStreamSource() throws Exception {
-		String body = "<root>Hello World</root>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes("UTF-8"));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
 		StreamSource result = (StreamSource) converter.read(StreamSource.class, inputMessage);
 		String s = FileCopyUtils.copyToString(new InputStreamReader(result.getInputStream()));
-		assertXMLEqual("Invalid result", body, s);
+		assertXMLEqual("Invalid result", BODY, s);
 	}
 
 	@Test
 	public void readSource() throws Exception {
-		String body = "<root>Hello World</root>";
-		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(BODY.getBytes("UTF-8"));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
 		converter.read(Source.class, inputMessage);
 	}
@@ -128,7 +235,6 @@ public void writeDOMSource() throws Exception {
 	public void writeSAXSource() throws Exception {
 		String xml = "<root>Hello World</root>";
 		SAXSource saxSource = new SAXSource(new InputSource(new StringReader(xml)));
-
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		converter.write(saxSource, null, outputMessage);
 		assertXMLEqual("Invalid result", "<root>Hello World</root>",
@@ -141,7 +247,6 @@ public void writeSAXSource() throws Exception {
 	public void writeStreamSource() throws Exception {
 		String xml = "<root>Hello World</root>";
 		StreamSource streamSource = new StreamSource(new StringReader(xml));
-
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		converter.write(streamSource, null, outputMessage);
 		assertXMLEqual("Invalid result", "<root>Hello World</root>",
@@ -150,4 +255,4 @@ public void writeStreamSource() throws Exception {
 				outputMessage.getHeaders().getContentType());
 	}
 
-}
+}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
index 9b0555ae57..490b0369b0 100644
--- a/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,12 +40,14 @@ public class ServletServerHttpRequestTests {
 
 	private MockHttpServletRequest mockRequest;
 
+
 	@Before
 	public void create() throws Exception {
 		mockRequest = new MockHttpServletRequest();
 		request = new ServletServerHttpRequest(mockRequest);
 	}
 
+
 	@Test
 	public void getMethod() throws Exception {
 		mockRequest.setMethod("POST");
@@ -66,8 +68,8 @@ public void getURI() throws Exception {
 	public void getHeaders() throws Exception {
 		String headerName = "MyHeader";
 		String headerValue1 = "value1";
-		mockRequest.addHeader(headerName, headerValue1);
 		String headerValue2 = "value2";
+		mockRequest.addHeader(headerName, headerValue1);
 		mockRequest.addHeader(headerName, headerValue2);
 		mockRequest.setContentType("text/plain");
 		mockRequest.setCharacterEncoding("UTF-8");
@@ -83,6 +85,26 @@ public void getHeaders() throws Exception {
 				headers.getContentType());
 	}
 
+	@Test
+	public void getHeadersWithEmptyContentTypeAndEncoding() throws Exception {
+		String headerName = "MyHeader";
+		String headerValue1 = "value1";
+		String headerValue2 = "value2";
+		mockRequest.addHeader(headerName, headerValue1);
+		mockRequest.addHeader(headerName, headerValue2);
+		mockRequest.setContentType("");
+		mockRequest.setCharacterEncoding("");
+
+		HttpHeaders headers = request.getHeaders();
+		assertNotNull("No HttpHeaders returned", headers);
+		assertTrue("Invalid headers returned", headers.containsKey(headerName));
+		List<String> headerValues = headers.get(headerName);
+		assertEquals("Invalid header values returned", 2, headerValues.size());
+		assertTrue("Invalid header values returned", headerValues.contains(headerValue1));
+		assertTrue("Invalid header values returned", headerValues.contains(headerValue2));
+		assertNull(headers.getContentType());
+	}
+
 	@Test
 	public void getBody() throws Exception {
 		byte[] content = "Hello World".getBytes("UTF-8");
@@ -106,4 +128,4 @@ public void getFormBody() throws Exception {
 		assertArrayEquals("Invalid content returned", content, result);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java
index c5dc6d7601..ca858632e6 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,6 +52,7 @@
 
 import org.springframework.util.Assert;
 import org.springframework.util.LinkedCaseInsensitiveMap;
+import org.springframework.util.StringUtils;
 
 /**
  * Mock implementation of the {@link javax.servlet.http.HttpServletRequest}
@@ -331,9 +332,10 @@ public void setCharacterEncoding(String characterEncoding) {
 	}
 
 	private void updateContentTypeHeader() {
-		if (this.contentType != null) {
+		if (StringUtils.hasLength(this.contentType)) {
 			StringBuilder sb = new StringBuilder(this.contentType);
-			if (!this.contentType.toLowerCase().contains(CHARSET_PREFIX) && this.characterEncoding != null) {
+			if (!this.contentType.toLowerCase().contains(CHARSET_PREFIX) &&
+					StringUtils.hasLength(this.characterEncoding)) {
 				sb.append(";").append(CHARSET_PREFIX).append(this.characterEncoding);
 			}
 			doAddHeaderValue(CONTENT_TYPE_HEADER, sb.toString(), true);
@@ -354,8 +356,7 @@ public void setContentType(String contentType) {
 		if (contentType != null) {
 			int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX);
 			if (charsetIndex != -1) {
-				String encoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
-				this.characterEncoding = encoding;
+				this.characterEncoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
 			}
 			updateContentTypeHeader();
 		}
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java
index dd070c7785..9f2df6ed34 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java
@@ -258,16 +258,15 @@ public int getEffectiveMinorVersion() {
 	}
 
 	/**
-	 * This method uses the Java Activation framework, which returns
-	 * "application/octet-stream" when the mime type is unknown (i.e. it never returns
-	 * {@code null}). In order to maintain the {@link ServletContext#getMimeType(String)
-	 * contract, as of version 3.2.2, this method returns null if the mimeType is
-	 * "application/octet-stream".
+	 * This method uses the Java Activation framework, which returns "application/octet-stream"
+	 * when the mime type is unknown (i.e. it never returns {@code null}). In order to maintain
+	 * the {@link ServletContext#getMimeType(String)} contract, this method returns {@code null}
+	 * if the mimeType is "application/octet-stream", as of Spring 3.2.2.
 	 */
 	@Override
 	public String getMimeType(String filePath) {
 		String mimeType = MimeTypeResolver.getMimeType(filePath);
-		return ("application/octet-stream".equals(mimeType)) ? null : mimeType;
+		return ("application/octet-stream".equals(mimeType) ? null : mimeType);
 	}
 
 	@Override
diff --git a/spring-web/src/test/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBeanTests.java b/spring-web/src/test/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBeanTests.java
index d086093402..13fd1f1061 100644
--- a/spring-web/src/test/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBeanTests.java
+++ b/spring-web/src/test/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.web.accept;
 
-import static org.junit.Assert.assertEquals;
+package org.springframework.web.accept;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -24,13 +23,19 @@
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.test.MockHttpServletRequest;
+import org.springframework.mock.web.test.MockServletContext;
+import org.springframework.util.StringUtils;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.ServletWebRequest;
 
+import static org.junit.Assert.*;
+
 /**
  * Test fixture for {@link ContentNegotiationManagerFactoryBean} tests.
+ *
  * @author Rossen Stoyanchev
  */
 public class ContentNegotiationManagerFactoryBeanTests {
@@ -41,15 +46,20 @@ public class ContentNegotiationManagerFactoryBeanTests {
 
 	private MockHttpServletRequest servletRequest;
 
+
 	@Before
 	public void setup() {
-		this.servletRequest = new MockHttpServletRequest();
+		TestServletContext servletContext = new TestServletContext();
+		servletContext.getMimeTypes().put("foo", "application/foo");
+
+		this.servletRequest = new MockHttpServletRequest(servletContext);
 		this.webRequest = new ServletWebRequest(this.servletRequest);
 
 		this.factoryBean = new ContentNegotiationManagerFactoryBean();
 		this.factoryBean.setServletContext(this.servletRequest.getServletContext());
 	}
 
+
 	@Test
 	public void defaultSettings() throws Exception {
 		this.factoryBean.afterPropertiesSet();
@@ -74,16 +84,36 @@ public void defaultSettings() throws Exception {
 	}
 
 	@Test
-	public void addMediaTypes() throws Exception {
-		Map<String, MediaType> mediaTypes = new HashMap<String, MediaType>();
-		mediaTypes.put("json", MediaType.APPLICATION_JSON);
-		this.factoryBean.addMediaTypes(mediaTypes);
+	public void favorPath() throws Exception {
+		this.factoryBean.setFavorPathExtension(true);
+		this.factoryBean.addMediaTypes(Collections.singletonMap("bar", new MediaType("application", "bar")));
+		this.factoryBean.afterPropertiesSet();
+		ContentNegotiationManager manager = this.factoryBean.getObject();
+
+		this.servletRequest.setRequestURI("/flower.foo");
+		assertEquals(Collections.singletonList(new MediaType("application", "foo")),
+				manager.resolveMediaTypes(this.webRequest));
+
+		this.servletRequest.setRequestURI("/flower.bar");
+		assertEquals(Collections.singletonList(new MediaType("application", "bar")),
+				manager.resolveMediaTypes(this.webRequest));
+
+		this.servletRequest.setRequestURI("/flower.gif");
+		assertEquals(Collections.singletonList(MediaType.IMAGE_GIF), manager.resolveMediaTypes(this.webRequest));
+	}
 
+	@Test
+	public void favorPathWithJafTurnedOff() throws Exception {
+		this.factoryBean.setFavorPathExtension(true);
+		this.factoryBean.setUseJaf(false);
 		this.factoryBean.afterPropertiesSet();
 		ContentNegotiationManager manager = this.factoryBean.getObject();
 
-		this.servletRequest.setRequestURI("/flower.json");
-		assertEquals(Arrays.asList(MediaType.APPLICATION_JSON), manager.resolveMediaTypes(this.webRequest));
+		this.servletRequest.setRequestURI("/flower.foo");
+		assertEquals(Collections.emptyList(), manager.resolveMediaTypes(this.webRequest));
+
+		this.servletRequest.setRequestURI("/flower.gif");
+		assertEquals(Collections.emptyList(), manager.resolveMediaTypes(this.webRequest));
 	}
 
 	@Test
@@ -122,6 +152,26 @@ public void setDefaultContentType() throws Exception {
 		ContentNegotiationManager manager = this.factoryBean.getObject();
 
 		assertEquals(Arrays.asList(MediaType.APPLICATION_JSON), manager.resolveMediaTypes(this.webRequest));
+
+		// SPR-10513
+		this.servletRequest.addHeader("Accept", MediaType.ALL_VALUE);
+		assertEquals(Arrays.asList(MediaType.APPLICATION_JSON), manager.resolveMediaTypes(this.webRequest));
+	}
+
+
+	private static class TestServletContext extends MockServletContext {
+
+		private final Map<String, String> mimeTypes = new HashMap<String, String>();
+
+		public Map<String, String> getMimeTypes() {
+			return this.mimeTypes;
+		}
+
+		@Override
+		public String getMimeType(String filePath) {
+			String extension = StringUtils.getFilenameExtension(filePath);
+			return getMimeTypes().get(extension);
+		}
 	}
 
 }
diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java
index b3e347fd5f..6ec3f5b580 100644
--- a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,20 +21,21 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
-import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.PropertyValues;
-import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockMultipartFile;
 import org.springframework.mock.web.test.MockMultipartHttpServletRequest;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.web.bind.ServletRequestParameterPropertyValues;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.multipart.support.StringMultipartFileEditor;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Juergen Hoeller
  */
@@ -146,6 +147,28 @@ public void testFieldDefaultPreemptsFieldMarker() throws Exception {
 		assertFalse(target.isPostProcessed());
 	}
 
+	@Test
+	public void testFieldDefaultWithNestedProperty() throws Exception {
+		TestBean target = new TestBean();
+		target.setSpouse(new TestBean());
+		WebRequestDataBinder binder = new WebRequestDataBinder(target);
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addParameter("!spouse.postProcessed", "on");
+		request.addParameter("_spouse.postProcessed", "visible");
+		request.addParameter("spouse.postProcessed", "on");
+		binder.bind(new ServletWebRequest(request));
+		assertTrue(((TestBean) target.getSpouse()).isPostProcessed());
+
+		request.removeParameter("spouse.postProcessed");
+		binder.bind(new ServletWebRequest(request));
+		assertTrue(((TestBean) target.getSpouse()).isPostProcessed());
+
+		request.removeParameter("!spouse.postProcessed");
+		binder.bind(new ServletWebRequest(request));
+		assertFalse(((TestBean) target.getSpouse()).isPostProcessed());
+	}
+
 	@Test
 	public void testFieldDefaultNonBoolean() throws Exception {
 		TestBean target = new TestBean();
diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
index fcfc340770..6321505197 100644
--- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,9 +68,9 @@ public void setUp() {
 		response = mock(ClientHttpResponse.class);
 		errorHandler = mock(ResponseErrorHandler.class);
 		converter = mock(HttpMessageConverter.class);
-		template = new RestTemplate(requestFactory);
+		template = new RestTemplate(Collections.<HttpMessageConverter<?>>singletonList(converter));
+		template.setRequestFactory(requestFactory);
 		template.setErrorHandler(errorHandler);
-		template.setMessageConverters(Collections.<HttpMessageConverter<?>>singletonList(converter));
 	}
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java b/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java
index 2e5688857f..df2e20a2b2 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,11 @@
 package org.springframework.web.context.request;
 
 import java.io.Serializable;
-
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 
 import org.junit.Test;
+
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpSession;
 
@@ -39,23 +40,12 @@ public class ServletRequestAttributesTests {
 	private static final Serializable VALUE = new Serializable() {
 	};
 
+
 	@Test(expected = IllegalArgumentException.class)
 	public void ctorRejectsNullArg() throws Exception {
 		new ServletRequestAttributes(null);
 	}
 
-	@Test
-	public void updateAccessedAttributes() throws Exception {
-		MockHttpSession session = new MockHttpSession();
-		session.setAttribute(KEY, VALUE);
-		MockHttpServletRequest request = new MockHttpServletRequest();
-		request.setSession(session);
-		ServletRequestAttributes attrs = new ServletRequestAttributes(request);
-		Object value = attrs.getAttribute(KEY, RequestAttributes.SCOPE_SESSION);
-		assertSame(VALUE, value);
-		attrs.requestCompleted();
-	}
-
 	@Test
 	public void setRequestScopedAttribute() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest();
@@ -162,4 +152,20 @@ public void removeSessionScopedAttributeDoesNotForceCreationOfSession() throws E
 		verify(request).getSession(false);
 	}
 
+	@Test
+	public void updateAccessedAttributes() throws Exception {
+		HttpServletRequest request = mock(HttpServletRequest.class);
+		HttpSession session = mock(HttpSession.class);
+		when(request.getSession(anyBoolean())).thenReturn(session);
+		when(session.getAttribute(KEY)).thenReturn(VALUE);
+
+		ServletRequestAttributes attrs = new ServletRequestAttributes(request);
+		assertSame(VALUE, attrs.getAttribute(KEY, RequestAttributes.SCOPE_SESSION));
+		attrs.requestCompleted();
+
+		verify(session, times(2)).getAttribute(KEY);
+		verify(session).setAttribute(KEY, VALUE);
+		verifyNoMoreInteractions(session);
+	}
+
 }
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java b/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
index 18598f31c5..dc3ad4b062 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestTests.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -37,6 +37,7 @@
 
 /**
  * @author Juergen Hoeller
+ * @author Markus Malkusch
  * @since 26.07.2006
  */
 public class ServletWebRequestTests {
@@ -68,13 +69,13 @@ public void parameters() {
 		assertEquals("value2", request.getParameterValues("param2")[0]);
 		assertEquals("value2a", request.getParameterValues("param2")[1]);
 
-		Map paramMap = request.getParameterMap();
+		Map<String, String[]> paramMap = request.getParameterMap();
 		assertEquals(2, paramMap.size());
-		assertEquals(1, ((String[]) paramMap.get("param1")).length);
-		assertEquals("value1", ((String[]) paramMap.get("param1"))[0]);
-		assertEquals(2, ((String[]) paramMap.get("param2")).length);
-		assertEquals("value2", ((String[]) paramMap.get("param2"))[0]);
-		assertEquals("value2a", ((String[]) paramMap.get("param2"))[1]);
+		assertEquals(1, paramMap.get("param1").length);
+		assertEquals("value1", paramMap.get("param1")[0]);
+		assertEquals(2, paramMap.get("param2").length);
+		assertEquals("value2", paramMap.get("param2")[0]);
+		assertEquals("value2a", paramMap.get("param2")[1]);
 	}
 
 	@Test
@@ -116,49 +117,110 @@ public void decoratedNativeRequest() {
 	}
 
 	@Test
-	public void checkNotModifiedTimeStamp() {
+	public void checkNotModifiedTimestampForGET() {
 		long currentTime = new Date().getTime();
 		servletRequest.setMethod("GET");
 		servletRequest.addHeader("If-Modified-Since", currentTime);
 
-		request.checkNotModified(currentTime);
-
+		assertTrue(request.checkNotModified(currentTime));
 		assertEquals(304, servletResponse.getStatus());
 	}
 
 	@Test
-	public void checkModifiedTimeStamp() {
+	public void checkModifiedTimestampForGET() {
 		long currentTime = new Date().getTime();
 		long oneMinuteAgo  = currentTime - (1000 * 60);
 		servletRequest.setMethod("GET");
 		servletRequest.addHeader("If-Modified-Since", oneMinuteAgo);
 
-		request.checkNotModified(currentTime);
+		assertFalse(request.checkNotModified(currentTime));
+		assertEquals(200, servletResponse.getStatus());
+		assertEquals("" + currentTime, servletResponse.getHeader("Last-Modified"));
+	}
+
+	@Test
+	public void checkNotModifiedTimestampForHEAD() {
+		long currentTime = new Date().getTime();
+		servletRequest.setMethod("HEAD");
+		servletRequest.addHeader("If-Modified-Since", currentTime);
+
+		assertTrue(request.checkNotModified(currentTime));
+		assertEquals(304, servletResponse.getStatus());
+	}
+
+	@Test
+	public void checkModifiedTimestampForHEAD() {
+		long currentTime = new Date().getTime();
+		long oneMinuteAgo  = currentTime - (1000 * 60);
+		servletRequest.setMethod("HEAD");
+		servletRequest.addHeader("If-Modified-Since", oneMinuteAgo);
 
+		assertFalse(request.checkNotModified(currentTime));
 		assertEquals(200, servletResponse.getStatus());
 		assertEquals(""+currentTime, servletResponse.getHeader("Last-Modified"));
 	}
 
 	@Test
-	public void checkNotModifiedETag() {
+	public void checkNotModifiedTimestampWithLengthPart() {
+		long currentTime = Date.parse("Wed, 09 Apr 2014 09:57:42 GMT");
+		servletRequest.setMethod("GET");
+		servletRequest.addHeader("If-Modified-Since", "Wed, 09 Apr 2014 09:57:42 GMT; length=13774");
+
+		assertTrue(request.checkNotModified(currentTime));
+		assertEquals(304, servletResponse.getStatus());
+	}
+
+	@Test
+	public void checkModifiedTimestampWithLengthPart() {
+		long currentTime = Date.parse("Wed, 09 Apr 2014 09:57:42 GMT");
+		servletRequest.setMethod("GET");
+		servletRequest.addHeader("If-Modified-Since", "Wed, 08 Apr 2014 09:57:42 GMT; length=13774");
+
+		assertFalse(request.checkNotModified(currentTime));
+		assertEquals(200, servletResponse.getStatus());
+		assertEquals("" + currentTime, servletResponse.getHeader("Last-Modified"));
+	}
+
+	@Test
+	public void checkNotModifiedETagForGET() {
 		String eTag = "\"Foo\"";
 		servletRequest.setMethod("GET");
 		servletRequest.addHeader("If-None-Match", eTag );
 
-		request.checkNotModified(eTag);
-
+		assertTrue(request.checkNotModified(eTag));
 		assertEquals(304, servletResponse.getStatus());
 	}
 
 	@Test
-	public void checkModifiedETag() {
+	public void checkModifiedETagForGET() {
 		String currentETag = "\"Foo\"";
 		String oldEtag = "Bar";
 		servletRequest.setMethod("GET");
 		servletRequest.addHeader("If-None-Match", oldEtag);
 
-		request.checkNotModified(currentETag);
+		assertFalse(request.checkNotModified(currentETag));
+		assertEquals(200, servletResponse.getStatus());
+		assertEquals(currentETag, servletResponse.getHeader("ETag"));
+	}
+
+	@Test
+	public void checkNotModifiedETagForHEAD() {
+		String eTag = "\"Foo\"";
+		servletRequest.setMethod("HEAD");
+		servletRequest.addHeader("If-None-Match", eTag );
+
+		assertTrue(request.checkNotModified(eTag));
+		assertEquals(304, servletResponse.getStatus());
+	}
+
+	@Test
+	public void checkModifiedETagForHEAD() {
+		String currentETag = "\"Foo\"";
+		String oldEtag = "Bar";
+		servletRequest.setMethod("HEAD");
+		servletRequest.addHeader("If-None-Match", oldEtag);
 
+		assertFalse(request.checkNotModified(currentETag));
 		assertEquals(200, servletResponse.getStatus());
 		assertEquals(currentETag, servletResponse.getHeader("ETag"));
 	}
diff --git a/spring-web/src/test/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContextTests.java b/spring-web/src/test/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContextTests.java
index d427f7f381..93e647e823 100644
--- a/spring-web/src/test/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContextTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/support/AnnotationConfigWebApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,8 @@
 
 package org.springframework.web.context.support;
 
-import static org.junit.Assert.assertNotNull;
-
 import org.junit.Test;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.annotation.AnnotationBeanNameGenerator;
@@ -26,18 +25,17 @@
 import org.springframework.context.annotation.Configuration;
 
 import static org.hamcrest.CoreMatchers.*;
-
 import static org.junit.Assert.*;
 
 /**
  * @author Chris Beams
+ * @author Juergen Hoeller
  */
 public class AnnotationConfigWebApplicationContextTests {
 
 	@Test
 	public void registerSingleClass() {
-		AnnotationConfigWebApplicationContext ctx =
-			new AnnotationConfigWebApplicationContext();
+		AnnotationConfigWebApplicationContext ctx = new AnnotationConfigWebApplicationContext();
 		ctx.register(Config.class);
 		ctx.refresh();
 
@@ -47,8 +45,7 @@ public void registerSingleClass() {
 
 	@Test
 	public void configLocationWithSingleClass() {
-		AnnotationConfigWebApplicationContext ctx =
-			new AnnotationConfigWebApplicationContext();
+		AnnotationConfigWebApplicationContext ctx = new AnnotationConfigWebApplicationContext();
 		ctx.setConfigLocation(Config.class.getName());
 		ctx.refresh();
 
@@ -56,10 +53,19 @@ public void configLocationWithSingleClass() {
 		assertNotNull(bean);
 	}
 
+	@Test
+	public void configLocationWithBasePackage() {
+		AnnotationConfigWebApplicationContext ctx = new AnnotationConfigWebApplicationContext();
+		ctx.setConfigLocation("org.springframework.web.context.support");
+		ctx.refresh();
+
+		TestBean bean = ctx.getBean(TestBean.class);
+		assertNotNull(bean);
+	}
+
 	@Test
 	public void withBeanNameGenerator() {
-		AnnotationConfigWebApplicationContext ctx =
-			new AnnotationConfigWebApplicationContext();
+		AnnotationConfigWebApplicationContext ctx = new AnnotationConfigWebApplicationContext();
 		ctx.setBeanNameGenerator(new AnnotationBeanNameGenerator() {
 			@Override
 			public String generateBeanName(BeanDefinition definition,
@@ -75,14 +81,15 @@ public String generateBeanName(BeanDefinition definition,
 
 	@Configuration("myConfig")
 	static class Config {
+
 		@Bean
 		public TestBean myTestBean() {
 			return new TestBean();
 		}
 	}
 
-	static class NotConfigurationAnnotated { }
 
-	static class TestBean { }
+	static class TestBean {
+	}
 
 }
diff --git a/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java
index 15ab9998a4..5a179e726f 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,33 +18,30 @@
 
 import java.io.IOException;
 import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Test;
-import org.junit.Before;
-import static org.junit.Assert.*;
 
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.util.FileCopyUtils;
 
+import static org.junit.Assert.*;
+
 /**
- * Test for {@link AbstractRequestLoggingFilter} and sub classes.
+ * Test for {@link AbstractRequestLoggingFilter} and subclasses.
  *
  * @author Arjen Poutsma
+ * @author Juergen Hoeller
  */
 public class RequestLoggingFilterTests {
 
-	private MyRequestLoggingFilter filter;
+	private final MyRequestLoggingFilter filter = new MyRequestLoggingFilter();
 
-	@Before
-	public void createFilter() throws Exception {
-		filter = new MyRequestLoggingFilter();
-	}
 
 	@Test
 	public void uri() throws Exception {
@@ -53,37 +50,53 @@ public void uri() throws Exception {
 
 		request.setQueryString("booking=42");
 
-		FilterChain filterChain = new NoopFilterChain();
+		FilterChain filterChain = new NoOpFilterChain();
 
 		filter.doFilter(request, response, filterChain);
 
 		assertNotNull(filter.beforeRequestMessage);
-		assertTrue(filter.beforeRequestMessage.indexOf("uri=/hotel") != -1);
-		assertFalse(filter.beforeRequestMessage.indexOf("booking=42") != -1);
+		assertTrue(filter.beforeRequestMessage.contains("uri=/hotel"));
+		assertFalse(filter.beforeRequestMessage.contains("booking=42"));
 
 		assertNotNull(filter.afterRequestMessage);
-		assertTrue(filter.afterRequestMessage.indexOf("uri=/hotel") != -1);
-		assertFalse(filter.afterRequestMessage.indexOf("booking=42") != -1);
+		assertTrue(filter.afterRequestMessage.contains("uri=/hotel"));
+		assertFalse(filter.afterRequestMessage.contains("booking=42"));
 	}
 
 	@Test
-	public void queryString() throws Exception {
+	public void queryStringIncluded() throws Exception {
 		filter.setIncludeQueryString(true);
 
-		final MockHttpServletRequest request = new MockHttpServletRequest("POST", "/hotels");
+		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/hotels");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		request.setQueryString("booking=42");
 
-		FilterChain filterChain = new NoopFilterChain();
+		FilterChain filterChain = new NoOpFilterChain();
+		filter.doFilter(request, response, filterChain);
+
+		assertNotNull(filter.beforeRequestMessage);
+		assertTrue(filter.beforeRequestMessage.contains("[uri=/hotels?booking=42]"));
+
+		assertNotNull(filter.afterRequestMessage);
+		assertTrue(filter.afterRequestMessage.contains("[uri=/hotels?booking=42]"));
+	}
+
+	@Test
+	public void noQueryStringAvailable() throws Exception {
+		filter.setIncludeQueryString(true);
 
+		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/hotels");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		FilterChain filterChain = new NoOpFilterChain();
 		filter.doFilter(request, response, filterChain);
 
 		assertNotNull(filter.beforeRequestMessage);
-		assertTrue(filter.beforeRequestMessage.indexOf("uri=/hotels?booking=42") != -1);
+		assertTrue(filter.beforeRequestMessage.contains("[uri=/hotels]"));
 
 		assertNotNull(filter.afterRequestMessage);
-		assertTrue(filter.afterRequestMessage.indexOf("uri=/hotels?booking=42") != -1);
+		assertTrue(filter.afterRequestMessage.contains("[uri=/hotels]"));
 	}
 
 	@Test
@@ -95,8 +108,8 @@ public void payloadInputStream() throws Exception {
 
 		final byte[] requestBody = "Hello World".getBytes("UTF-8");
 		request.setContent(requestBody);
-		FilterChain filterChain = new FilterChain() {
 
+		FilterChain filterChain = new FilterChain() {
 			@Override
 			public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse)
 					throws IOException, ServletException {
@@ -109,7 +122,7 @@ public void doFilter(ServletRequest filterRequest, ServletResponse filterRespons
 		filter.doFilter(request, response, filterChain);
 
 		assertNotNull(filter.afterRequestMessage);
-		assertTrue(filter.afterRequestMessage.indexOf("Hello World") != -1);
+		assertTrue(filter.afterRequestMessage.contains("Hello World"));
 	}
 
 	@Test
@@ -121,8 +134,8 @@ public void payloadReader() throws Exception {
 
 		final String requestBody = "Hello World";
 		request.setContent(requestBody.getBytes("UTF-8"));
-		FilterChain filterChain = new FilterChain() {
 
+		FilterChain filterChain = new FilterChain() {
 			@Override
 			public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse)
 					throws IOException, ServletException {
@@ -135,7 +148,7 @@ public void doFilter(ServletRequest filterRequest, ServletResponse filterRespons
 		filter.doFilter(request, response, filterChain);
 
 		assertNotNull(filter.afterRequestMessage);
-		assertTrue(filter.afterRequestMessage.indexOf(requestBody) != -1);
+		assertTrue(filter.afterRequestMessage.contains(requestBody));
 	}
 
 	@Test
@@ -148,8 +161,8 @@ public void payloadMaxLength() throws Exception {
 
 		final byte[] requestBody = "Hello World".getBytes("UTF-8");
 		request.setContent(requestBody);
-		FilterChain filterChain = new FilterChain() {
 
+		FilterChain filterChain = new FilterChain() {
 			@Override
 			public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse)
 					throws IOException, ServletException {
@@ -162,10 +175,11 @@ public void doFilter(ServletRequest filterRequest, ServletResponse filterRespons
 		filter.doFilter(request, response, filterChain);
 
 		assertNotNull(filter.afterRequestMessage);
-		assertTrue(filter.afterRequestMessage.indexOf("Hel") != -1);
-		assertFalse(filter.afterRequestMessage.indexOf("Hello World") != -1);
+		assertTrue(filter.afterRequestMessage.contains("Hel"));
+		assertFalse(filter.afterRequestMessage.contains("Hello World"));
 	}
 
+
 	private static class MyRequestLoggingFilter extends AbstractRequestLoggingFilter {
 
 		private String beforeRequestMessage;
@@ -183,7 +197,8 @@ protected void afterRequest(HttpServletRequest request, String message) {
 		}
 	}
 
-	private static class NoopFilterChain implements FilterChain {
+
+	private static class NoOpFilterChain implements FilterChain {
 
 		@Override
 		public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
index bda24d4892..357146ec0d 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,6 @@
 
 package org.springframework.web.method.annotation;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
@@ -32,6 +25,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ParameterNameDiscoverer;
@@ -41,13 +35,21 @@
 import org.springframework.mock.web.test.MockMultipartHttpServletRequest;
 import org.springframework.mock.web.test.MockPart;
 import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.bind.support.WebRequestDataBinder;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.multipart.MultipartException;
 import org.springframework.web.multipart.MultipartFile;
 
+import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.*;
+import static org.mockito.Mockito.*;
+
+
 /**
  * Test fixture with {@link org.springframework.web.method.annotation.RequestParamMethodArgumentResolver}.
  *
@@ -69,6 +71,7 @@ public class RequestParamMethodArgumentResolverTests {
 	private MethodParameter paramServlet30Part;
 	private MethodParameter paramRequestPartAnnot;
 	private MethodParameter paramRequired;
+	private MethodParameter paramNotRequired;
 
 	private NativeWebRequest webRequest;
 
@@ -80,8 +83,10 @@ public void setUp() throws Exception {
 
 		ParameterNameDiscoverer paramNameDiscoverer = new LocalVariableTableParameterNameDiscoverer();
 
-		Method method = getClass().getMethod("params", String.class, String[].class, Map.class, MultipartFile.class,
-				Map.class, String.class, MultipartFile.class, List.class, Part.class, MultipartFile.class, String.class);
+		Method method = getClass().getMethod("params", String.class, String[].class,
+				Map.class, MultipartFile.class, Map.class, String.class,
+				MultipartFile.class, List.class, Part.class, MultipartFile.class,
+				String.class, String.class);
 
 		paramNamedDefaultValueString = new MethodParameter(method, 0);
 		paramNamedStringArray = new MethodParameter(method, 1);
@@ -98,6 +103,7 @@ public void setUp() throws Exception {
 		paramServlet30Part.initParameterNameDiscovery(paramNameDiscoverer);
 		paramRequestPartAnnot = new MethodParameter(method, 9);
 		paramRequired = new MethodParameter(method, 10);
+		paramNotRequired = new MethodParameter(method, 11);
 
 		request = new MockHttpServletRequest();
 		webRequest = new ServletWebRequest(request, new MockHttpServletResponse());
@@ -242,6 +248,40 @@ public void missingRequestParam() throws Exception {
 		fail("Expected exception");
 	}
 
+	// SPR-10578
+
+	@Test
+	public void missingRequestParamEmptyValueConvertedToNull() throws Exception {
+
+		WebDataBinder binder = new WebRequestDataBinder(null);
+		binder.registerCustomEditor(String.class, new StringTrimmerEditor(true));
+
+		WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class);
+		given(binderFactory.createBinder(webRequest, null, "stringNotAnnot")).willReturn(binder);
+
+		this.request.addParameter("stringNotAnnot", "");
+
+		Object arg = resolver.resolveArgument(paramStringNotAnnot, null, webRequest, binderFactory);
+
+		assertNull(arg);
+	}
+
+	@Test
+	public void missingRequestParamEmptyValueNotRequired() throws Exception {
+
+		WebDataBinder binder = new WebRequestDataBinder(null);
+		binder.registerCustomEditor(String.class, new StringTrimmerEditor(true));
+
+		WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class);
+		given(binderFactory.createBinder(webRequest, null, "name")).willReturn(binder);
+
+		this.request.addParameter("name", "");
+
+		Object arg = resolver.resolveArgument(paramNotRequired, null, webRequest, binderFactory);
+
+		assertNull(arg);
+	}
+
 	@Test
 	public void resolveSimpleTypeParam() throws Exception {
 		request.setParameter("stringNotAnnot", "plainValue");
@@ -293,7 +333,8 @@ public void params(@RequestParam(value = "name", defaultValue = "bar") String pa
 			List<MultipartFile> multipartFileList,
 			Part servlet30Part,
 			@RequestPart MultipartFile requestPartAnnot,
-			@RequestParam(value = "name") String paramRequired) {
+			@RequestParam(value = "name") String paramRequired,
+			@RequestParam(value = "name", required=false) String paramNotRequired) {
 	}
 
 }
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java b/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java
index d4e681abe3..b044b257b1 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,11 @@
 
 package org.springframework.web.method.support;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.lang.reflect.Method;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.core.MethodParameter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.mock.web.test.MockHttpServletRequest;
@@ -34,6 +29,9 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.ServletWebRequest;
 
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Test fixture for {@link InvocableHandlerMethod} unit tests.
  *
@@ -45,6 +43,7 @@ public class InvocableHandlerMethodTests {
 
 	private NativeWebRequest webRequest;
 
+
 	@Before
 	public void setUp() throws Exception {
 		Method method = Handler.class.getDeclaredMethod("handle", Integer.class, String.class);
@@ -52,6 +51,7 @@ public void setUp() throws Exception {
 		this.webRequest = new ServletWebRequest(new MockHttpServletRequest(), new MockHttpServletResponse());
 	}
 
+
 	@Test
 	public void resolveArg() throws Exception {
 		StubArgumentResolver intResolver = new StubArgumentResolver(Integer.class, 99);
@@ -63,11 +63,9 @@ public void resolveArg() throws Exception {
 		handlerMethod.setHandlerMethodArgumentResolvers(composite);
 
 		Object returnValue = handlerMethod.invokeForRequest(webRequest, null);
-
 		assertEquals(1, intResolver.getResolvedParameters().size());
 		assertEquals(1, stringResolver.getResolvedParameters().size());
 		assertEquals("99-value", returnValue);
-
 		assertEquals("intArg", intResolver.getResolvedParameters().get(0).getParameterName());
 		assertEquals("stringArg", stringResolver.getResolvedParameters().get(0).getParameterName());
 	}
@@ -83,7 +81,6 @@ public void resolveNullArg() throws Exception {
 		handlerMethod.setHandlerMethodArgumentResolvers(composite);
 
 		Object returnValue = handlerMethod.invokeForRequest(webRequest, null);
-
 		assertEquals(1, intResolver.getResolvedParameters().size());
 		assertEquals(1, stringResolver.getResolvedParameters().size());
 		assertEquals("null-null", returnValue);
@@ -94,7 +91,8 @@ public void cannotResolveArg() throws Exception {
 		try {
 			handlerMethod.invokeForRequest(webRequest, null);
 			fail("Expected exception");
-		} catch (IllegalStateException ex) {
+		}
+		catch (IllegalStateException ex) {
 			assertTrue(ex.getMessage().contains("No suitable resolver for argument [0] [type=java.lang.Integer]"));
 		}
 	}
@@ -118,7 +116,6 @@ public void resolveProvidedArgFirst() throws Exception {
 		handlerMethod.setHandlerMethodArgumentResolvers(composite);
 
 		Object returnValue = handlerMethod.invokeForRequest(webRequest, null, 2, "value2");
-
 		assertEquals("2-value2", returnValue);
 	}
 
@@ -131,9 +128,9 @@ public void exceptionInResolvingArg() throws Exception {
 		try {
 			handlerMethod.invokeForRequest(webRequest, null);
 			fail("Expected exception");
-		} catch (HttpMessageNotReadableException ex) {
-			// Expected..
-			// Allow HandlerMethodArgumentResolver exceptions to propagate..
+		}
+		catch (HttpMessageNotReadableException ex) {
+			// expected -  allow HandlerMethodArgumentResolver exceptions to propagate
 		}
 	}
 
@@ -150,7 +147,8 @@ public void illegalArgumentException() throws Exception {
 		try {
 			handlerMethod.invokeForRequest(webRequest, null);
 			fail("Expected exception");
-		} catch (IllegalArgumentException ex) {
+		}
+		catch (IllegalStateException ex) {
 			assertNotNull("Exception not wrapped", ex.getCause());
 			assertTrue(ex.getCause() instanceof IllegalArgumentException);
 			assertTrue(ex.getMessage().contains("Controller ["));
@@ -166,34 +164,58 @@ public void invocationTargetException() throws Exception {
 		Throwable expected = new RuntimeException("error");
 		try {
 			invokeExceptionRaisingHandler(expected);
-		} catch (RuntimeException actual) {
+		}
+		catch (RuntimeException actual) {
 			assertSame(expected, actual);
 		}
 
 		expected = new Error("error");
 		try {
 			invokeExceptionRaisingHandler(expected);
-		} catch (Error actual) {
+		}
+		catch (Error actual) {
 			assertSame(expected, actual);
 		}
 
 		expected = new Exception("error");
 		try {
 			invokeExceptionRaisingHandler(expected);
-		} catch (Exception actual) {
+		}
+		catch (Exception actual) {
 			assertSame(expected, actual);
 		}
 
 		expected = new Throwable("error");
 		try {
 			invokeExceptionRaisingHandler(expected);
-		} catch (IllegalStateException actual) {
+		}
+		catch (IllegalStateException actual) {
 			assertNotNull(actual.getCause());
 			assertSame(expected, actual.getCause());
 			assertTrue(actual.getMessage().contains("Failed to invoke controller method"));
 		}
 	}
 
+	@Test  // SPR-13917
+	public void invocationErrorMessage() throws Exception {
+		HandlerMethodArgumentResolverComposite composite = new HandlerMethodArgumentResolverComposite();
+		composite.addResolver(new StubArgumentResolver(double.class, null));
+
+		Method method = Handler.class.getDeclaredMethod("handle", double.class);
+		Object handler = new Handler();
+		InvocableHandlerMethod hm = new InvocableHandlerMethod(handler, method);
+		hm.setHandlerMethodArgumentResolvers(composite);
+
+		try {
+			hm.invokeForRequest(this.webRequest, new ModelAndViewContainer());
+			fail();
+		}
+		catch (IllegalStateException ex) {
+			assertThat(ex.getMessage(), containsString("Illegal argument"));
+		}
+	}
+
+
 	private void invokeExceptionRaisingHandler(Throwable expected) throws Exception {
 		Method method = ExceptionRaisingHandler.class.getDeclaredMethod("raiseException");
 		Object handler = new ExceptionRaisingHandler(expected);
@@ -201,14 +223,19 @@ private void invokeExceptionRaisingHandler(Throwable expected) throws Exception
 		fail("Expected exception");
 	}
 
+
 	@SuppressWarnings("unused")
 	private static class Handler {
 
 		public String handle(Integer intArg, String stringArg) {
 			return intArg + "-" + stringArg;
 		}
+
+		public void handle(double amount) {
+		}
 	}
 
+
 	@SuppressWarnings("unused")
 	private static class ExceptionRaisingHandler {
 
@@ -221,9 +248,9 @@ public ExceptionRaisingHandler(Throwable t) {
 		public void raiseException() throws Throwable {
 			throw t;
 		}
-
 	}
 
+
 	private static class ExceptionRaisingArgumentResolver implements HandlerMethodArgumentResolver {
 
 		@Override
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java b/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java
index 3e09c5e523..8e29239493 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,13 @@
 
 package org.springframework.web.method.support;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.ui.ModelMap;
 
+import static org.junit.Assert.*;
+
 /**
  * Test fixture for {@link ModelAndViewContainer}.
  *
@@ -32,44 +33,57 @@ public class ModelAndViewContainerTests {
 
 	private ModelAndViewContainer mavContainer;
 
+
 	@Before
 	public void setup() {
 		this.mavContainer = new ModelAndViewContainer();
 	}
 
+
 	@Test
 	public void getModel() {
 		this.mavContainer.addAttribute("name", "value");
 		assertEquals(1, this.mavContainer.getModel().size());
+		assertEquals("value", this.mavContainer.getModel().get("name"));
 	}
 
 	@Test
-	public void getModelRedirectModel() {
-		ModelMap redirectModel = new ModelMap("name", "redirectValue");
-		this.mavContainer.setRedirectModel(redirectModel);
-		this.mavContainer.addAttribute("name", "value");
+	public void redirectScenarioWithRedirectModel() {
+		this.mavContainer.addAttribute("name1", "value1");
+		this.mavContainer.setRedirectModel(new ModelMap("name2", "value2"));
+		this.mavContainer.setRedirectModelScenario(true);
 
-		assertEquals("Default model should be used if not in redirect scenario",
-				"value", this.mavContainer.getModel().get("name"));
+		assertEquals(1, this.mavContainer.getModel().size());
+		assertEquals("value2", this.mavContainer.getModel().get("name2"));
+	}
 
+	@Test
+	public void redirectScenarioWithoutRedirectModel() {
+		this.mavContainer.addAttribute("name", "value");
 		this.mavContainer.setRedirectModelScenario(true);
 
-		assertEquals("Redirect model should be used in redirect scenario",
-				"redirectValue", this.mavContainer.getModel().get("name"));
+		assertEquals(1, this.mavContainer.getModel().size());
+		assertEquals("value", this.mavContainer.getModel().get("name"));
 	}
 
 	@Test
-	public void getModelIgnoreDefaultModelOnRedirect() {
+	public void ignoreDefaultModel() {
+		this.mavContainer.setIgnoreDefaultModelOnRedirect(true);
 		this.mavContainer.addAttribute("name", "value");
 		this.mavContainer.setRedirectModelScenario(true);
 
-		assertEquals("Default model should be used since no redirect model was provided",
-				1, this.mavContainer.getModel().size());
+		assertTrue(this.mavContainer.getModel().isEmpty());
+	}
 
+	@Test  // SPR-14045
+	public void ignoreDefaultModelAndWithoutRedirectModel() {
 		this.mavContainer.setIgnoreDefaultModelOnRedirect(true);
+		this.mavContainer.setRedirectModelScenario(true);
+		this.mavContainer.addAttribute("name", "value");
 
-		assertEquals("Empty model should be returned if no redirect model is available",
-				0, this.mavContainer.getModel().size());
+		assertEquals(1, this.mavContainer.getModel().size());
+		assertEquals("value", this.mavContainer.getModel().get("name"));
 	}
 
+
 }
diff --git a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
index b264a44613..e4844ec563 100644
--- a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,6 @@
 
 package org.springframework.web.multipart.commons;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -34,7 +30,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
@@ -44,9 +39,11 @@
 
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.FileItemHeaders;
 import org.apache.commons.fileupload.FileUpload;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.junit.Test;
+
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.mock.web.test.MockFilterConfig;
 import org.springframework.mock.web.test.MockHttpServletRequest;
@@ -64,6 +61,8 @@
 import org.springframework.web.multipart.support.StringMultipartFileEditor;
 import org.springframework.web.util.WebUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Juergen Hoeller
  * @author Arjen Poutsma
@@ -112,6 +111,8 @@ private void doTestWithApplicationContext(boolean lazy) throws Exception {
 		doTestFiles(request);
 
 		doTestBinding(resolver, originalRequest, request);
+
+		wac.close();
 	}
 
 	private void doTestParameters(MultipartHttpServletRequest request) {
@@ -372,7 +373,7 @@ protected void setEmpty(boolean empty) {
 		protected FileUpload newFileUpload(FileItemFactory fileItemFactory) {
 			return new ServletFileUpload() {
 				@Override
-				public List parseRequest(HttpServletRequest request) {
+				public List<FileItem> parseRequest(HttpServletRequest request) {
 					if (request instanceof MultipartHttpServletRequest) {
 						throw new IllegalStateException("Already a multipart request");
 					}
@@ -382,9 +383,9 @@ public List parseRequest(HttpServletRequest request) {
 					MockFileItem fileItem1x = new MockFileItem(
 						"field1", "type1", empty ? "" : "field1.txt", empty ? "" : "text1");
 					MockFileItem fileItem2 = new MockFileItem(
-						"field2", "type2", empty ? "" : "C:/field2.txt", empty ? "" : "text2");
+						"field2", "type2", empty ? "" : "C:\\mypath/field2.txt", empty ? "" : "text2");
 					MockFileItem fileItem2x = new MockFileItem(
-						"field2x", "type2", empty ? "" : "C:\\field2x.txt", empty ? "" : "text2");
+						"field2x", "type2", empty ? "" : "C:/mypath\\field2x.txt", empty ? "" : "text2");
 					MockFileItem fileItem3 = new MockFileItem("field3", null, null, "value3");
 					MockFileItem fileItem4 = new MockFileItem("field4", "text/html; charset=iso-8859-1", null, "value4");
 					MockFileItem fileItem5 = new MockFileItem("field4", null, null, "value5");
@@ -494,6 +495,16 @@ public void setFormField(boolean b) {
 		public OutputStream getOutputStream() throws IOException {
 			throw new UnsupportedOperationException();
 		}
+
+		@Override
+		public FileItemHeaders getHeaders() {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public void setHeaders(FileItemHeaders headers) {
+			throw new UnsupportedOperationException();
+		}
 	}
 
 
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
index fd60e2dcd9..1dea98bfab 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,10 @@
 import java.util.Map;
 
 import org.junit.Test;
+
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
@@ -50,6 +52,28 @@ public void plain() throws URISyntaxException {
 		assertEquals("Invalid result URI", expected, result.toUri());
 	}
 
+	@Test
+	public void multipleFromSameBuilder() throws URISyntaxException {
+		UriComponentsBuilder builder = UriComponentsBuilder.newInstance().scheme("http").host("example.com").pathSegment("foo");
+		UriComponents result1 = builder.build();
+		builder = builder.pathSegment("foo2").queryParam("bar").fragment("baz");
+		UriComponents result2 = builder.build();
+
+		assertEquals("http", result1.getScheme());
+		assertEquals("example.com", result1.getHost());
+		assertEquals("/foo", result1.getPath());
+		URI expected = new URI("http://example.com/foo");
+		assertEquals("Invalid result URI", expected, result1.toUri());
+
+		assertEquals("http", result2.getScheme());
+		assertEquals("example.com", result2.getHost());
+		assertEquals("/foo/foo2", result2.getPath());
+		assertEquals("bar", result2.getQuery());
+		assertEquals("baz", result2.getFragment());
+		expected = new URI("http://example.com/foo/foo2?bar#baz");
+		assertEquals("Invalid result URI", expected, result2.toUri());
+	}
+
 	@Test
 	public void fromPath() throws URISyntaxException {
 		UriComponents result = UriComponentsBuilder.fromPath("foo").queryParam("bar").fragment("baz").build();
@@ -161,6 +185,25 @@ public void fromUriStringQueryParamWithReservedCharInValue() throws URISyntaxExc
 		assertEquals("1USD=?EUR", result.getQueryParams().getFirst("q"));
 	}
 
+	// SPR-10779
+
+	@Test
+	public void fromHttpUrlStringCaseInsesitiveScheme() {
+		assertEquals("http", UriComponentsBuilder.fromHttpUrl("HTTP://www.google.com").build().getScheme());
+		assertEquals("https", UriComponentsBuilder.fromHttpUrl("HTTPS://www.google.com").build().getScheme());
+	}
+
+	// SPR-11970
+
+	@Test
+	public void fromUriStringNoPathWithReservedCharInQuery() {
+		UriComponents result = UriComponentsBuilder.fromUriString("http://example.com?foo=bar@baz").build();
+		assertTrue(StringUtils.isEmpty(result.getUserInfo()));
+		assertEquals("example.com", result.getHost());
+		assertTrue(result.getQueryParams().containsKey("foo"));
+		assertEquals("bar@baz", result.getQueryParams().getFirst("foo"));
+	}
+
 	@Test
 	public void path() throws URISyntaxException {
 		UriComponentsBuilder builder = UriComponentsBuilder.fromPath("/foo/bar");
diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index 40aeff33a5..1f59dcdb12 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.springframework.web.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
 import java.io.UnsupportedEncodingException;
 
 import org.junit.Before;
@@ -26,6 +23,8 @@
 import org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -33,11 +32,12 @@
  */
 public class UrlPathHelperTests {
 
+	private static final String WEBSPHERE_URI_ATTRIBUTE = "com.ibm.websphere.servlet.uri_non_decoded";
+
 	private UrlPathHelper helper;
 
 	private MockHttpServletRequest request;
 
-	private static final String WEBSPHERE_URI_ATTRIBUTE = "com.ibm.websphere.servlet.uri_non_decoded";
 
 	@Before
 	public void setUp() {
@@ -45,6 +45,7 @@ public void setUp() {
 		request = new MockHttpServletRequest();
 	}
 
+
 	@Test
 	public void getPathWithinApplication() {
 		request.setContextPath("/petclinic");
@@ -78,6 +79,17 @@ public void getPathWithinServlet() {
 		assertEquals("Incorrect path returned", "/welcome.html", helper.getPathWithinServletMapping(request));
 	}
 
+	@Test  // SPR-11101
+	public void getPathWithinServletWithoutUrlDecoding() {
+		request.setContextPath("/SPR-11101");
+		request.setServletPath("/test_url_decoding/a/b");
+		request.setRequestURI("/test_url_decoding/a%2Fb");
+
+		helper.setUrlDecode(false);
+		String actual = helper.getPathWithinServletMapping(request);
+		assertEquals("/test_url_decoding/a%2Fb", actual);
+	}
+
 	@Test
 	public void getRequestUri() {
 		request.setRequestURI("/welcome.html");
@@ -111,6 +123,11 @@ public void getRequestKeepSemicolonContent() throws UnsupportedEncodingException
 
 		request.setRequestURI("/foo;a=b;jsessionid=c0o7fszeb1;c=d");
 		assertEquals("jsessionid should always be removed", "/foo;a=b;c=d", helper.getRequestUri(request));
+
+		// SPR-10398
+
+		request.setRequestURI("/foo;a=b;JSESSIONID=c0o7fszeb1;c=d");
+		assertEquals("JSESSIONID should always be removed", "/foo;a=b;c=d", helper.getRequestUri(request));
 	}
 
 	@Test
@@ -137,11 +154,10 @@ public void getLookupPathWithSemicolonContentAndNullPathInfo() {
 
 
 	//
-	// suite of tests root requests for default servlets (SRV 11.2) on Websphere vs Tomcat and other containers
-	// see: http://jira.springframework.org/browse/SPR-7064
+	// Suite of tests root requests for default servlets (SRV 11.2) on WebSphere vs Tomcat and other containers
+	// See: http://jira.springframework.org/browse/SPR-7064
 	//
 
-
 	//
 	// / mapping (default servlet)
 	//
diff --git a/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
index 437e1db604..f6edf65ffe 100644
--- a/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
@@ -62,9 +62,17 @@ public void extractFullFilenameFromUrlPath() {
 		assertEquals("index.html", WebUtils.extractFullFilenameFromUrlPath("index.html"));
 		assertEquals("index.html", WebUtils.extractFullFilenameFromUrlPath("/index.html"));
 		assertEquals("view.html", WebUtils.extractFullFilenameFromUrlPath("/products/view.html"));
+		assertEquals("view.html", WebUtils.extractFullFilenameFromUrlPath("/products/view.html#/a"));
+		assertEquals("view.html", WebUtils.extractFullFilenameFromUrlPath("/products/view.html#/path/a"));
+		assertEquals("view.html", WebUtils.extractFullFilenameFromUrlPath("/products/view.html#/path/a.do"));
 		assertEquals("view.html", WebUtils.extractFullFilenameFromUrlPath("/products/view.html?param=a"));
 		assertEquals("view.html", WebUtils.extractFullFilenameFromUrlPath("/products/view.html?param=/path/a"));
 		assertEquals("view.html", WebUtils.extractFullFilenameFromUrlPath("/products/view.html?param=/path/a.do"));
+		assertEquals("view.html", WebUtils.extractFullFilenameFromUrlPath("/products/view.html?param=/path/a#/path/a"));
+		assertEquals("view.html", WebUtils.extractFullFilenameFromUrlPath("/products/view.html?param=/path/a.do#/path/a.do"));
+		assertEquals("view.html", WebUtils.extractFullFilenameFromUrlPath("/products;q=11/view.html?param=/path/a.do"));
+		assertEquals("view.html", WebUtils.extractFullFilenameFromUrlPath("/products;q=11/view.html;r=22?param=/path/a.do"));
+		assertEquals("view.html", WebUtils.extractFullFilenameFromUrlPath("/products;q=11/view.html;r=22;s=33?param=/path/a.do"));
 	}
 
 	@Test
diff --git a/spring-web/src/test/resources/org/springframework/http/converter/xml/external.txt b/spring-web/src/test/resources/org/springframework/http/converter/xml/external.txt
new file mode 100644
index 0000000000..67d8e4dbe0
--- /dev/null
+++ b/spring-web/src/test/resources/org/springframework/http/converter/xml/external.txt
@@ -0,0 +1 @@
+Foo Bar
\ No newline at end of file
diff --git a/spring-web/src/test/resources/org/springframework/web/util/HtmlCharacterEntityReferences.dtd b/spring-web/src/test/resources/org/springframework/web/util/HtmlCharacterEntityReferences.dtd
index 31aa2524bf..86e8cbab0c 100644
--- a/spring-web/src/test/resources/org/springframework/web/util/HtmlCharacterEntityReferences.dtd
+++ b/spring-web/src/test/resources/org/springframework/web/util/HtmlCharacterEntityReferences.dtd
@@ -1,11 +1,9 @@
-<!-- File containing all charcter entity references definied 
+<!-- File containing all character entity references defined
      by the HTML 4.0 standard. -->
-<!-- Valuable informations and a complete description of the
+<!-- Valuable information and a complete description of the
      HTML 4.0 character set can be found at
-     http://www.w3.org/TR/html4/charset.html.
-     -->
-     
-     
+     http://www.w3.org/TR/html4/charset.html. -->
+
 <!-- Portions © International Organization for Standardization 1986
      Permission to copy in any form is granted for use with
      conforming SGML systems and applications as defined in
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java
index 0fb220f435..c0cb39c0f5 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1187,7 +1187,11 @@ protected void doRender(View view, Map model, PortletRequest request, MimeRespon
 	protected void doDispatch(PortletRequestDispatcher dispatcher, PortletRequest request, MimeResponse response)
 			throws Exception {
 
-		if (PortletRequest.RESOURCE_PHASE.equals(request.getAttribute(PortletRequest.LIFECYCLE_PHASE))) {
+		// In general, we prefer a forward for resource responses, in order to have full Servlet API
+		// support in the target resource (e.g. on uPortal). However, on Liferay, a resource forward
+		// displays an empty page, so we have to resort to an include there...
+		if (PortletRequest.RESOURCE_PHASE.equals(request.getAttribute(PortletRequest.LIFECYCLE_PHASE)) &&
+				!dispatcher.getClass().getName().startsWith("com.liferay")) {
 			dispatcher.forward(request, response);
 		}
 		else {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java
index b876da36b7..09c100f641 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/FrameworkPortlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,12 +41,15 @@
 import org.springframework.context.i18n.LocaleContext;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.context.i18n.SimpleLocaleContext;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.portlet.context.ConfigurablePortletApplicationContext;
 import org.springframework.web.portlet.context.PortletApplicationContextUtils;
 import org.springframework.web.portlet.context.PortletRequestAttributes;
 import org.springframework.web.portlet.context.PortletRequestHandledEvent;
+import org.springframework.web.portlet.context.StandardPortletEnvironment;
 import org.springframework.web.portlet.context.XmlPortletApplicationContext;
 
 /**
@@ -107,7 +110,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 	 * Default context class for FrameworkPortlet.
 	 * @see org.springframework.web.portlet.context.XmlPortletApplicationContext
 	 */
-	public static final Class DEFAULT_CONTEXT_CLASS = XmlPortletApplicationContext.class;
+	public static final Class<?> DEFAULT_CONTEXT_CLASS = XmlPortletApplicationContext.class;
 
 	/**
 	 * Suffix for Portlet ApplicationContext namespaces. If a portlet of this class is
@@ -130,7 +133,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 
 
 	/** Portlet ApplicationContext implementation class to use */
-	private Class contextClass = DEFAULT_CONTEXT_CLASS;
+	private Class<?> contextClass = DEFAULT_CONTEXT_CLASS;
 
 	/** Namespace for this portlet */
 	private String namespace;
@@ -163,14 +166,14 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 	 * must also implement ConfigurablePortletApplicationContext.
 	 * @see #createPortletApplicationContext
 	 */
-	public void setContextClass(Class contextClass) {
+	public void setContextClass(Class<?> contextClass) {
 		this.contextClass = contextClass;
 	}
 
 	/**
 	 * Return the custom context class.
 	 */
-	public Class getContextClass() {
+	public Class<?> getContextClass() {
 		return this.contextClass;
 	}
 
@@ -353,6 +356,14 @@ protected ApplicationContext createPortletApplicationContext(ApplicationContext
 		pac.setConfigLocation(getContextConfigLocation());
 		pac.addApplicationListener(new SourceFilteringListener(pac, this));
 
+		// The wac environment's #initPropertySources will be called in any case when the context
+		// is refreshed; do it eagerly here to ensure portlet property sources are in place for
+		// use in any post-processing or initialization that occurs below prior to #refresh
+		ConfigurableEnvironment env = pac.getEnvironment();
+		if (env instanceof StandardPortletEnvironment) {
+			((StandardPortletEnvironment) env).initPropertySources(pac.getServletContext(), getPortletContext(), getPortletConfig());
+		}
+
 		postProcessPortletApplicationContext(pac);
 		pac.refresh();
 
@@ -505,7 +516,8 @@ protected final void processRequest(PortletRequest request, PortletResponse resp
 		// Expose current RequestAttributes to current thread.
 		RequestAttributes previousRequestAttributes = RequestContextHolder.getRequestAttributes();
 		PortletRequestAttributes requestAttributes = null;
-		if (previousRequestAttributes == null || previousRequestAttributes.getClass().equals(PortletRequestAttributes.class)) {
+		if (previousRequestAttributes == null || previousRequestAttributes.getClass().equals(PortletRequestAttributes.class) ||
+				previousRequestAttributes.getClass().equals(ServletRequestAttributes.class)) {
 			requestAttributes = new PortletRequestAttributes(request);
 			RequestContextHolder.setRequestAttributes(requestAttributes, this.threadContextInheritable);
 		}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java
index 80c64e2954..e09a019868 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.util.List;
 
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Handler execution chain, consisting of handler object and any handler interceptors.
@@ -45,7 +46,7 @@ public class HandlerExecutionChain {
 	 * @param handler the handler object to execute
 	 */
 	public HandlerExecutionChain(Object handler) {
-		this(handler, null);
+		this(handler, (HandlerInterceptor[]) null);
 	}
 
 	/**
@@ -54,7 +55,7 @@ public HandlerExecutionChain(Object handler) {
 	 * @param interceptors the array of interceptors to apply
 	 * (in the given order) before the handler itself executes
 	 */
-	public HandlerExecutionChain(Object handler, HandlerInterceptor[] interceptors) {
+	public HandlerExecutionChain(Object handler, HandlerInterceptor... interceptors) {
 		if (handler instanceof HandlerExecutionChain) {
 			HandlerExecutionChain originalChain = (HandlerExecutionChain) handler;
 			this.handler = originalChain.getHandler();
@@ -78,25 +79,25 @@ public Object getHandler() {
 	}
 
 	public void addInterceptor(HandlerInterceptor interceptor) {
-		initInterceptorList();
-		this.interceptorList.add(interceptor);
+		initInterceptorList().add(interceptor);
 	}
 
-	public void addInterceptors(HandlerInterceptor[] interceptors) {
-		if (interceptors != null) {
-			initInterceptorList();
-			this.interceptorList.addAll(Arrays.asList(interceptors));
+	public void addInterceptors(HandlerInterceptor... interceptors) {
+		if (!ObjectUtils.isEmpty(interceptors)) {
+			initInterceptorList().addAll(Arrays.asList(interceptors));
 		}
 	}
 
-	private void initInterceptorList() {
+	private List<HandlerInterceptor> initInterceptorList() {
 		if (this.interceptorList == null) {
 			this.interceptorList = new ArrayList<HandlerInterceptor>();
+			if (this.interceptors != null) {
+				// An interceptor array specified through the constructor
+				this.interceptorList.addAll(Arrays.asList(this.interceptors));
+			}
 		}
-		if (this.interceptors != null) {
-			this.interceptorList.addAll(Arrays.asList(this.interceptors));
-			this.interceptors = null;
-		}
+		this.interceptors = null;
+		return this.interceptorList;
 	}
 
 	/**
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java
index 40d39905e1..79682a2e4d 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletContext;
 import javax.portlet.PortletRequest;
@@ -42,9 +41,9 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- * Convenience methods for retrieving the root WebApplicationContext for a given
- * PortletContext. This is e.g. useful for accessing a Spring context from
- * within custom Portlet implementations.
+ * Convenience methods for retrieving the root {@link WebApplicationContext} for
+ * a given {@link PortletContext}. This is useful for programmatically accessing
+ * a Spring application context from within custom Portlet implementations.
  *
  * @author Juergen Hoeller
  * @author John A. Lewis
@@ -57,8 +56,8 @@
 public abstract class PortletApplicationContextUtils {
 
 	/**
-	 * Find the root WebApplicationContext for this portlet application, which is
-	 * typically loaded via ContextLoaderListener or ContextLoaderServlet.
+	 * Find the root {@link WebApplicationContext} for this web app, typically
+	 * loaded via {@link org.springframework.web.context.ContextLoaderListener}.
 	 * <p>Will rethrow an exception that happened on root context startup,
 	 * to differentiate between a failed context startup and no context at all.
 	 * @param pc PortletContext to find the web application context for
@@ -86,8 +85,8 @@ public static ApplicationContext getWebApplicationContext(PortletContext pc) {
 	}
 
 	/**
-	 * Find the root WebApplicationContext for this portlet application, which is
-	 * typically loaded via ContextLoaderListener or ContextLoaderServlet.
+	 * Find the root {@link WebApplicationContext} for this web app, typically
+	 * loaded via {@link org.springframework.web.context.ContextLoaderListener}.
 	 * <p>Will rethrow an exception that happened on root context startup,
 	 * to differentiate between a failed context startup and no context at all.
 	 * @param pc PortletContext to find the web application context for
@@ -97,9 +96,7 @@ public static ApplicationContext getWebApplicationContext(PortletContext pc) {
 	 * @throws IllegalStateException if the root WebApplicationContext could not be found
 	 * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
 	 */
-	public static ApplicationContext getRequiredWebApplicationContext(PortletContext pc)
-		throws IllegalStateException {
-
+	public static ApplicationContext getRequiredWebApplicationContext(PortletContext pc) throws IllegalStateException {
 		ApplicationContext wac = getWebApplicationContext(pc);
 		if (wac == null) {
 			throw new IllegalStateException("No WebApplicationContext found: no ContextLoaderListener registered?");
@@ -111,62 +108,62 @@ public static ApplicationContext getRequiredWebApplicationContext(PortletContext
 	/**
 	 * Register web-specific scopes ("request", "session", "globalSession")
 	 * with the given BeanFactory, as used by the Portlet ApplicationContext.
-	 * @param beanFactory the BeanFactory to configure
+	 * @param bf the BeanFactory to configure
 	 * @param pc the PortletContext that we're running within
 	 */
-	static void registerPortletApplicationScopes(ConfigurableListableBeanFactory beanFactory, PortletContext pc) {
-		beanFactory.registerScope(WebApplicationContext.SCOPE_REQUEST, new RequestScope());
-		beanFactory.registerScope(WebApplicationContext.SCOPE_SESSION, new SessionScope(false));
-		beanFactory.registerScope(WebApplicationContext.SCOPE_GLOBAL_SESSION, new SessionScope(true));
+	static void registerPortletApplicationScopes(ConfigurableListableBeanFactory bf, PortletContext pc) {
+		bf.registerScope(WebApplicationContext.SCOPE_REQUEST, new RequestScope());
+		bf.registerScope(WebApplicationContext.SCOPE_SESSION, new SessionScope(false));
+		bf.registerScope(WebApplicationContext.SCOPE_GLOBAL_SESSION, new SessionScope(true));
 		if (pc != null) {
 			PortletContextScope appScope = new PortletContextScope(pc);
-			beanFactory.registerScope(WebApplicationContext.SCOPE_APPLICATION, appScope);
+			bf.registerScope(WebApplicationContext.SCOPE_APPLICATION, appScope);
 			// Register as PortletContext attribute, for ContextCleanupListener to detect it.
 			pc.setAttribute(PortletContextScope.class.getName(), appScope);
 		}
 
-		beanFactory.registerResolvableDependency(PortletRequest.class, new RequestObjectFactory());
-		beanFactory.registerResolvableDependency(PortletSession.class, new SessionObjectFactory());
-		beanFactory.registerResolvableDependency(WebRequest.class, new WebRequestObjectFactory());
+		bf.registerResolvableDependency(PortletRequest.class, new RequestObjectFactory());
+		bf.registerResolvableDependency(PortletSession.class, new SessionObjectFactory());
+		bf.registerResolvableDependency(WebRequest.class, new WebRequestObjectFactory());
 	}
 
 	/**
 	 * Register web-specific environment beans ("contextParameters", "contextAttributes")
 	 * with the given BeanFactory, as used by the Portlet ApplicationContext.
 	 * @param bf the BeanFactory to configure
-	 * @param sc the ServletContext that we're running within
-	 * @param pc the PortletContext that we're running within
-	 * @param config the PortletConfig of the containing Portlet
+	 * @param servletContext the ServletContext that we're running within
+	 * @param portletContext the PortletContext that we're running within
+	 * @param portletConfig the PortletConfig of the containing Portlet
 	 */
-	static void registerEnvironmentBeans(
-			ConfigurableListableBeanFactory bf, ServletContext sc, PortletContext pc, PortletConfig config) {
+	static void registerEnvironmentBeans(ConfigurableListableBeanFactory bf, ServletContext servletContext,
+			PortletContext portletContext, PortletConfig portletConfig) {
 
-		if (sc != null && !bf.containsBean(WebApplicationContext.SERVLET_CONTEXT_BEAN_NAME)) {
-			bf.registerSingleton(WebApplicationContext.SERVLET_CONTEXT_BEAN_NAME, sc);
+		if (servletContext != null && !bf.containsBean(WebApplicationContext.SERVLET_CONTEXT_BEAN_NAME)) {
+			bf.registerSingleton(WebApplicationContext.SERVLET_CONTEXT_BEAN_NAME, servletContext);
 		}
 
-		if (pc != null && !bf.containsBean(ConfigurablePortletApplicationContext.PORTLET_CONTEXT_BEAN_NAME)) {
-			bf.registerSingleton(ConfigurablePortletApplicationContext.PORTLET_CONTEXT_BEAN_NAME, pc);
+		if (portletContext != null && !bf.containsBean(ConfigurablePortletApplicationContext.PORTLET_CONTEXT_BEAN_NAME)) {
+			bf.registerSingleton(ConfigurablePortletApplicationContext.PORTLET_CONTEXT_BEAN_NAME, portletContext);
 		}
 
-		if (config != null && !bf.containsBean(ConfigurablePortletApplicationContext.PORTLET_CONFIG_BEAN_NAME)) {
-			bf.registerSingleton(ConfigurablePortletApplicationContext.PORTLET_CONFIG_BEAN_NAME, config);
+		if (portletConfig != null && !bf.containsBean(ConfigurablePortletApplicationContext.PORTLET_CONFIG_BEAN_NAME)) {
+			bf.registerSingleton(ConfigurablePortletApplicationContext.PORTLET_CONFIG_BEAN_NAME, portletConfig);
 		}
 
 		if (!bf.containsBean(WebApplicationContext.CONTEXT_PARAMETERS_BEAN_NAME)) {
 			Map<String, String> parameterMap = new HashMap<String, String>();
-			if (pc != null) {
-				Enumeration paramNameEnum = pc.getInitParameterNames();
+			if (portletContext != null) {
+				Enumeration<String> paramNameEnum = portletContext.getInitParameterNames();
 				while (paramNameEnum.hasMoreElements()) {
-					String paramName = (String) paramNameEnum.nextElement();
-					parameterMap.put(paramName, pc.getInitParameter(paramName));
+					String paramName = paramNameEnum.nextElement();
+					parameterMap.put(paramName, portletContext.getInitParameter(paramName));
 				}
 			}
-			if (config != null) {
-				Enumeration paramNameEnum = config.getInitParameterNames();
+			if (portletConfig != null) {
+				Enumeration<String> paramNameEnum = portletConfig.getInitParameterNames();
 				while (paramNameEnum.hasMoreElements()) {
-					String paramName = (String) paramNameEnum.nextElement();
-					parameterMap.put(paramName, config.getInitParameter(paramName));
+					String paramName = paramNameEnum.nextElement();
+					parameterMap.put(paramName, portletConfig.getInitParameter(paramName));
 				}
 			}
 			bf.registerSingleton(WebApplicationContext.CONTEXT_PARAMETERS_BEAN_NAME,
@@ -175,11 +172,11 @@ static void registerEnvironmentBeans(
 
 		if (!bf.containsBean(WebApplicationContext.CONTEXT_ATTRIBUTES_BEAN_NAME)) {
 			Map<String, Object> attributeMap = new HashMap<String, Object>();
-			if (pc != null) {
-				Enumeration attrNameEnum = pc.getAttributeNames();
+			if (portletContext != null) {
+				Enumeration<String> attrNameEnum = portletContext.getAttributeNames();
 				while (attrNameEnum.hasMoreElements()) {
-					String attrName = (String) attrNameEnum.nextElement();
-					attributeMap.put(attrName, pc.getAttribute(attrName));
+					String attrName = attrNameEnum.nextElement();
+					attributeMap.put(attrName, portletContext.getAttribute(attrName));
 				}
 			}
 			bf.registerSingleton(WebApplicationContext.CONTEXT_ATTRIBUTES_BEAN_NAME,
@@ -211,15 +208,15 @@ static void registerEnvironmentBeans(
 	 */
 	public static void initPortletPropertySources(MutablePropertySources propertySources, ServletContext servletContext,
 			PortletContext portletContext, PortletConfig portletConfig) {
-		Assert.notNull(propertySources, "propertySources must not be null");
 
+		Assert.notNull(propertySources, "propertySources must not be null");
 		WebApplicationContextUtils.initServletPropertySources(propertySources, servletContext);
 
-		if(portletContext != null && propertySources.contains(StandardPortletEnvironment.PORTLET_CONTEXT_PROPERTY_SOURCE_NAME)) {
+		if (portletContext != null && propertySources.contains(StandardPortletEnvironment.PORTLET_CONTEXT_PROPERTY_SOURCE_NAME)) {
 			propertySources.replace(StandardPortletEnvironment.PORTLET_CONTEXT_PROPERTY_SOURCE_NAME,
 					new PortletContextPropertySource(StandardPortletEnvironment.PORTLET_CONTEXT_PROPERTY_SOURCE_NAME, portletContext));
 		}
-		if(portletConfig != null && propertySources.contains(StandardPortletEnvironment.PORTLET_CONFIG_PROPERTY_SOURCE_NAME)) {
+		if (portletConfig != null && propertySources.contains(StandardPortletEnvironment.PORTLET_CONFIG_PROPERTY_SOURCE_NAME)) {
 			propertySources.replace(StandardPortletEnvironment.PORTLET_CONFIG_PROPERTY_SOURCE_NAME,
 					new PortletConfigPropertySource(StandardPortletEnvironment.PORTLET_CONFIG_PROPERTY_SOURCE_NAME, portletConfig));
 		}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigPropertySource.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigPropertySource.java
index e4e9f6ca8c..09d2457866 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigPropertySource.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigPropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.PropertySource;
-import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link PropertySource} that reads init parameters from a {@link PortletConfig} object.
@@ -37,11 +37,12 @@ public PortletConfigPropertySource(String name, PortletConfig portletConfig) {
 
 	@Override
 	public String[] getPropertyNames() {
-		return CollectionUtils.toArray(this.source.getInitParameterNames(), EMPTY_NAMES_ARRAY);
+		return StringUtils.toStringArray(this.source.getInitParameterNames());
 	}
 
 	@Override
 	public String getProperty(String name) {
 		return this.source.getInitParameter(name);
 	}
+
 }
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextPropertySource.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextPropertySource.java
index 4a79a28ea1..0627423745 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextPropertySource.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextPropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.PropertySource;
-import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link PropertySource} that reads init parameters from a {@link PortletContext} object.
@@ -37,11 +37,12 @@ public PortletContextPropertySource(String name, PortletContext portletContext)
 
 	@Override
 	public String[] getPropertyNames() {
-		return CollectionUtils.toArray(this.source.getInitParameterNames(), EMPTY_NAMES_ARRAY);
+		return StringUtils.toStringArray(this.source.getInitParameterNames());
 	}
 
 	@Override
 	public String getProperty(String name) {
 		return this.source.getInitParameter(name);
 	}
+
 }
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java
index 6a7e1c83db..c17afecc00 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package org.springframework.web.portlet.context;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletSession;
 
@@ -59,9 +59,9 @@ public class PortletRequestAttributes extends AbstractRequestAttributes {
 
 	private volatile PortletSession session;
 
-	private final Map<String, Object> sessionAttributesToUpdate = new HashMap<String, Object>();
+	private final Map<String, Object> sessionAttributesToUpdate = new ConcurrentHashMap<String, Object>(1);
 
-	private final Map<String, Object> globalSessionAttributesToUpdate = new HashMap<String, Object>();
+	private final Map<String, Object> globalSessionAttributesToUpdate = new ConcurrentHashMap<String, Object>(1);
 
 
 	/**
@@ -114,18 +114,14 @@ public Object getAttribute(String name, int scope) {
 				if (scope == SCOPE_GLOBAL_SESSION) {
 					Object value = session.getAttribute(name, PortletSession.APPLICATION_SCOPE);
 					if (value != null) {
-						synchronized (this.globalSessionAttributesToUpdate) {
-							this.globalSessionAttributesToUpdate.put(name, value);
-						}
+						this.globalSessionAttributesToUpdate.put(name, value);
 					}
 					return value;
 				}
 				else {
 					Object value = session.getAttribute(name);
 					if (value != null) {
-						synchronized (this.sessionAttributesToUpdate) {
-							this.sessionAttributesToUpdate.put(name, value);
-						}
+						this.sessionAttributesToUpdate.put(name, value);
 					}
 					return value;
 				}
@@ -148,15 +144,11 @@ public void setAttribute(String name, Object value, int scope) {
 			PortletSession session = getSession(true);
 			if (scope == SCOPE_GLOBAL_SESSION) {
 				session.setAttribute(name, value, PortletSession.APPLICATION_SCOPE);
-				synchronized (this.globalSessionAttributesToUpdate) {
-					this.globalSessionAttributesToUpdate.remove(name);
-				}
+				this.globalSessionAttributesToUpdate.remove(name);
 			}
 			else {
 				session.setAttribute(name, value);
-				synchronized (this.sessionAttributesToUpdate) {
-					this.sessionAttributesToUpdate.remove(name);
-				}
+				this.sessionAttributesToUpdate.remove(name);
 			}
 		}
 	}
@@ -173,15 +165,11 @@ public void removeAttribute(String name, int scope) {
 			if (session != null) {
 				if (scope == SCOPE_GLOBAL_SESSION) {
 					session.removeAttribute(name, PortletSession.APPLICATION_SCOPE);
-					synchronized (this.globalSessionAttributesToUpdate) {
-						this.globalSessionAttributesToUpdate.remove(name);
-					}
+					this.globalSessionAttributesToUpdate.remove(name);
 				}
 				else {
 					session.removeAttribute(name);
-					synchronized (this.sessionAttributesToUpdate) {
-						this.sessionAttributesToUpdate.remove(name);
-					}
+					this.sessionAttributesToUpdate.remove(name);
 				}
 			}
 		}
@@ -248,8 +236,8 @@ public Object getSessionMutex() {
 	@Override
 	protected void updateAccessedSessionAttributes() {
 		this.session = this.request.getPortletSession(false);
-		synchronized (this.sessionAttributesToUpdate) {
-			if (this.session != null) {
+		if (this.session != null) {
+			try {
 				for (Map.Entry<String, Object> entry : this.sessionAttributesToUpdate.entrySet()) {
 					String name = entry.getKey();
 					Object newValue = entry.getValue();
@@ -258,11 +246,6 @@ protected void updateAccessedSessionAttributes() {
 						this.session.setAttribute(name, newValue);
 					}
 				}
-			}
-			this.sessionAttributesToUpdate.clear();
-		}
-		synchronized (this.globalSessionAttributesToUpdate) {
-			if (this.session != null) {
 				for (Map.Entry<String, Object> entry : this.globalSessionAttributesToUpdate.entrySet()) {
 					String name = entry.getKey();
 					Object newValue = entry.getValue();
@@ -272,8 +255,12 @@ protected void updateAccessedSessionAttributes() {
 					}
 				}
 			}
-			this.globalSessionAttributesToUpdate.clear();
+			catch (IllegalStateException ex) {
+				// Session invalidated - shouldn't usually happen.
+			}
 		}
+		this.sessionAttributesToUpdate.clear();
+		this.globalSessionAttributesToUpdate.clear();
 	}
 
 	/**
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StandardPortletEnvironment.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StandardPortletEnvironment.java
index 7a2afb00b7..e6a8172b8b 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StandardPortletEnvironment.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StandardPortletEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,14 +31,15 @@
 
 /**
  * {@link Environment} implementation to be used by {@code Servlet}-based web
- * applications. All Portlet-related {@code ApplicationContext} classes initialize an instance
- * by default.
+ * applications. All Portlet-related {@code ApplicationContext} classes
+ * initialize an instance by default.
  *
- * <p>Contributes {@code ServletContext}, {@code PortletContext}, {@code PortletConfig}
- * and JNDI-based {@link PropertySource} instances. See the
- * {@link #customizePropertySources} method for details.
+ * <p>Contributes {@code ServletContext}, {@code PortletContext},
+ * {@code PortletConfig} and JNDI-based {@link PropertySource} instances.
+ * See the {@link #customizePropertySources} method for details.
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  * @since 3.1
  * @see StandardEnvironment
  * @see StandardServletEnvironment
@@ -51,6 +52,7 @@ public class StandardPortletEnvironment extends StandardEnvironment {
 	/** Portlet config init parameters property source name: {@value} */
 	public static final String PORTLET_CONFIG_PROPERTY_SOURCE_NAME = "portletConfigInitParams";
 
+
 	/**
 	 * Customize the set of property sources with those contributed by superclasses as
 	 * well as those appropriate for standard portlet-based environments:
@@ -88,4 +90,19 @@ protected void customizePropertySources(MutablePropertySources propertySources)
 		super.customizePropertySources(propertySources);
 	}
 
+	/**
+	 * Replace any {@linkplain
+	 * org.springframework.core.env.PropertySource.StubPropertySource stub property source}
+	 * instances acting as placeholders with real portlet context/config property sources
+	 * using the given parameters.
+	 * @param servletContext the {@link ServletContext} (may be {@code null})
+	 * @param portletContext the {@link PortletContext} (may not be {@code null})
+	 * @param portletConfig the {@link PortletConfig} ({@code null} if not available)
+	 * @see org.springframework.web.portlet.context.PortletApplicationContextUtils#initPortletPropertySources(
+	 * org.springframework.core.env.MutablePropertySources, ServletContext, PortletContext, PortletConfig)
+	 */
+	public void initPropertySources(ServletContext servletContext, PortletContext portletContext, PortletConfig portletConfig) {
+		PortletApplicationContextUtils.initPortletPropertySources(getPropertySources(), servletContext, portletContext, portletConfig);
+	}
+
 }
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java
index d1c1b2ad2a..d368f872a5 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,10 +78,8 @@ protected ConfigurableEnvironment createEnvironment() {
 	 */
 	@Override
 	protected void initPropertySources() {
-		super.initPropertySources();
-		PortletApplicationContextUtils.initPortletPropertySources(
-				this.getEnvironment().getPropertySources(), this.servletContext,
-				this.portletContext, this.portletConfig);
+		PortletApplicationContextUtils.initPortletPropertySources(getEnvironment().getPropertySources(),
+				this.servletContext, this.portletContext, this.portletConfig);
 	}
 
 	/**
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java
index 64365dfa48..74534798f4 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
 
 	private int order = Ordered.LOWEST_PRECEDENCE;
 
-	private Set mappedHandlers;
+	private Set<?> mappedHandlers;
 
 	private Class[] mappedHandlerClasses;
 
@@ -74,7 +74,7 @@ public int getOrder() {
 	 * error view will be used as fallback for all exceptions; any further
 	 * HandlerExceptionResolvers in the chain will be ignored in this case.
 	 */
-	public void setMappedHandlers(Set mappedHandlers) {
+	public void setMappedHandlers(Set<?> mappedHandlers) {
 		this.mappedHandlers = mappedHandlers;
 	}
 
@@ -145,7 +145,7 @@ public ModelAndView resolveException(ResourceRequest request, ResourceResponse r
 	/**
 	 * Check whether this resolver is supposed to apply to the given handler.
 	 * <p>The default implementation checks against the specified mapped handlers
-	 * and handler classes, if any, and alspo checks the window state (according
+	 * and handler classes, if any, and also checks the window state (according
 	 * to the "renderWhenMinimize" property).
 	 * @param request current portlet request
 	 * @param handler the executed handler, or {@code null} if none chosen at the
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java
index 8e3cb90f3f..424df9b13e 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,7 +111,7 @@ public void setInterceptors(Object[] interceptors) {
 	 * @see #setInterceptors
 	 * @see org.springframework.web.context.request.WebRequestInterceptor
 	 * @see WebRequestHandlerInterceptorAdapter#WebRequestHandlerInterceptorAdapter(WebRequestInterceptor, boolean)
-	 * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor
+	 * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor
 	 */
 	public void setApplyWebRequestInterceptorsToRenderPhaseOnly(boolean applyWebRequestInterceptorsToRenderPhaseOnly) {
 		this.applyWebRequestInterceptorsToRenderPhaseOnly = applyWebRequestInterceptorsToRenderPhaseOnly;
@@ -139,7 +139,7 @@ protected void initApplicationContext() throws BeansException {
 	 * allowing to add further interceptors before as well as after the existing
 	 * interceptors
 	 */
-	protected void extendInterceptors(List interceptors) {
+	protected void extendInterceptors(List<?> interceptors) {
 	}
 
 	/**
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java
index 5025a024e0..8065b75386 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -159,7 +159,8 @@ protected String findMatchingViewName(Properties exceptionMappings, Exception ex
 		for (Enumeration names = exceptionMappings.propertyNames(); names.hasMoreElements();) {
 			String exceptionMapping = (String) names.nextElement();
 			int depth = getDepth(exceptionMapping, ex);
-			if (depth >= 0 && depth < deepest) {
+			if (depth >= 0 && (depth < deepest || (depth == deepest &&
+					dominantMapping != null && exceptionMapping.length() > dominantMapping.length()))) {
 				deepest = depth;
 				dominantMapping = exceptionMapping;
 				viewName = exceptionMappings.getProperty(exceptionMapping);
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptor.java
index 57f4119b64..4e192c6529 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptor.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.web.portlet.handler;
 
 import java.io.IOException;
-
 import javax.portlet.PortletException;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
@@ -41,7 +40,7 @@ public class UserRoleAuthorizationInterceptor extends HandlerInterceptorAdapter
 	 * Set the roles that this interceptor should treat as authorized.
 	 * @param authorizedRoles array of role names
 	 */
-	public final void setAuthorizedRoles(String[] authorizedRoles) {
+	public final void setAuthorizedRoles(String... authorizedRoles) {
 		this.authorizedRoles = authorizedRoles;
 	}
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java
index bec09daa5e..21d6e90532 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java
@@ -45,19 +45,13 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl
 	 * @see org.springframework.context.AbstractApplicationContextTests#testEvents()
 	 */
 	@Override
-	public void testEvents() throws Exception {
-		TestListener listener = (TestListener) this.applicationContext.getBean("testListener");
-		listener.zeroCounter();
-		TestListener parentListener = (TestListener) this.applicationContext.getParent().getBean("parentListener");
-		parentListener.zeroCounter();
-
-		parentListener.zeroCounter();
-		assertTrue("0 events before publication", listener.getEventCount() == 0);
-		assertTrue("0 parent events before publication", parentListener.getEventCount() == 0);
-		this.applicationContext.publishEvent(new MyEvent(this));
-		assertTrue("1 events after publication, not " + listener.getEventCount(), listener.getEventCount() == 1);
-		assertTrue("1 parent events after publication", parentListener.getEventCount() == 1);
-	}
+	protected void doTestEvents(TestListener listener, TestListener parentListener,
+			MyEvent event) {
+		TestListener listenerBean = (TestListener) this.applicationContext.getBean("testListener");
+		TestListener parentListenerBean = (TestListener) this.applicationContext.getParent().getBean("parentListener");
+		super.doTestEvents(listenerBean, parentListenerBean, event);
+
+	};
 
 	@Override
 	public void testCount() {
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java
index e00e74589a..1632f5074a 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.util.Collections;
 import java.util.Properties;
-
 import javax.portlet.WindowState;
 
 import junit.framework.TestCase;
@@ -206,7 +205,7 @@ public void testTwoMappingsOneShortOneLongThrowOddException() {
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, oddException);
-		assertEquals("error", mav.getViewName());
+		assertEquals("another-error", mav.getViewName());
 	}
 
 	public void testTwoMappingsThrowOddExceptionUseLongExceptionMapping() {
diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java
index d03b286724..e75e5891ec 100644
--- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java
+++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.view.tiles3;
 
 import java.io.IOException;
@@ -21,82 +22,81 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Locale;
-
 import javax.servlet.ServletContext;
 
 import org.apache.tiles.request.ApplicationResource;
 import org.apache.tiles.request.locale.URLApplicationResource;
 import org.apache.tiles.request.servlet.ServletApplicationContext;
+
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.support.ServletContextResourcePatternResolver;
 
 /**
  * Spring-specific subclass of the Tiles ServletApplicationContext.
  *
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @since 3.2
  */
 public class SpringWildcardServletTilesApplicationContext extends ServletApplicationContext {
 
-	/**
-	 * The pattern resolver.
-	 */
-	protected ResourcePatternResolver resolver;
+	private final ResourcePatternResolver resolver;
+
 
-	/**
-	 * Constructor.
-	 *
-	 * @param servletContext The servlet context.
-	 */
 	public SpringWildcardServletTilesApplicationContext(ServletContext servletContext) {
 		super(servletContext);
-		resolver = new ServletContextResourcePatternResolver(servletContext);
+		this.resolver = new ServletContextResourcePatternResolver(servletContext);
 	}
 
+
 	@Override
 	public ApplicationResource getResource(String localePath) {
-		ApplicationResource retValue = null;
 		Collection<ApplicationResource> urlSet = getResources(localePath);
-		if (urlSet != null && !urlSet.isEmpty()) {
-			retValue = urlSet.iterator().next();
+		if (!CollectionUtils.isEmpty(urlSet)) {
+			return urlSet.iterator().next();
 		}
-		return retValue;
+		return null;
 	}
 
 	@Override
 	public ApplicationResource getResource(ApplicationResource base, Locale locale) {
-		ApplicationResource retValue = null;
 		Collection<ApplicationResource> urlSet = getResources(base.getLocalePath(locale));
-		if (urlSet != null && !urlSet.isEmpty()) {
-			retValue = urlSet.iterator().next();
+		if (!CollectionUtils.isEmpty(urlSet)) {
+			return urlSet.iterator().next();
 		}
-		return retValue;
+		return null;
 	}
 
 	@Override
 	public Collection<ApplicationResource> getResources(String path) {
 		Resource[] resources;
 		try {
-			resources = resolver.getResources(path);
-		} catch (IOException e) {
-			return Collections.<ApplicationResource> emptyList();
+			resources = this.resolver.getResources(path);
 		}
-		Collection<ApplicationResource> resourceList = new ArrayList<ApplicationResource>();
-		if (resources != null && resources.length > 0) {
-			for (int i = 0; i < resources.length; i++) {
-				URL url;
-				try {
-					url = resources[i].getURL();
-					resourceList.add(new URLApplicationResource(url.toExternalForm(), url));
-				} catch (IOException e) {
-					// shouldn't happen with the kind of resources we're using
-					throw new IllegalArgumentException("no URL for " + resources[i].toString(), e);
-				}
+		catch (IOException ex) {
+			((ServletContext) getContext()).log("Resource retrieval failed for path: " + path, ex);
+			return Collections.emptyList();
+		}
+		if (ObjectUtils.isEmpty(resources)) {
+			((ServletContext) getContext()).log("No resources found for path pattern: " + path);
+			return Collections.emptyList();
+		}
+
+		Collection<ApplicationResource> resourceList = new ArrayList<ApplicationResource>(resources.length);
+		for (Resource resource : resources) {
+			try {
+				URL url = resource.getURL();
+				resourceList.add(new URLApplicationResource(url.toExternalForm(), url));
+			}
+			catch (IOException ex) {
+				// Shouldn't happen with the kind of resources we're using
+				throw new IllegalArgumentException("No URL for " + resource, ex);
 			}
 		}
 		return resourceList;
 	}
 
 }
-
diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
index 5b43420b19..3fe4adcc0d 100644
--- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
+++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 
 package org.springframework.web.servlet.view.tiles3;
 
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
-
 import javax.el.ArrayELResolver;
 import javax.el.BeanELResolver;
 import javax.el.CompositeELResolver;
@@ -54,9 +54,11 @@
 import org.apache.tiles.locale.LocaleResolver;
 import org.apache.tiles.preparer.factory.PreparerFactory;
 import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.ApplicationContextAware;
 import org.apache.tiles.request.ApplicationResource;
 import org.apache.tiles.startup.DefaultTilesInitializer;
 import org.apache.tiles.startup.TilesInitializer;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.PropertyAccessorFactory;
@@ -83,7 +85,7 @@
  *
  * <p>A typical TilesConfigurer bean definition looks as follows:
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
  *   &lt;property name="definitions">
  *     &lt;list>
@@ -103,6 +105,8 @@
  * @author mick semb wever
  * @author Rossen Stoyanchev
  * @since 3.2
+ * @see TilesView
+ * @see TilesViewResolver
  */
 public class TilesConfigurer implements ServletContextAware, InitializingBean, DisposableBean {
 
@@ -128,8 +132,6 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D
 
 	private ServletContext servletContext;
 
-	public TilesConfigurer() {
-	}
 
 	/**
 	 * Configure Tiles using a custom TilesInitializer, typically specified as an inner bean.
@@ -158,10 +160,11 @@ public void setCompleteAutoload(boolean completeAutoload) {
 			try {
 				this.tilesInitializer = new SpringCompleteAutoloadTilesInitializer();
 			}
-			catch (Exception ex) {
-				throw new IllegalStateException("tiles-extras 3.x not available", ex);
+			catch (Throwable ex) {
+				throw new IllegalStateException("Tiles-Extras 3.0 not available", ex);
 			}
-		} else {
+		}
+		else {
 			this.tilesInitializer = null;
 		}
 	}
@@ -170,7 +173,7 @@ public void setCompleteAutoload(boolean completeAutoload) {
 	 * Set the Tiles definitions, i.e. the list of files containing the definitions.
 	 * Default is "/WEB-INF/tiles.xml".
 	 */
-	public void setDefinitions(String[] definitions) {
+	public void setDefinitions(String... definitions) {
 		this.definitions = definitions;
 	}
 
@@ -283,7 +286,10 @@ protected List<ApplicationResource> getSources(ApplicationContext applicationCon
 			if (definitions != null) {
 				List<ApplicationResource> result = new LinkedList<ApplicationResource>();
 				for (String definition : definitions) {
-					result.addAll(applicationContext.getResources(definition));
+					Collection<ApplicationResource> resources = applicationContext.getResources(definition);
+					if (resources != null) {
+						result.addAll(resources);
+					}
 				}
 				return result;
 			}
@@ -297,7 +303,7 @@ protected BaseLocaleUrlDefinitionDAO instantiateLocaleDefinitionDao(ApplicationC
 				LocaleResolver resolver) {
 			BaseLocaleUrlDefinitionDAO dao = super.instantiateLocaleDefinitionDao(applicationContext, resolver);
 			if (checkRefresh && dao instanceof CachingLocaleUrlDefinitionDAO) {
-				((CachingLocaleUrlDefinitionDAO) dao).setCheckRefresh(checkRefresh);
+				((CachingLocaleUrlDefinitionDAO) dao).setCheckRefresh(true);
 			}
 			return dao;
 		}
@@ -315,8 +321,8 @@ protected DefinitionsFactory createDefinitionsFactory(ApplicationContext applica
 
 			if (definitionsFactoryClass != null) {
 				DefinitionsFactory factory = BeanUtils.instantiate(definitionsFactoryClass);
-				if (factory instanceof org.apache.tiles.request.ApplicationContextAware) {
-					((org.apache.tiles.request.ApplicationContextAware) factory).setApplicationContext(applicationContext);
+				if (factory instanceof ApplicationContextAware) {
+					((ApplicationContextAware) factory).setApplicationContext(applicationContext);
 				}
 				BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(factory);
 				if (bw.isWritableProperty("localeResolver")) {
@@ -336,7 +342,8 @@ protected DefinitionsFactory createDefinitionsFactory(ApplicationContext applica
 		protected PreparerFactory createPreparerFactory(ApplicationContext context) {
 			if (preparerFactoryClass != null) {
 				return BeanUtils.instantiate(preparerFactoryClass);
-			} else {
+			}
+			else {
 				return super.createPreparerFactory(context);
 			}
 		}
@@ -363,6 +370,7 @@ private AttributeEvaluator createELEvaluator(ApplicationContext context) {
 		}
 	}
 
+
 	private class SpringCompleteAutoloadTilesInitializer extends CompleteAutoloadTilesInitializer {
 
 		@Override
@@ -371,6 +379,7 @@ protected AbstractTilesContainerFactory createContainerFactory(ApplicationContex
 		}
 	}
 
+
 	private class SpringCompleteAutoloadTilesContainerFactory extends CompleteAutoloadTilesContainerFactory {
 
 		@Override
@@ -407,6 +416,7 @@ public AttributeEvaluator createEvaluator() {
 		}
 	}
 
+
 	private static class CompositeELResolverImpl extends CompositeELResolver {
 
 		public CompositeELResolverImpl() {
@@ -420,4 +430,5 @@ public CompositeELResolverImpl() {
 			add(new BeanELResolver(false));
 		}
 	}
+
 }
diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java
index 0490e3193a..a134e8641c 100644
--- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java
+++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.view.tiles3;
 
 import org.apache.tiles.request.render.Renderer;
+
 import org.springframework.web.servlet.view.UrlBasedViewResolver;
 
 /**
@@ -24,6 +26,7 @@
  *
  * @author Nicolas Le Bas
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @since 3.2
  */
 public class TilesViewResolver extends UrlBasedViewResolver {
@@ -31,25 +34,35 @@ public class TilesViewResolver extends UrlBasedViewResolver {
 	private Renderer renderer;
 
 
+	public TilesViewResolver() {
+		setViewClass(requiredViewClass());
+	}
+
+
+	/**
+	 * Requires {@link TilesView}.
+	 */
 	@Override
-	@SuppressWarnings("rawtypes")
-	protected Class getViewClass() {
+	protected Class<?> requiredViewClass() {
 		return TilesView.class;
 	}
 
 	/**
-	 * Set the {@link Renderer} to use. If not set, by default
-	 * {@link org.apache.tiles.renderer.DefinitionRenderer} is used.
+	 * Set the {@link Renderer} to use. If not specified, a default
+	 * {@link org.apache.tiles.renderer.DefinitionRenderer} will be used.
 	 * @see TilesView#setRenderer(Renderer)
 	 */
 	public void setRenderer(Renderer renderer) {
 		this.renderer = renderer;
 	}
 
+
 	@Override
 	protected TilesView buildView(String viewName) throws Exception {
 		TilesView view = (TilesView) super.buildView(viewName);
-		view.setRenderer(this.renderer);
+		if (this.renderer != null) {
+			view.setRenderer(this.renderer);
+		}
 		return view;
 	}
 
diff --git a/spring-webmvc-tiles3/src/test/java/org/springframework/web/servlet/view/tiles3/TilesConfigurerTests.java b/spring-webmvc-tiles3/src/test/java/org/springframework/web/servlet/view/tiles3/TilesConfigurerTests.java
index 630e29e030..283d1e6c04 100644
--- a/spring-webmvc-tiles3/src/test/java/org/springframework/web/servlet/view/tiles3/TilesConfigurerTests.java
+++ b/spring-webmvc-tiles3/src/test/java/org/springframework/web/servlet/view/tiles3/TilesConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.web.servlet.view.tiles3;
 
-import static org.junit.Assert.assertNotNull;
-
 import org.apache.tiles.access.TilesAccess;
 import org.apache.tiles.impl.BasicTilesContainer;
 import org.apache.tiles.request.ApplicationContext;
@@ -25,11 +23,14 @@
 import org.apache.tiles.request.servlet.ServletRequest;
 import org.apache.tiles.request.servlet.ServletUtil;
 import org.junit.Test;
+
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.mock.web.test.MockServletContext;
 
+import static org.junit.Assert.*;
+
 /**
  * Test fixture for {@link TilesConfigurer}.
  *
@@ -42,7 +43,7 @@ public void simpleBootstrap() {
 		MockServletContext servletContext = new MockServletContext();
 
 		TilesConfigurer tc = new TilesConfigurer();
-		tc.setDefinitions(new String[] { "/org/springframework/web/servlet/view/tiles3/tiles-definitions.xml" });
+		tc.setDefinitions("/org/springframework/web/servlet/view/tiles3/tiles-definitions.xml");
 		tc.setCheckRefresh(true);
 		tc.setServletContext(servletContext);
 		tc.afterPropertiesSet();
@@ -57,6 +58,7 @@ public void simpleBootstrap() {
 		tc.destroy();
 	}
 
+
 	@Configuration
 	public static class AppConfig {
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java
index 82c016d7f2..71548ea223 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,6 @@
  *
  * @author Rossen Stoyanchev
  * @since 3.2
- *
  * @see org.springframework.web.context.request.async.WebAsyncManager
  * @see org.springframework.web.context.request.async.CallableProcessingInterceptor
  * @see org.springframework.web.context.request.async.DeferredResultProcessingInterceptor
@@ -48,19 +47,17 @@ public interface AsyncHandlerInterceptor extends HandlerInterceptor {
 
 	/**
 	 * Called instead of {@code postHandle} and {@code afterCompletion}, when
-	 * the a handler is being executed concurrently. Implementations may use the
-	 * provided request and response but should avoid modifying them in ways
-	 * that would conflict with the concurrent execution of the handler. A
-	 * typical use of this method would be to clean thread local variables.
-	 *
+	 * the a handler is being executed concurrently. Implementations may use
+	 * the provided request and response but should avoid modifying them in
+	 * ways that would conflict with the concurrent execution of the handler.
+	 * A typical use of this method would be to clean thread local variables.
 	 * @param request the current request
 	 * @param response the current response
 	 * @param handler handler (or {@link HandlerMethod}) that started async
 	 * execution, for type and/or instance examination
 	 * @throws Exception in case of errors
 	 */
-	void afterConcurrentHandlingStarted(
-			HttpServletRequest request, HttpServletResponse response, Object handler)
+	void afterConcurrentHandlingStarted(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception;
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
index fbe27e3a46..cae3fabaae 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,77 +56,92 @@
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.util.NestedServletException;
-import org.springframework.web.util.UrlPathHelper;
 import org.springframework.web.util.WebUtils;
 
 /**
- * Central dispatcher for HTTP request handlers/controllers, e.g. for web UI controllers or HTTP-based remote service
- * exporters. Dispatches to registered handlers for processing a web request, providing convenient mapping and exception
- * handling facilities.
+ * Central dispatcher for HTTP request handlers/controllers, e.g. for web UI controllers
+ * or HTTP-based remote service exporters. Dispatches to registered handlers for processing
+ * a web request, providing convenient mapping and exception handling facilities.
  *
- * <p>This servlet is very flexible: It can be used with just about any workflow, with the installation of the
- * appropriate adapter classes. It offers the following functionality that distinguishes it from other request-driven
- * web MVC frameworks:
+ * <p>This servlet is very flexible: It can be used with just about any workflow, with the
+ * installation of the appropriate adapter classes. It offers the following functionality
+ * that distinguishes it from other request-driven web MVC frameworks:
  *
- * <ul> <li>It is based around a JavaBeans configuration mechanism.
+ * <ul>
+ * <li>It is based around a JavaBeans configuration mechanism.
  *
- * <li>It can use any {@link HandlerMapping} implementation - pre-built or provided as part of an application - to
- * control the routing of requests to handler objects. Default is {@link org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping}
- * and {@link org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping}. HandlerMapping objects
- * can be defined as beans in the servlet's application context, implementing the HandlerMapping interface, overriding
- * the default HandlerMapping if present. HandlerMappings can be given any bean name (they are tested by type).
+ * <li>It can use any {@link HandlerMapping} implementation - pre-built or provided as part
+ * of an application - to control the routing of requests to handler objects. Default is
+ * {@link org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping} and
+ * {@link org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping}.
+ * HandlerMapping objects can be defined as beans in the servlet's application context,
+ * implementing the HandlerMapping interface, overriding the default HandlerMapping if
+ * present. HandlerMappings can be given any bean name (they are tested by type).
  *
- * <li>It can use any {@link HandlerAdapter}; this allows for using any handler interface. Default adapters are {@link
- * org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter}, {@link org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter},
- * for Spring's {@link org.springframework.web.HttpRequestHandler} and {@link org.springframework.web.servlet.mvc.Controller}
- * interfaces, respectively. A default {@link org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter}
- * will be registered as well. HandlerAdapter objects can be added as beans in the application context, overriding the
- * default HandlerAdapters. Like HandlerMappings, HandlerAdapters can be given any bean name (they are tested by type).
+ * <li>It can use any {@link HandlerAdapter}; this allows for using any handler interface.
+ * Default adapters are {@link org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter},
+ * {@link org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter}, for Spring's
+ * {@link org.springframework.web.HttpRequestHandler} and
+ * {@link org.springframework.web.servlet.mvc.Controller} interfaces, respectively. A default
+ * {@link org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter}
+ * will be registered as well. HandlerAdapter objects can be added as beans in the
+ * application context, overriding the default HandlerAdapters. Like HandlerMappings,
+ * HandlerAdapters can be given any bean name (they are tested by type).
  *
- * <li>The dispatcher's exception resolution strategy can be specified via a {@link HandlerExceptionResolver}, for
- * example mapping certain exceptions to error pages. Default are
+ * <li>The dispatcher's exception resolution strategy can be specified via a
+ * {@link HandlerExceptionResolver}, for example mapping certain exceptions to error pages.
+ * Default are
  * {@link org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerExceptionResolver},
  * {@link org.springframework.web.servlet.mvc.annotation.ResponseStatusExceptionResolver}, and
- * {@link org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver}. These HandlerExceptionResolvers can be overridden
- * through the application context. HandlerExceptionResolver can be given any bean name (they are tested by type).
+ * {@link org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver}.
+ * These HandlerExceptionResolvers can be overridden through the application context.
+ * HandlerExceptionResolver can be given any bean name (they are tested by type).
  *
- * <li>Its view resolution strategy can be specified via a {@link ViewResolver} implementation, resolving symbolic view
- * names into View objects. Default is {@link org.springframework.web.servlet.view.InternalResourceViewResolver}.
- * ViewResolver objects can be added as beans in the application context, overriding the default ViewResolver.
- * ViewResolvers can be given any bean name (they are tested by type).
+ * <li>Its view resolution strategy can be specified via a {@link ViewResolver}
+ * implementation, resolving symbolic view names into View objects. Default is
+ * {@link org.springframework.web.servlet.view.InternalResourceViewResolver}.
+ * ViewResolver objects can be added as beans in the application context, overriding the
+ * default ViewResolver. ViewResolvers can be given any bean name (they are tested by type).
  *
- * <li>If a {@link View} or view name is not supplied by the user, then the configured {@link
- * RequestToViewNameTranslator} will translate the current request into a view name. The corresponding bean name is
- * "viewNameTranslator"; the default is {@link org.springframework.web.servlet.view.DefaultRequestToViewNameTranslator}.
+ * <li>If a {@link View} or view name is not supplied by the user, then the configured
+ * {@link RequestToViewNameTranslator} will translate the current request into a view name.
+ * The corresponding bean name is "viewNameTranslator"; the default is
+ * {@link org.springframework.web.servlet.view.DefaultRequestToViewNameTranslator}.
  *
- * <li>The dispatcher's strategy for resolving multipart requests is determined by a {@link
- * org.springframework.web.multipart.MultipartResolver} implementation. Implementations for Jakarta Commons FileUpload
- * and Jason Hunter's COS are included; the typical choise is {@link org.springframework.web.multipart.commons.CommonsMultipartResolver}.
+ * <li>The dispatcher's strategy for resolving multipart requests is determined by a
+ * {@link org.springframework.web.multipart.MultipartResolver} implementation.
+ * Implementations for Apache Commons FileUpload and Servlet 3 are included; the typical
+ * choice is {@link org.springframework.web.multipart.commons.CommonsMultipartResolver}.
  * The MultipartResolver bean name is "multipartResolver"; default is none.
  *
- * <li>Its locale resolution strategy is determined by a {@link LocaleResolver}. Out-of-the-box implementations work via
- * HTTP accept header, cookie, or session. The LocaleResolver bean name is "localeResolver"; default is {@link
- * org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver}.
+ * <li>Its locale resolution strategy is determined by a {@link LocaleResolver}.
+ * Out-of-the-box implementations work via HTTP accept header, cookie, or session.
+ * The LocaleResolver bean name is "localeResolver"; default is
+ * {@link org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver}.
  *
- * <li>Its theme resolution strategy is determined by a {@link ThemeResolver}. Implementations for a fixed theme and for
- * cookie and session storage are included. The ThemeResolver bean name is "themeResolver"; default is {@link
- * org.springframework.web.servlet.theme.FixedThemeResolver}. </ul>
+ * <li>Its theme resolution strategy is determined by a {@link ThemeResolver}.
+ * Implementations for a fixed theme and for cookie and session storage are included.
+ * The ThemeResolver bean name is "themeResolver"; default is
+ * {@link org.springframework.web.servlet.theme.FixedThemeResolver}.
+ * </ul>
  *
- * <p><b>NOTE: The {@code @RequestMapping} annotation will only be processed if a corresponding
- * {@code HandlerMapping} (for type level annotations) and/or {@code HandlerAdapter} (for method level
- * annotations) is present in the dispatcher.</b> This is the case by default. However, if you are defining custom
- * {@code HandlerMappings} or {@code HandlerAdapters}, then you need to make sure that a corresponding custom
- * {@code DefaultAnnotationHandlerMapping} and/or {@code AnnotationMethodHandlerAdapter} is defined as well -
- * provided that you intend to use {@code @RequestMapping}.
+ * <p><b>NOTE: The {@code @RequestMapping} annotation will only be processed if a
+ * corresponding {@code HandlerMapping} (for type-level annotations) and/or
+ * {@code HandlerAdapter} (for method-level annotations) is present in the dispatcher.</b>
+ * This is the case by default. However, if you are defining custom {@code HandlerMappings}
+ * or {@code HandlerAdapters}, then you need to make sure that a corresponding custom
+ * {@code DefaultAnnotationHandlerMapping} and/or {@code AnnotationMethodHandlerAdapter}
+ * is defined as well - provided that you intend to use {@code @RequestMapping}.
  *
- * <p><b>A web application can define any number of DispatcherServlets.</b> Each servlet will operate in its own
- * namespace, loading its own application context with mappings, handlers, etc. Only the root application context as
- * loaded by {@link org.springframework.web.context.ContextLoaderListener}, if any, will be shared.
+ * <p><b>A web application can define any number of DispatcherServlets.</b>
+ * Each servlet will operate in its own namespace, loading its own application context
+ * with mappings, handlers, etc. Only the root application context as loaded by
+ * {@link org.springframework.web.context.ContextLoaderListener}, if any, will be shared.
  *
  * <p>As of Spring 3.1, {@code DispatcherServlet} may now be injected with a web
  * application context, rather than creating its own internally. This is useful in Servlet
- * 3.0+ environments, which support programmatic registration of servlet instances. See
- * {@link #DispatcherServlet(WebApplicationContext)} Javadoc for details.
+ * 3.0+ environments, which support programmatic registration of servlet instances.
+ * See the {@link #DispatcherServlet(WebApplicationContext)} javadoc for details.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -245,8 +260,6 @@ public class DispatcherServlet extends FrameworkServlet {
 	/** Additional logger to use when no mapped handler is found for a request. */
 	protected static final Log pageNotFoundLogger = LogFactory.getLog(PAGE_NOT_FOUND_LOG_CATEGORY);
 
-	private static final UrlPathHelper urlPathHelper = new UrlPathHelper();
-
 	private static final Properties defaultStrategies;
 
 	static {
@@ -818,17 +831,15 @@ protected Object createDefaultStrategy(ApplicationContext context, Class<?> claz
 	@Override
 	protected void doService(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		if (logger.isDebugEnabled()) {
-			String requestUri = urlPathHelper.getRequestUri(request);
 			String resumed = WebAsyncUtils.getAsyncManager(request).hasConcurrentResult() ? " resumed" : "";
 			logger.debug("DispatcherServlet with name '" + getServletName() + "'" + resumed +
-					" processing " + request.getMethod() + " request for [" + requestUri + "]");
+					" processing " + request.getMethod() + " request for [" + getRequestUri(request) + "]");
 		}
 
 		// Keep a snapshot of the request attributes in case of an include,
 		// to be able to restore the original attributes after the include.
 		Map<String, Object> attributesSnapshot = null;
 		if (WebUtils.isIncludeRequest(request)) {
-			logger.debug("Taking snapshot of request attributes before include");
 			attributesSnapshot = new HashMap<String, Object>();
 			Enumeration<?> attrNames = request.getAttributeNames();
 			while (attrNames.hasMoreElements()) {
@@ -856,12 +867,11 @@ protected void doService(HttpServletRequest request, HttpServletResponse respons
 			doDispatch(request, response);
 		}
 		finally {
-			if (WebAsyncUtils.getAsyncManager(request).isConcurrentHandlingStarted()) {
-				return;
-			}
-			// Restore the original attribute snapshot, in case of an include.
-			if (attributesSnapshot != null) {
-				restoreAttributesAfterInclude(request, attributesSnapshot);
+			if (!WebAsyncUtils.getAsyncManager(request).isConcurrentHandlingStarted()) {
+				// Restore the original attribute snapshot, in case of an include.
+				if (attributesSnapshot != null) {
+					restoreAttributesAfterInclude(request, attributesSnapshot);
+				}
 			}
 		}
 	}
@@ -890,7 +900,7 @@ protected void doDispatch(HttpServletRequest request, HttpServletResponse respon
 
 			try {
 				processedRequest = checkMultipart(request);
-				multipartRequestParsed = processedRequest != request;
+				multipartRequestParsed = (processedRequest != request);
 
 				// Determine handler for the current request.
 				mappedHandler = getHandler(processedRequest, false);
@@ -908,8 +918,7 @@ protected void doDispatch(HttpServletRequest request, HttpServletResponse respon
 				if (isGet || "HEAD".equals(method)) {
 					long lastModified = ha.getLastModified(request, mappedHandler.getHandler());
 					if (logger.isDebugEnabled()) {
-						String requestUri = urlPathHelper.getRequestUri(request);
-						logger.debug("Last-Modified value for [" + requestUri + "] is: " + lastModified);
+						logger.debug("Last-Modified value for [" + getRequestUri(request) + "] is: " + lastModified);
 					}
 					if (new ServletWebRequest(request, response).checkNotModified(lastModified) && isGet) {
 						return;
@@ -920,14 +929,11 @@ protected void doDispatch(HttpServletRequest request, HttpServletResponse respon
 					return;
 				}
 
-				try {
-					// Actually invoke the handler.
-					mv = ha.handle(processedRequest, response, mappedHandler.getHandler());
-				}
-				finally {
-					if (asyncManager.isConcurrentHandlingStarted()) {
-						return;
-					}
+				// Actually invoke the handler.
+				mv = ha.handle(processedRequest, response, mappedHandler.getHandler());
+
+				if (asyncManager.isConcurrentHandlingStarted()) {
+					return;
 				}
 
 				applyDefaultViewName(request, mv);
@@ -947,12 +953,15 @@ protected void doDispatch(HttpServletRequest request, HttpServletResponse respon
 		finally {
 			if (asyncManager.isConcurrentHandlingStarted()) {
 				// Instead of postHandle and afterCompletion
-				mappedHandler.applyAfterConcurrentHandlingStarted(processedRequest, response);
-				return;
+				if (mappedHandler != null) {
+					mappedHandler.applyAfterConcurrentHandlingStarted(processedRequest, response);
+				}
 			}
-			// Clean up any resources used by a multipart request.
-			if (multipartRequestParsed) {
-				cleanupMultipart(processedRequest);
+			else {
+				// Clean up any resources used by a multipart request.
+				if (multipartRequestParsed) {
+					cleanupMultipart(processedRequest);
+				}
 			}
 		}
 	}
@@ -1039,7 +1048,7 @@ public String toString() {
 	 */
 	protected HttpServletRequest checkMultipart(HttpServletRequest request) throws MultipartException {
 		if (this.multipartResolver != null && this.multipartResolver.isMultipart(request)) {
-			if (request instanceof MultipartHttpServletRequest) {
+			if (WebUtils.getNativeRequest(request, MultipartHttpServletRequest.class) != null) {
 				logger.debug("Request is already a MultipartHttpServletRequest - if not in a forward, " +
 						"this typically results from an additional MultipartFilter in web.xml");
 			}
@@ -1053,13 +1062,13 @@ protected HttpServletRequest checkMultipart(HttpServletRequest request) throws M
 
 	/**
 	 * Clean up any resources used by the given multipart request (if any).
-	 * @param servletRequest current HTTP request
+	 * @param request current HTTP request
 	 * @see MultipartResolver#cleanupMultipart
 	 */
-	protected void cleanupMultipart(HttpServletRequest servletRequest) {
-		MultipartHttpServletRequest req = WebUtils.getNativeRequest(servletRequest, MultipartHttpServletRequest.class);
-		if (req != null) {
-			this.multipartResolver.cleanupMultipart(req);
+	protected void cleanupMultipart(HttpServletRequest request) {
+		MultipartHttpServletRequest multipartRequest = WebUtils.getNativeRequest(request, MultipartHttpServletRequest.class);
+		if (multipartRequest != null) {
+			this.multipartResolver.cleanupMultipart(multipartRequest);
 		}
 	}
 
@@ -1104,8 +1113,7 @@ protected HandlerExecutionChain getHandler(HttpServletRequest request) throws Ex
 	 */
 	protected void noHandlerFound(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		if (pageNotFoundLogger.isWarnEnabled()) {
-			String requestUri = urlPathHelper.getRequestUri(request);
-			pageNotFoundLogger.warn("No mapping found for HTTP request with URI [" + requestUri +
+			pageNotFoundLogger.warn("No mapping found for HTTP request with URI [" + getRequestUri(request) +
 					"] in DispatcherServlet with name '" + getServletName() + "'");
 		}
 		response.sendError(HttpServletResponse.SC_NOT_FOUND);
@@ -1187,9 +1195,8 @@ protected void render(ModelAndView mv, HttpServletRequest request, HttpServletRe
 			// We need to resolve the view name.
 			view = resolveViewName(mv.getViewName(), mv.getModelInternal(), locale, request);
 			if (view == null) {
-				throw new ServletException(
-						"Could not resolve view with name '" + mv.getViewName() + "' in servlet with name '" +
-								getServletName() + "'");
+				throw new ServletException("Could not resolve view with name '" + mv.getViewName() +
+						"' in servlet with name '" + getServletName() + "'");
 			}
 		}
 		else {
@@ -1205,7 +1212,16 @@ protected void render(ModelAndView mv, HttpServletRequest request, HttpServletRe
 		if (logger.isDebugEnabled()) {
 			logger.debug("Rendering view [" + view + "] in DispatcherServlet with name '" + getServletName() + "'");
 		}
-		view.render(mv.getModelInternal(), request, response);
+		try {
+			view.render(mv.getModelInternal(), request, response);
+		}
+		catch (Exception ex) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Error rendering view [" + view + "] in DispatcherServlet with name '" +
+						getServletName() + "'", ex);
+			}
+			throw ex;
+		}
 	}
 
 	/**
@@ -1254,7 +1270,7 @@ private void triggerAfterCompletion(HttpServletRequest request, HttpServletRespo
 	}
 
 	private void triggerAfterCompletionWithError(HttpServletRequest request, HttpServletResponse response,
-			HandlerExecutionChain mappedHandler, Error error) throws Exception, ServletException {
+			HandlerExecutionChain mappedHandler, Error error) throws Exception {
 
 		ServletException ex = new NestedServletException("Handler processing failed", error);
 		if (mappedHandler != null) {
@@ -1270,8 +1286,6 @@ private void triggerAfterCompletionWithError(HttpServletRequest request, HttpSer
 	 */
 	@SuppressWarnings("unchecked")
 	private void restoreAttributesAfterInclude(HttpServletRequest request, Map<?,?> attributesSnapshot) {
-		logger.debug("Restoring snapshot of request attributes after include");
-
 		// Need to copy into separate Collection here, to avoid side effects
 		// on the Enumeration when removing attributes.
 		Set<String> attrsToCheck = new HashSet<String>();
@@ -1291,18 +1305,20 @@ private void restoreAttributesAfterInclude(HttpServletRequest request, Map<?,?>
 		for (String attrName : attrsToCheck) {
 			Object attrValue = attributesSnapshot.get(attrName);
 			if (attrValue == null){
-				if (logger.isDebugEnabled()) {
-					logger.debug("Removing attribute [" + attrName + "] after include");
-				}
 				request.removeAttribute(attrName);
 			}
 			else if (attrValue != request.getAttribute(attrName)) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("Restoring original value of attribute [" + attrName + "] after include");
-				}
 				request.setAttribute(attrName, attrValue);
 			}
 		}
 	}
 
+	private static String getRequestUri(HttpServletRequest request) {
+		String uri = (String) request.getAttribute(WebUtils.INCLUDE_REQUEST_URI_ATTRIBUTE);
+		if (uri == null) {
+			uri = request.getRequestURI();
+		}
+		return uri;
+	}
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMap.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMap.java
index 983930714c..daddf16615 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMap.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,13 +42,11 @@
  *
  * @author Rossen Stoyanchev
  * @since 3.1
- *
  * @see FlashMapManager
  */
+@SuppressWarnings("serial")
 public final class FlashMap extends HashMap<String, Object> implements Comparable<FlashMap> {
 
-	private static final long serialVersionUID = 1L;
-
 	private String targetRequestPath;
 
 	private final MultiValueMap<String, String> targetRequestParams = new LinkedMultiValueMap<String, String>();
@@ -57,26 +55,26 @@ public final class FlashMap extends HashMap<String, Object> implements Comparabl
 
 	private int timeToLive;
 
+
 	/**
 	 * Provide a URL path to help identify the target request for this FlashMap.
-	 * The path may be absolute (e.g. /application/resource) or relative to the
-	 * current request (e.g. ../resource).
-	 * @param path the URI path
+	 * <p>The path may be absolute (e.g. "/application/resource") or relative to the
+	 * current request (e.g. "../resource").
 	 */
 	public void setTargetRequestPath(String path) {
 		this.targetRequestPath = path;
 	}
 
 	/**
-	 * Return the target URL path or {@code null}.
+	 * Return the target URL path (or {@code null} if none specified).
 	 */
 	public String getTargetRequestPath() {
-		return targetRequestPath;
+		return this.targetRequestPath;
 	}
 
 	/**
 	 * Provide request parameters identifying the request for this FlashMap.
-	 * @param params a Map with the names and values of expected parameters.
+	 * @param params a Map with the names and values of expected parameters
 	 */
 	public FlashMap addTargetRequestParams(MultiValueMap<String, String> params) {
 		if (params != null) {
@@ -91,8 +89,8 @@ public FlashMap addTargetRequestParams(MultiValueMap<String, String> params) {
 
 	/**
 	 * Provide a request parameter identifying the request for this FlashMap.
-	 * @param name the expected parameter name, skipped if empty or {@code null}
-	 * @param value the expected value, skipped if empty or {@code null}
+	 * @param name the expected parameter name (skipped if empty or {@code null})
+	 * @param value the expected value (skipped if empty or {@code null})
 	 */
 	public FlashMap addTargetRequestParam(String name, String value) {
 		if (StringUtils.hasText(name) && StringUtils.hasText(value)) {
@@ -118,26 +116,23 @@ public void startExpirationPeriod(int timeToLive) {
 	}
 
 	/**
-	 * Whether this instance has expired depending on the amount of elapsed
-	 * time since the call to {@link #startExpirationPeriod}.
+	 * Return whether this instance has expired depending on the amount of
+	 * elapsed time since the call to {@link #startExpirationPeriod}.
 	 */
 	public boolean isExpired() {
-		if (this.expirationStartTime != 0) {
-			return (System.currentTimeMillis() - this.expirationStartTime) > this.timeToLive * 1000;
-		}
-		else {
-			return false;
-		}
+		return (this.expirationStartTime != 0 &&
+				(System.currentTimeMillis() - this.expirationStartTime > this.timeToLive * 1000));
 	}
 
+
 	/**
 	 * Compare two FlashMaps and prefer the one that specifies a target URL
 	 * path or has more target URL parameters. Before comparing FlashMap
 	 * instances ensure that they match a given request.
 	 */
 	public int compareTo(FlashMap other) {
-		int thisUrlPath = (this.targetRequestPath != null) ? 1 : 0;
-		int otherUrlPath = (other.targetRequestPath != null) ? 1 : 0;
+		int thisUrlPath = (this.targetRequestPath != null ? 1 : 0);
+		int otherUrlPath = (other.targetRequestPath != null ? 1 : 0);
 		if (thisUrlPath != otherUrlPath) {
 			return otherUrlPath - thisUrlPath;
 		}
@@ -149,7 +144,7 @@ public int compareTo(FlashMap other) {
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
-		sb.append("[Attributes=").append(super.toString());
+		sb.append("FlashMap [attributes=").append(super.toString());
 		sb.append(", targetRequestPath=").append(this.targetRequestPath);
 		sb.append(", targetRequestParams=").append(this.targetRequestParams).append("]");
 		return sb.toString();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMapManager.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMapManager.java
index 078713194b..527009e58e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMapManager.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FlashMapManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
  *
  * @author Rossen Stoyanchev
  * @since 3.1
- *
  * @see FlashMap
  */
 public interface FlashMapManager {
@@ -46,7 +45,7 @@ public interface FlashMapManager {
 	/**
 	 * Save the given FlashMap, in some underlying storage and set the start
 	 * of its expiration period.
-	 * <p><strong>Note:</strong> Invoke this method prior to a redirect in order
+	 * <p><strong>NOTE:</strong> Invoke this method prior to a redirect in order
 	 * to allow saving the FlashMap in the HTTP session or in a response
 	 * cookie before the response is committed.
 	 * @param flashMap the FlashMap to save
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
index 07f2db1648..e3375717b5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.security.Principal;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.concurrent.Callable;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
@@ -38,14 +37,17 @@
 import org.springframework.context.i18n.LocaleContext;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.context.i18n.SimpleLocaleContext;
+import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.ConfigurableWebApplicationContext;
 import org.springframework.web.context.ConfigurableWebEnvironment;
+import org.springframework.web.context.ContextLoader;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.RequestAttributes;
@@ -172,6 +174,13 @@ public abstract class FrameworkServlet extends HttpServletBean {
 	/** Explicit context config location */
 	private String contextConfigLocation;
 
+	/** Actual ApplicationContextInitializer instances to apply to the context */
+	private final ArrayList<ApplicationContextInitializer<ConfigurableApplicationContext>> contextInitializers =
+			new ArrayList<ApplicationContextInitializer<ConfigurableApplicationContext>>();
+
+	/** Comma-delimited ApplicationContextInitializer class names set through init param */
+	private String contextInitializerClasses;
+
 	/** Should we publish the context as a ServletContext attribute? */
 	private boolean publishContext = true;
 
@@ -193,13 +202,6 @@ public abstract class FrameworkServlet extends HttpServletBean {
 	/** Flag used to detect whether onRefresh has already been called */
 	private boolean refreshEventReceived = false;
 
-	/** Comma-delimited ApplicationContextInitializer classnames set through init param */
-	private String contextInitializerClasses;
-
-	/** Actual ApplicationContextInitializer instances to apply to the context */
-	private ArrayList<ApplicationContextInitializer<ConfigurableApplicationContext>> contextInitializers =
-			new ArrayList<ApplicationContextInitializer<ConfigurableApplicationContext>>();
-
 
 	/**
 	 * Create a new {@code FrameworkServlet} that will create its own internal web
@@ -334,13 +336,19 @@ public String getNamespace() {
 	}
 
 	/**
-	 * Specify the set of fully-qualified {@link ApplicationContextInitializer} class
-	 * names, per the optional "contextInitializerClasses" servlet init-param.
-	 * @see #configureAndRefreshWebApplicationContext(ConfigurableWebApplicationContext)
-	 * @see #applyInitializers(ConfigurableApplicationContext)
+	 * Set the context config location explicitly, instead of relying on the default
+	 * location built from the namespace. This location string can consist of
+	 * multiple locations separated by any number of commas and spaces.
 	 */
-	public void setContextInitializerClasses(String contextInitializerClasses) {
-		this.contextInitializerClasses = contextInitializerClasses;
+	public void setContextConfigLocation(String contextConfigLocation) {
+		this.contextConfigLocation = contextConfigLocation;
+	}
+
+	/**
+	 * Return the explicit context config location, if any.
+	 */
+	public String getContextConfigLocation() {
+		return this.contextConfigLocation;
 	}
 
 	/**
@@ -349,26 +357,21 @@ public void setContextInitializerClasses(String contextInitializerClasses) {
 	 * @see #configureAndRefreshWebApplicationContext(ConfigurableWebApplicationContext)
 	 * @see #applyInitializers(ConfigurableApplicationContext)
 	 */
-	public void setContextInitializers(ApplicationContextInitializer<ConfigurableApplicationContext>... contextInitializers) {
-		for (ApplicationContextInitializer<ConfigurableApplicationContext> initializer : contextInitializers) {
-			this.contextInitializers.add(initializer);
+	@SuppressWarnings("unchecked")
+	public void setContextInitializers(ApplicationContextInitializer<? extends ConfigurableApplicationContext>... contextInitializers) {
+		for (ApplicationContextInitializer<? extends ConfigurableApplicationContext> initializer : contextInitializers) {
+			this.contextInitializers.add((ApplicationContextInitializer<ConfigurableApplicationContext>) initializer);
 		}
 	}
 
 	/**
-	 * Set the context config location explicitly, instead of relying on the default
-	 * location built from the namespace. This location string can consist of
-	 * multiple locations separated by any number of commas and spaces.
-	 */
-	public void setContextConfigLocation(String contextConfigLocation) {
-		this.contextConfigLocation = contextConfigLocation;
-	}
-
-	/**
-	 * Return the explicit context config location, if any.
+	 * Specify the set of fully-qualified {@link ApplicationContextInitializer} class
+	 * names, per the optional "contextInitializerClasses" servlet init-param.
+	 * @see #configureAndRefreshWebApplicationContext(ConfigurableWebApplicationContext)
+	 * @see #applyInitializers(ConfigurableApplicationContext)
 	 */
-	public String getContextConfigLocation() {
-		return this.contextConfigLocation;
+	public void setContextInitializerClasses(String contextInitializerClasses) {
+		this.contextInitializerClasses = contextInitializerClasses;
 	}
 
 	/**
@@ -635,19 +638,16 @@ protected void configureAndRefreshWebApplicationContext(ConfigurableWebApplicati
 		wac.setNamespace(getNamespace());
 		wac.addApplicationListener(new SourceFilteringListener(wac, new ContextRefreshListener()));
 
-		// the wac environment's #initPropertySources will be called in any case when
-		// the context is refreshed; do it eagerly here to ensure servlet property sources
-		// are in place for use in any post-processing or initialization that occurs
-		// below prior to #refresh
+		// The wac environment's #initPropertySources will be called in any case when the context
+		// is refreshed; do it eagerly here to ensure servlet property sources are in place for
+		// use in any post-processing or initialization that occurs below prior to #refresh
 		ConfigurableEnvironment env = wac.getEnvironment();
 		if (env instanceof ConfigurableWebEnvironment) {
-			((ConfigurableWebEnvironment)env).initPropertySources(getServletContext(), getServletConfig());
+			((ConfigurableWebEnvironment) env).initPropertySources(getServletContext(), getServletConfig());
 		}
 
 		postProcessWebApplicationContext(wac);
-
 		applyInitializers(wac);
-
 		wac.refresh();
 	}
 
@@ -665,58 +665,75 @@ protected WebApplicationContext createWebApplicationContext(WebApplicationContex
 		return createWebApplicationContext((ApplicationContext) parent);
 	}
 
+	/**
+	 * Post-process the given WebApplicationContext before it is refreshed
+	 * and activated as context for this servlet.
+	 * <p>The default implementation is empty. {@code refresh()} will
+	 * be called automatically after this method returns.
+	 * <p>Note that this method is designed to allow subclasses to modify the application
+	 * context, while {@link #initWebApplicationContext} is designed to allow
+	 * end-users to modify the context through the use of
+	 * {@link ApplicationContextInitializer}s.
+	 * @param wac the configured WebApplicationContext (not refreshed yet)
+	 * @see #createWebApplicationContext
+	 * @see #initWebApplicationContext
+	 * @see ConfigurableWebApplicationContext#refresh()
+	 */
+	protected void postProcessWebApplicationContext(ConfigurableWebApplicationContext wac) {
+	}
+
 	/**
 	 * Delegate the WebApplicationContext before it is refreshed to any
 	 * {@link ApplicationContextInitializer} instances specified by the
 	 * "contextInitializerClasses" servlet init-param.
 	 * <p>See also {@link #postProcessWebApplicationContext}, which is designed to allow
 	 * subclasses (as opposed to end-users) to modify the application context, and is
-	 * called immediately after this method.
+	 * called immediately before this method.
 	 * @param wac the configured WebApplicationContext (not refreshed yet)
 	 * @see #createWebApplicationContext
 	 * @see #postProcessWebApplicationContext
 	 * @see ConfigurableApplicationContext#refresh()
 	 */
-	@SuppressWarnings("unchecked")
 	protected void applyInitializers(ConfigurableApplicationContext wac) {
+		String globalClassNames = getServletContext().getInitParameter(ContextLoader.GLOBAL_INITIALIZER_CLASSES_PARAM);
+		if (globalClassNames != null) {
+			for (String className : StringUtils.tokenizeToStringArray(globalClassNames, INIT_PARAM_DELIMITERS)) {
+				this.contextInitializers.add(loadInitializer(className, wac));
+			}
+		}
+
 		if (this.contextInitializerClasses != null) {
-			String[] initializerClassNames =
-					StringUtils.tokenizeToStringArray(this.contextInitializerClasses, INIT_PARAM_DELIMITERS);
-			for (String initializerClassName : initializerClassNames) {
-				ApplicationContextInitializer<ConfigurableApplicationContext> initializer;
-				try {
-					Class<?> initializerClass = ClassUtils.forName(initializerClassName, wac.getClassLoader());
-					initializer = BeanUtils.instantiateClass(initializerClass, ApplicationContextInitializer.class);
-				}
-				catch (Exception ex) {
-					throw new IllegalArgumentException(
-							String.format("Could not instantiate class [%s] specified via " +
-							"'contextInitializerClasses' init-param", initializerClassName), ex);
-				}
-				this.contextInitializers.add(initializer);
+			for (String className : StringUtils.tokenizeToStringArray(this.contextInitializerClasses, INIT_PARAM_DELIMITERS)) {
+				this.contextInitializers.add(loadInitializer(className, wac));
 			}
 		}
-		Collections.sort(this.contextInitializers, new AnnotationAwareOrderComparator());
+
+		AnnotationAwareOrderComparator.sort(this.contextInitializers);
 		for (ApplicationContextInitializer<ConfigurableApplicationContext> initializer : this.contextInitializers) {
 			initializer.initialize(wac);
 		}
 	}
 
-	/**
-	 * Post-process the given WebApplicationContext before it is refreshed
-	 * and activated as context for this servlet.
-	 * <p>The default implementation is empty. {@code refresh()} will
-	 * be called automatically after this method returns.
-	 * <p>Note that this method is designed to allow subclasses to modify the application
-	 * context, while {@link #initWebApplicationContext} is designed to allow
-	 * end-users to modify the context through the use of
-	 * {@link ApplicationContextInitializer}s.
-	 * @param wac the configured WebApplicationContext (not refreshed yet)
-	 * @see #createWebApplicationContext
-	 * @see #initWebApplicationContext
-	 * @see ConfigurableWebApplicationContext#refresh()
-	 */
-	protected void postProcessWebApplicationContext(ConfigurableWebApplicationContext wac) {
+	@SuppressWarnings("unchecked")
+	private ApplicationContextInitializer<ConfigurableApplicationContext> loadInitializer(
+			String className, ConfigurableApplicationContext wac) {
+		try {
+			Class<?> initializerClass = ClassUtils.forName(className, wac.getClassLoader());
+			Class<?> initializerContextClass =
+					GenericTypeResolver.resolveTypeArgument(initializerClass, ApplicationContextInitializer.class);
+			if (initializerContextClass != null) {
+				Assert.isAssignable(initializerContextClass, wac.getClass(), String.format(
+						"Could not add context initializer [%s] since its generic parameter [%s] " +
+						"is not assignable from the type of application context used by this " +
+						"framework servlet [%s]: ", initializerClass.getName(), initializerContextClass.getName(),
+						wac.getClass().getName()));
+			}
+			return BeanUtils.instantiateClass(initializerClass, ApplicationContextInitializer.class);
+		}
+		catch (Exception ex) {
+			throw new IllegalArgumentException(String.format("Could not instantiate class [%s] specified " +
+					"via 'contextInitializerClasses' init-param", className), ex);
+		}
 	}
 
 	/**
@@ -797,15 +814,13 @@ public void destroy() {
 
 
 	/**
-	 * Override the parent class implementation in order to intercept PATCH
-	 * requests.
+	 * Override the parent class implementation in order to intercept PATCH requests.
 	 */
 	@Override
 	protected void service(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 
-		String method = request.getMethod();
-		if (method.equalsIgnoreCase(RequestMethod.PATCH.name())) {
+		if (RequestMethod.PATCH.name().equalsIgnoreCase(request.getMethod())) {
 			processRequest(request, response);
 		}
 		else {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
index dbbe8946ba..6fab48f202 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExecutionChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,14 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Handler execution chain, consisting of handler object and any handler interceptors.
@@ -53,7 +54,7 @@ public class HandlerExecutionChain {
 	 * @param handler the handler object to execute
 	 */
 	public HandlerExecutionChain(Object handler) {
-		this(handler, null);
+		this(handler, (HandlerInterceptor[]) null);
 	}
 
 	/**
@@ -62,7 +63,7 @@ public HandlerExecutionChain(Object handler) {
 	 * @param interceptors the array of interceptors to apply
 	 * (in the given order) before the handler itself executes
 	 */
-	public HandlerExecutionChain(Object handler, HandlerInterceptor[] interceptors) {
+	public HandlerExecutionChain(Object handler, HandlerInterceptor... interceptors) {
 		if (handler instanceof HandlerExecutionChain) {
 			HandlerExecutionChain originalChain = (HandlerExecutionChain) handler;
 			this.handler = originalChain.getHandler();
@@ -76,6 +77,7 @@ public HandlerExecutionChain(Object handler, HandlerInterceptor[] interceptors)
 		}
 	}
 
+
 	/**
 	 * Return the handler object to execute.
 	 * @return the handler object
@@ -85,25 +87,25 @@ public Object getHandler() {
 	}
 
 	public void addInterceptor(HandlerInterceptor interceptor) {
-		initInterceptorList();
-		this.interceptorList.add(interceptor);
+		initInterceptorList().add(interceptor);
 	}
 
-	public void addInterceptors(HandlerInterceptor[] interceptors) {
-		if (interceptors != null) {
-			initInterceptorList();
-			this.interceptorList.addAll(Arrays.asList(interceptors));
+	public void addInterceptors(HandlerInterceptor... interceptors) {
+		if (!ObjectUtils.isEmpty(interceptors)) {
+			initInterceptorList().addAll(Arrays.asList(interceptors));
 		}
 	}
 
-	private void initInterceptorList() {
+	private List<HandlerInterceptor> initInterceptorList() {
 		if (this.interceptorList == null) {
 			this.interceptorList = new ArrayList<HandlerInterceptor>();
+			if (this.interceptors != null) {
+				// An interceptor array specified through the constructor
+				this.interceptorList.addAll(Arrays.asList(this.interceptors));
+			}
 		}
-		if (this.interceptors != null) {
-			this.interceptorList.addAll(Arrays.asList(this.interceptors));
-			this.interceptors = null;
-		}
+		this.interceptors = null;
+		return this.interceptorList;
 	}
 
 	/**
@@ -117,6 +119,7 @@ public HandlerInterceptor[] getInterceptors() {
 		return this.interceptors;
 	}
 
+
 	/**
 	 * Apply preHandle methods of registered interceptors.
 	 * @return {@code true} if the execution chain should proceed with the
@@ -124,9 +127,10 @@ public HandlerInterceptor[] getInterceptors() {
 	 * that this interceptor has already dealt with the response itself.
 	 */
 	boolean applyPreHandle(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		if (getInterceptors() != null) {
-			for (int i = 0; i < getInterceptors().length; i++) {
-				HandlerInterceptor interceptor = getInterceptors()[i];
+		HandlerInterceptor[] interceptors = getInterceptors();
+		if (!ObjectUtils.isEmpty(interceptors)) {
+			for (int i = 0; i < interceptors.length; i++) {
+				HandlerInterceptor interceptor = interceptors[i];
 				if (!interceptor.preHandle(request, response, this.handler)) {
 					triggerAfterCompletion(request, response, null);
 					return false;
@@ -141,12 +145,12 @@ boolean applyPreHandle(HttpServletRequest request, HttpServletResponse response)
 	 * Apply postHandle methods of registered interceptors.
 	 */
 	void applyPostHandle(HttpServletRequest request, HttpServletResponse response, ModelAndView mv) throws Exception {
-		if (getInterceptors() == null) {
-			return;
-		}
-		for (int i = getInterceptors().length - 1; i >= 0; i--) {
-			HandlerInterceptor interceptor = getInterceptors()[i];
-			interceptor.postHandle(request, response, this.handler, mv);
+		HandlerInterceptor[] interceptors = getInterceptors();
+		if (!ObjectUtils.isEmpty(interceptors)) {
+			for (int i = interceptors.length - 1; i >= 0; i--) {
+				HandlerInterceptor interceptor = interceptors[i];
+				interceptor.postHandle(request, response, this.handler, mv);
+			}
 		}
 	}
 
@@ -158,16 +162,16 @@ void applyPostHandle(HttpServletRequest request, HttpServletResponse response, M
 	void triggerAfterCompletion(HttpServletRequest request, HttpServletResponse response, Exception ex)
 			throws Exception {
 
-		if (getInterceptors() == null) {
-			return;
-		}
-		for (int i = this.interceptorIndex; i >= 0; i--) {
-			HandlerInterceptor interceptor = getInterceptors()[i];
-			try {
-				interceptor.afterCompletion(request, response, this.handler, ex);
-			}
-			catch (Throwable ex2) {
-				logger.error("HandlerInterceptor.afterCompletion threw exception", ex2);
+		HandlerInterceptor[] interceptors = getInterceptors();
+		if (!ObjectUtils.isEmpty(interceptors)) {
+			for (int i = this.interceptorIndex; i >= 0; i--) {
+				HandlerInterceptor interceptor = interceptors[i];
+				try {
+					interceptor.afterCompletion(request, response, this.handler, ex);
+				}
+				catch (Throwable ex2) {
+					logger.error("HandlerInterceptor.afterCompletion threw exception", ex2);
+				}
 			}
 		}
 	}
@@ -176,22 +180,23 @@ void triggerAfterCompletion(HttpServletRequest request, HttpServletResponse resp
 	 * Apply afterConcurrentHandlerStarted callback on mapped AsyncHandlerInterceptors.
 	 */
 	void applyAfterConcurrentHandlingStarted(HttpServletRequest request, HttpServletResponse response) {
-		if (getInterceptors() == null) {
-			return;
-		}
-		for (int i = getInterceptors().length - 1; i >= 0; i--) {
-			if (interceptors[i] instanceof AsyncHandlerInterceptor) {
-				try {
-					AsyncHandlerInterceptor asyncInterceptor = (AsyncHandlerInterceptor) this.interceptors[i];
-					asyncInterceptor.afterConcurrentHandlingStarted(request, response, this.handler);
-				}
-				catch (Throwable ex) {
-					logger.error("Interceptor [" + interceptors[i] + "] failed in afterConcurrentHandlingStarted", ex);
+		HandlerInterceptor[] interceptors = getInterceptors();
+		if (!ObjectUtils.isEmpty(interceptors)) {
+			for (int i = interceptors.length - 1; i >= 0; i--) {
+				if (interceptors[i] instanceof AsyncHandlerInterceptor) {
+					try {
+						AsyncHandlerInterceptor asyncInterceptor = (AsyncHandlerInterceptor) interceptors[i];
+						asyncInterceptor.afterConcurrentHandlingStarted(request, response, this.handler);
+					}
+					catch (Throwable ex) {
+						logger.error("Interceptor [" + interceptors[i] + "] failed in afterConcurrentHandlingStarted", ex);
+					}
 				}
 			}
 		}
 	}
 
+
 	/**
 	 * Delegates to the handler's {@code toString()}.
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java
index 3ed6dbf357..6f8e803674 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,8 +33,8 @@
  * or common handler behavior like locale or theme changes. Its main purpose
  * is to allow for factoring out repetitive handler code.
  *
- * <p>In an async processing scenario, the handler may be executed in a separate
- * thread while the main thread exits without rendering or invoking the
+ * <p>In an asynchronous processing scenario, the handler may be executed in a
+ * separate thread while the main thread exits without rendering or invoking the
  * {@code postHandle} and {@code afterCompletion} callbacks. When concurrent
  * handler execution completes, the request is dispatched back in order to
  * proceed with rendering the model and all methods of this contract are invoked
@@ -48,7 +48,7 @@
  * in the application context, referenced by the mapping bean definition
  * via its "interceptors" property (in XML: a &lt;list&gt; of &lt;ref&gt;).
  *
- * <p>HandlerInterceptor is basically similar to a Servlet 2.3 Filter, but in
+ * <p>HandlerInterceptor is basically similar to a Servlet Filter, but in
  * contrast to the latter it just allows custom pre-processing with the option
  * of prohibiting the execution of the handler itself, and custom post-processing.
  * Filters are more powerful, for example they allow for exchanging the request
@@ -81,6 +81,9 @@ public interface HandlerInterceptor {
 	 * of any number of interceptors, with the handler itself at the end.
 	 * With this method, each interceptor can decide to abort the execution chain,
 	 * typically sending a HTTP error or writing a custom response.
+	 * <p><strong>Note:</strong> special considerations apply for asynchronous
+	 * request processing. For more details see
+	 * {@link org.springframework.web.servlet.AsyncHandlerInterceptor}.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @param handler chosen handler to execute, for type and/or instance evaluation
@@ -100,16 +103,18 @@ boolean preHandle(HttpServletRequest request, HttpServletResponse response, Obje
 	 * of any number of interceptors, with the handler itself at the end.
 	 * With this method, each interceptor can post-process an execution,
 	 * getting applied in inverse order of the execution chain.
+	 * <p><strong>Note:</strong> special considerations apply for asynchronous
+	 * request processing. For more details see
+	 * {@link org.springframework.web.servlet.AsyncHandlerInterceptor}.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @param handler handler (or {@link HandlerMethod}) that started async
+	 * @param handler handler (or {@link HandlerMethod}) that started asynchronous
 	 * execution, for type and/or instance examination
 	 * @param modelAndView the {@code ModelAndView} that the handler returned
 	 * (can also be {@code null})
 	 * @throws Exception in case of errors
 	 */
-	void postHandle(
-			HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView)
+	void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView)
 			throws Exception;
 
 	/**
@@ -121,15 +126,17 @@ void postHandle(
 	 * <p>As with the {@code postHandle} method, the method will be invoked on each
 	 * interceptor in the chain in reverse order, so the first interceptor will be
 	 * the last to be invoked.
+	 * <p><strong>Note:</strong> special considerations apply for asynchronous
+	 * request processing. For more details see
+	 * {@link org.springframework.web.servlet.AsyncHandlerInterceptor}.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @param handler handler (or {@link HandlerMethod}) that started async
+	 * @param handler handler (or {@link HandlerMethod}) that started asynchronous
 	 * execution, for type and/or instance examination
 	 * @param ex exception thrown on handler execution, if any
 	 * @throws Exception in case of errors
 	 */
-	void afterCompletion(
-			HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
+	void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
 			throws Exception;
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java
index d580afe766..380bdfd397 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.web.servlet;
 
 import java.util.Locale;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -27,22 +26,22 @@
  * request and response.
  *
  * <p>This interface allows for implementations based on request, session,
- * cookies, etc. The default implementation is AcceptHeaderLocaleResolver,
+ * cookies, etc. The default implementation is
+ * {@link org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver},
  * simply using the request's locale provided by the respective HTTP header.
  *
- * <p>Use {@code RequestContext.getLocale()} to retrieve the current locale
- * in controllers or views, independent of the actual resolution strategy.
+ * <p>Use {@link org.springframework.web.servlet.support.RequestContext#getLocale()}
+ * to retrieve the current locale in controllers or views, independent
+ * of the actual resolution strategy.
  *
  * @author Juergen Hoeller
  * @since 27.02.2003
- * @see org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver
- * @see org.springframework.web.servlet.support.RequestContext#getLocale
  */
 public interface LocaleResolver {
 
   /**
    * Resolve the current locale via the given request.
-   * Should return a default locale as fallback in any case.
+   * Can return a default locale as fallback in any case.
    * @param request the request to resolve the locale for
    * @return the current locale (never {@code null})
    */
@@ -54,7 +53,7 @@ public interface LocaleResolver {
    * @param response the response to be used for locale modification
    * @param locale the new locale, or {@code null} to clear the locale
    * @throws UnsupportedOperationException if the LocaleResolver implementation
-   * does not support dynamic changing of the theme
+   * does not support dynamic changing of the locale
    */
 	void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale);
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java
index b286661489..452b3d065f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java
@@ -17,7 +17,6 @@
 package org.springframework.web.servlet;
 
 import java.io.IOException;
-
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -271,18 +270,18 @@ private void doInclude(HttpServletRequest request, HttpServletResponse response,
 		if (this.contentType != null) {
 			response.setContentType(this.contentType);
 		}
-		String[] resourceUrls =
-			StringUtils.tokenizeToStringArray(resourceUrl, RESOURCE_URL_DELIMITERS);
-		for (int i = 0; i < resourceUrls.length; i++) {
+		String[] resourceUrls = StringUtils.tokenizeToStringArray(resourceUrl, RESOURCE_URL_DELIMITERS);
+		for (String url : resourceUrls) {
+			String path = StringUtils.cleanPath(url);
 			// check whether URL matches allowed resources
-			if (this.allowedResources != null && !this.pathMatcher.match(this.allowedResources, resourceUrls[i])) {
-				throw new ServletException("Resource [" + resourceUrls[i] +
+			if (this.allowedResources != null && !this.pathMatcher.match(this.allowedResources, path)) {
+				throw new ServletException("Resource [" + path +
 						"] does not match allowed pattern [" + this.allowedResources + "]");
 			}
 			if (logger.isDebugEnabled()) {
-				logger.debug("Including resource [" + resourceUrls[i] + "]");
+				logger.debug("Including resource [" + path + "]");
 			}
-			RequestDispatcher rd = request.getRequestDispatcher(resourceUrls[i]);
+			RequestDispatcher rd = request.getRequestDispatcher(path);
 			rd.include(request, response);
 		}
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java
index 39c0cbd8b1..6da2e2afd3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,8 @@
  * request and response.
  *
  * <p>This interface allows for implementations based on session,
- * cookies, etc. The default implementation is FixedThemeResolver,
+ * cookies, etc. The default implementation is
+ * {@link org.springframework.web.servlet.theme.FixedThemeResolver},
  * simply using a configured default theme.
  *
  * <p>Note that this resolver is only responsible for determining the
@@ -33,35 +34,34 @@
  * gets looked up by DispatcherServlet via the respective ThemeSource,
  * i.e. the current WebApplicationContext.
  *
- * <p>Use RequestContext.getTheme() to retrieve the current theme in
- * controllers or views, independent of the actual resolution strategy.
+ * <p>Use {@link org.springframework.web.servlet.support.RequestContext#getTheme()}
+ * to retrieve the current theme in controllers or views, independent
+ * of the actual resolution strategy.
  *
  * @author Jean-Pierre Pawlak
  * @author Juergen Hoeller
  * @since 17.06.2003
- * @see org.springframework.web.servlet.theme.FixedThemeResolver
  * @see org.springframework.ui.context.Theme
  * @see org.springframework.ui.context.ThemeSource
- * @see org.springframework.web.servlet.support.RequestContext#getTheme
  */
 public interface ThemeResolver {
 
-  /**
-   * Resolve the current theme name via the given request.
-   * Should return a default theme as fallback in any case.
-   * @param request request to be used for resolution
-   * @return the current theme name
-   */
+	/**
+	 * Resolve the current theme name via the given request.
+	 * Should return a default theme as fallback in any case.
+	 * @param request request to be used for resolution
+	 * @return the current theme name
+	 */
 	String resolveThemeName(HttpServletRequest request);
 
-  /**
-   * Set the current theme name to the given one.
-   * @param request request to be used for theme name modification
-   * @param response response to be used for theme name modification
-   * @param themeName the new theme name
+	/**
+	 * Set the current theme name to the given one.
+	 * @param request request to be used for theme name modification
+	 * @param response response to be used for theme name modification
+	 * @param themeName the new theme name
 	 * @throws UnsupportedOperationException if the ThemeResolver implementation
 	 * does not support dynamic changing of the theme
-   */
+	 */
 	void setThemeName(HttpServletRequest request, HttpServletResponse response, String themeName);
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
index 7fef39364c..42c4960fbd 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
 import java.util.List;
 import java.util.Properties;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -67,11 +69,10 @@
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 import org.springframework.web.servlet.mvc.method.annotation.ServletWebArgumentResolverAdapter;
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
-import org.w3c.dom.Element;
 
 /**
  * A {@link BeanDefinitionParser} that provides the configuration for the
- * {@code <annotation-driven/>} MVC namespace  element.
+ * {@code <annotation-driven/>} MVC namespace element.
  *
  * <p>This class registers the following {@link HandlerMapping}s:</p>
  * <ul>
@@ -125,9 +126,12 @@
  */
 class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
 
-	private static final boolean jsr303Present = ClassUtils.isPresent(
+	private static final boolean javaxValidationPresent = ClassUtils.isPresent(
 			"javax.validation.Validator", AnnotationDrivenBeanDefinitionParser.class.getClassLoader());
 
+	private static boolean romePresent =
+			ClassUtils.isPresent("com.sun.syndication.feed.WireFeed", AnnotationDrivenBeanDefinitionParser.class.getClassLoader());
+
 	private static final boolean jaxb2Present =
 			ClassUtils.isPresent("javax.xml.bind.Binder", AnnotationDrivenBeanDefinitionParser.class.getClassLoader());
 
@@ -139,8 +143,6 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
 			ClassUtils.isPresent("org.codehaus.jackson.map.ObjectMapper", AnnotationDrivenBeanDefinitionParser.class.getClassLoader()) &&
 					ClassUtils.isPresent("org.codehaus.jackson.JsonGenerator", AnnotationDrivenBeanDefinitionParser.class.getClassLoader());
 
-	private static boolean romePresent =
-			ClassUtils.isPresent("com.sun.syndication.feed.WireFeed", AnnotationDrivenBeanDefinitionParser.class.getClassLoader());
 
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		Object source = parserContext.extractSource(element);
@@ -156,10 +158,16 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 		handlerMappingDef.getPropertyValues().add("order", 0);
 		handlerMappingDef.getPropertyValues().add("contentNegotiationManager", contentNegotiationManager);
 		String methodMappingName = parserContext.getReaderContext().registerWithGeneratedName(handlerMappingDef);
+		if (element.hasAttribute("enableMatrixVariables")) {
+			Boolean enableMatrixVariables = Boolean.valueOf(element.getAttribute("enableMatrixVariables"));
+			handlerMappingDef.getPropertyValues().add("removeSemicolonContent", !enableMatrixVariables);
+		}
+
+		configurePathMatchingProperties(handlerMappingDef, element, parserContext);
 
 		RuntimeBeanReference conversionService = getConversionService(element, source, parserContext);
 		RuntimeBeanReference validator = getValidator(element, source, parserContext);
-		RuntimeBeanReference messageCodesResolver = getMessageCodesResolver(element, source, parserContext);
+		RuntimeBeanReference messageCodesResolver = getMessageCodesResolver(element);
 
 		RootBeanDefinition bindingDef = new RootBeanDefinition(ConfigurableWebBindingInitializer.class);
 		bindingDef.setSource(source);
@@ -169,10 +177,10 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 		bindingDef.getPropertyValues().add("messageCodesResolver", messageCodesResolver);
 
 		ManagedList<?> messageConverters = getMessageConverters(element, source, parserContext);
-		ManagedList<?> argumentResolvers = getArgumentResolvers(element, source, parserContext);
-		ManagedList<?> returnValueHandlers = getReturnValueHandlers(element, source, parserContext);
-		String asyncTimeout = getAsyncTimeout(element, source, parserContext);
-		RuntimeBeanReference asyncExecutor = getAsyncExecutor(element, source, parserContext);
+		ManagedList<?> argumentResolvers = getArgumentResolvers(element, parserContext);
+		ManagedList<?> returnValueHandlers = getReturnValueHandlers(element, parserContext);
+		String asyncTimeout = getAsyncTimeout(element);
+		RuntimeBeanReference asyncExecutor = getAsyncExecutor(element);
 		ManagedList<?> callableInterceptors = getCallableInterceptors(element, source, parserContext);
 		ManagedList<?> deferredResultInterceptors = getDeferredResultInterceptors(element, source, parserContext);
 
@@ -270,8 +278,9 @@ private RuntimeBeanReference getValidator(Element element, Object source, Parser
 		if (element.hasAttribute("validator")) {
 			return new RuntimeBeanReference(element.getAttribute("validator"));
 		}
-		else if (jsr303Present) {
-			RootBeanDefinition validatorDef = new RootBeanDefinition(LocalValidatorFactoryBean.class);
+		else if (javaxValidationPresent) {
+			RootBeanDefinition validatorDef = new RootBeanDefinition(
+					"org.springframework.validation.beanvalidation.LocalValidatorFactoryBean");
 			validatorDef.setSource(source);
 			validatorDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 			String validatorName = parserContext.getReaderContext().registerWithGeneratedName(validatorDef);
@@ -302,35 +311,70 @@ private RuntimeBeanReference getContentNegotiationManager(Element element, Objec
 		return contentNegotiationManagerRef;
 	}
 
+	private void configurePathMatchingProperties(RootBeanDefinition handlerMappingDef, Element element,
+			ParserContext parserContext) {
+
+		Element pathMatchingElement = DomUtils.getChildElementByTagName(element, "path-matching");
+		if (pathMatchingElement != null) {
+			Object source = parserContext.extractSource(element);
+			if (pathMatchingElement.hasAttribute("suffix-pattern")) {
+				Boolean useSuffixPatternMatch = Boolean.valueOf(pathMatchingElement.getAttribute("suffix-pattern"));
+				handlerMappingDef.getPropertyValues().add("useSuffixPatternMatch", useSuffixPatternMatch);
+			}
+			if (pathMatchingElement.hasAttribute("trailing-slash")) {
+				Boolean useTrailingSlashMatch = Boolean.valueOf(pathMatchingElement.getAttribute("trailing-slash"));
+				handlerMappingDef.getPropertyValues().add("useTrailingSlashMatch", useTrailingSlashMatch);
+			}
+			if (pathMatchingElement.hasAttribute("registered-suffixes-only")) {
+				Boolean useRegisteredSuffixPatternMatch = Boolean.valueOf(pathMatchingElement.getAttribute("registered-suffixes-only"));
+				handlerMappingDef.getPropertyValues().add("useRegisteredSuffixPatternMatch", useRegisteredSuffixPatternMatch);
+			}
+			RuntimeBeanReference pathHelperRef = null;
+			if (pathMatchingElement.hasAttribute("path-helper")) {
+				pathHelperRef = new RuntimeBeanReference(pathMatchingElement.getAttribute("path-helper"));
+			}
+			pathHelperRef = MvcNamespaceUtils.registerUrlPathHelper(pathHelperRef, parserContext, source);
+			handlerMappingDef.getPropertyValues().add("urlPathHelper", pathHelperRef);
+
+			RuntimeBeanReference pathMatcherRef = null;
+			if (pathMatchingElement.hasAttribute("path-matcher")) {
+				pathMatcherRef = new RuntimeBeanReference(pathMatchingElement.getAttribute("path-matcher"));
+			}
+			pathMatcherRef = MvcNamespaceUtils.registerPathMatcher(pathMatcherRef, parserContext, source);
+			handlerMappingDef.getPropertyValues().add("pathMatcher", pathMatcherRef);
+		}
+	}
+
 	private Properties getDefaultMediaTypes() {
 		Properties props = new Properties();
 		if (romePresent) {
 			props.put("atom", MediaType.APPLICATION_ATOM_XML_VALUE);
 			props.put("rss", "application/rss+xml");
 		}
-		if (jackson2Present || jacksonPresent) {
-			props.put("json", MediaType.APPLICATION_JSON_VALUE);
-		}
 		if (jaxb2Present) {
 			props.put("xml", MediaType.APPLICATION_XML_VALUE);
 		}
+		if (jackson2Present || jacksonPresent) {
+			props.put("json", MediaType.APPLICATION_JSON_VALUE);
+		}
 		return props;
 	}
 
-	private RuntimeBeanReference getMessageCodesResolver(Element element, Object source, ParserContext parserContext) {
+	private RuntimeBeanReference getMessageCodesResolver(Element element) {
 		if (element.hasAttribute("message-codes-resolver")) {
 			return new RuntimeBeanReference(element.getAttribute("message-codes-resolver"));
-		} else {
+		}
+		else {
 			return null;
 		}
 	}
 
-	private String getAsyncTimeout(Element element, Object source, ParserContext parserContext) {
+	private String getAsyncTimeout(Element element) {
 		Element asyncElement = DomUtils.getChildElementByTagName(element, "async-support");
 		return (asyncElement != null) ? asyncElement.getAttribute("default-timeout") : null;
 	}
 
-	private RuntimeBeanReference getAsyncExecutor(Element element, Object source, ParserContext parserContext) {
+	private RuntimeBeanReference getAsyncExecutor(Element element) {
 		Element asyncElement = DomUtils.getChildElementByTagName(element, "async-support");
 		if (asyncElement != null) {
 			if (asyncElement.hasAttribute("task-executor")) {
@@ -374,16 +418,16 @@ private ManagedList<?> getDeferredResultInterceptors(Element element, Object sou
 		return interceptors;
 	}
 
-	private ManagedList<?> getArgumentResolvers(Element element, Object source, ParserContext parserContext) {
+	private ManagedList<?> getArgumentResolvers(Element element, ParserContext parserContext) {
 		Element resolversElement = DomUtils.getChildElementByTagName(element, "argument-resolvers");
 		if (resolversElement != null) {
 			ManagedList<BeanDefinitionHolder> argumentResolvers = extractBeanSubElements(resolversElement, parserContext);
-			return wrapWebArgumentResolverBeanDefs(argumentResolvers);
+			return wrapWebArgumentResolverBeanDefs(argumentResolvers, parserContext);
 		}
 		return null;
 	}
 
-	private ManagedList<?> getReturnValueHandlers(Element element, Object source, ParserContext parserContext) {
+	private ManagedList<?> getReturnValueHandlers(Element element, ParserContext parserContext) {
 		Element handlersElement = DomUtils.getChildElementByTagName(element, "return-value-handlers");
 		if (handlersElement != null) {
 			return extractBeanSubElements(handlersElement, parserContext);
@@ -396,7 +440,7 @@ private ManagedList<?> getMessageConverters(Element element, Object source, Pars
 		ManagedList<? super Object> messageConverters = new ManagedList<Object>();
 		if (convertersElement != null) {
 			messageConverters.setSource(source);
-			for (Element beanElement : DomUtils.getChildElementsByTagName(convertersElement, new String[] { "bean", "ref" })) {
+			for (Element beanElement : DomUtils.getChildElementsByTagName(convertersElement, "bean", "ref")) {
 				Object object = parserContext.getDelegate().parsePropertySubElement(beanElement, null);
 				messageConverters.add(object);
 			}
@@ -404,40 +448,37 @@ private ManagedList<?> getMessageConverters(Element element, Object source, Pars
 
 		if (convertersElement == null || Boolean.valueOf(convertersElement.getAttribute("register-defaults"))) {
 			messageConverters.setSource(source);
-			messageConverters.add(createConverterBeanDefinition(ByteArrayHttpMessageConverter.class, source));
+			messageConverters.add(createConverterDefinition(ByteArrayHttpMessageConverter.class, source));
 
-			RootBeanDefinition stringConverterDef = createConverterBeanDefinition(StringHttpMessageConverter.class, source);
+			RootBeanDefinition stringConverterDef = createConverterDefinition(StringHttpMessageConverter.class, source);
 			stringConverterDef.getPropertyValues().add("writeAcceptCharset", false);
 			messageConverters.add(stringConverterDef);
 
-			messageConverters.add(createConverterBeanDefinition(ResourceHttpMessageConverter.class, source));
-			messageConverters.add(createConverterBeanDefinition(SourceHttpMessageConverter.class, source));
-			messageConverters.add(createConverterBeanDefinition(AllEncompassingFormHttpMessageConverter.class, source));
+			messageConverters.add(createConverterDefinition(ResourceHttpMessageConverter.class, source));
+			messageConverters.add(createConverterDefinition(SourceHttpMessageConverter.class, source));
+			messageConverters.add(createConverterDefinition(AllEncompassingFormHttpMessageConverter.class, source));
+
 			if (romePresent) {
-				messageConverters.add(createConverterBeanDefinition(AtomFeedHttpMessageConverter.class, source));
-				messageConverters.add(createConverterBeanDefinition(RssChannelHttpMessageConverter.class, source));
+				messageConverters.add(createConverterDefinition(AtomFeedHttpMessageConverter.class, source));
+				messageConverters.add(createConverterDefinition(RssChannelHttpMessageConverter.class, source));
 			}
 			if (jaxb2Present) {
-				messageConverters
-						.add(createConverterBeanDefinition(Jaxb2RootElementHttpMessageConverter.class, source));
+				messageConverters.add(createConverterDefinition(Jaxb2RootElementHttpMessageConverter.class, source));
 			}
 			if (jackson2Present) {
-				messageConverters.add(createConverterBeanDefinition(MappingJackson2HttpMessageConverter.class, source));
+				messageConverters.add(createConverterDefinition(MappingJackson2HttpMessageConverter.class, source));
 			}
 			else if (jacksonPresent) {
-				messageConverters.add(createConverterBeanDefinition(MappingJacksonHttpMessageConverter.class, source));
+				messageConverters.add(createConverterDefinition(MappingJacksonHttpMessageConverter.class, source));
 			}
 		}
 		return messageConverters;
 	}
 
-	private RootBeanDefinition createConverterBeanDefinition(
-			Class<? extends HttpMessageConverter> converterClass, Object source) {
-
+	private RootBeanDefinition createConverterDefinition(Class<? extends HttpMessageConverter> converterClass, Object source) {
 		RootBeanDefinition beanDefinition = new RootBeanDefinition(converterClass);
 		beanDefinition.setSource(source);
 		beanDefinition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-
 		return beanDefinition;
 	}
 
@@ -452,22 +493,22 @@ private ManagedList<BeanDefinitionHolder> extractBeanSubElements(Element parentE
 		return list;
 	}
 
-	private ManagedList<BeanDefinitionHolder> wrapWebArgumentResolverBeanDefs(List<BeanDefinitionHolder> beanDefs) {
-		ManagedList<BeanDefinitionHolder> result = new ManagedList<BeanDefinitionHolder>();
+	private ManagedList<BeanDefinitionHolder> wrapWebArgumentResolverBeanDefs(
+			List<BeanDefinitionHolder> beanDefs, ParserContext parserContext) {
 
+		ManagedList<BeanDefinitionHolder> result = new ManagedList<BeanDefinitionHolder>();
 		for (BeanDefinitionHolder beanDef : beanDefs) {
 			String className = beanDef.getBeanDefinition().getBeanClassName();
-			Class<?> clazz = ClassUtils.resolveClassName(className, ClassUtils.getDefaultClassLoader());
-
+			Class<?> clazz = ClassUtils.resolveClassName(className, parserContext.getReaderContext().getBeanClassLoader());
 			if (WebArgumentResolver.class.isAssignableFrom(clazz)) {
 				RootBeanDefinition adapter = new RootBeanDefinition(ServletWebArgumentResolverAdapter.class);
 				adapter.getConstructorArgumentValues().addIndexedArgumentValue(0, beanDef);
 				result.add(new BeanDefinitionHolder(adapter, beanDef.getBeanName() + "Adapter"));
-			} else {
+			}
+			else {
 				result.add(beanDef);
 			}
 		}
-
 		return result;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java
index 167963844d..ecad94de5d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 
 import java.util.List;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
@@ -27,11 +29,10 @@
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.util.xml.DomUtils;
 import org.springframework.web.servlet.handler.MappedInterceptor;
-import org.w3c.dom.Element;
 
 /**
- * {@link org.springframework.beans.factory.xml.BeanDefinitionParser} that parses a {@code interceptors} element to register
- * a set of {@link MappedInterceptor} definitions.
+ * {@link org.springframework.beans.factory.xml.BeanDefinitionParser} that parses a
+ * {@code interceptors} element to register a set of {@link MappedInterceptor} definitions.
  *
  * @author Keith Donald
  * @since 3.0
@@ -42,7 +43,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 		CompositeComponentDefinition compDefinition = new CompositeComponentDefinition(element.getTagName(), parserContext.extractSource(element));
 		parserContext.pushContainingComponent(compDefinition);
 
-		List<Element> interceptors = DomUtils.getChildElementsByTagName(element, new String[] { "bean", "ref", "interceptor" });
+		List<Element> interceptors = DomUtils.getChildElementsByTagName(element, "bean", "ref", "interceptor");
 		for (Element interceptor : interceptors) {
 			RootBeanDefinition mappedInterceptorDef = new RootBeanDefinition(MappedInterceptor.class);
 			mappedInterceptorDef.setSource(parserContext.extractSource(interceptor));
@@ -54,7 +55,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 			if ("interceptor".equals(interceptor.getLocalName())) {
 				includePatterns = getIncludePatterns(interceptor, "mapping");
 				excludePatterns = getIncludePatterns(interceptor, "exclude-mapping");
-				Element beanElem = DomUtils.getChildElementsByTagName(interceptor, new String[] { "bean", "ref"}).get(0);
+				Element beanElem = DomUtils.getChildElementsByTagName(interceptor, "bean", "ref").get(0);
 				interceptorBean = parserContext.getDelegate().parsePropertySubElement(beanElem, null);
 			}
 			else {
@@ -75,8 +76,8 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 	private ManagedList<String> getIncludePatterns(Element interceptor, String elementName) {
 		List<Element> paths = DomUtils.getChildElementsByTagName(interceptor, elementName);
 		ManagedList<String> patterns = new ManagedList<String>(paths.size());
-		for (int i = 0; i < paths.size(); i++) {
-			patterns.add(paths.get(i).getAttribute("path"));
+		for (Element path : paths) {
+			patterns.add(path.getAttribute("path"));
 		}
 		return patterns;
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java
index abf53b4e2c..4ce612ff79 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,16 @@
 package org.springframework.web.servlet.config;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.util.PathMatcher;
 import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping;
 import org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter;
 import org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter;
+import org.springframework.web.util.UrlPathHelper;
 
 /**
  * Convenience methods for use in MVC namespace BeanDefinitionParsers.
@@ -41,12 +45,70 @@ abstract class MvcNamespaceUtils {
 	private static final String HTTP_REQUEST_HANDLER_ADAPTER_BEAN_NAME =
 			HttpRequestHandlerAdapter.class.getName();
 
+	private static final String URL_PATH_HELPER_BEAN_NAME = "mvcUrlPathHelper";
+
+	private static final String PATH_MATCHER_BEAN_NAME = "mvcPathMatcher";
+
+
 	public static void registerDefaultComponents(ParserContext parserContext, Object source) {
 		registerBeanNameUrlHandlerMapping(parserContext, source);
 		registerHttpRequestHandlerAdapter(parserContext, source);
 		registerSimpleControllerHandlerAdapter(parserContext, source);
 	}
 
+
+	/**
+	 * Adds an alias to an existing well-known name or registers a new instance of a {@link UrlPathHelper}
+	 * under that well-known name, unless already registered.
+	 * @return a RuntimeBeanReference to this {@link UrlPathHelper} instance
+	 * @since 3.2.17
+	 */
+	public static RuntimeBeanReference registerUrlPathHelper(RuntimeBeanReference urlPathHelperRef,
+			ParserContext parserContext, Object source) {
+
+		if (urlPathHelperRef != null) {
+			if (parserContext.getRegistry().isAlias(URL_PATH_HELPER_BEAN_NAME)) {
+				parserContext.getRegistry().removeAlias(URL_PATH_HELPER_BEAN_NAME);
+			}
+			parserContext.getRegistry().registerAlias(urlPathHelperRef.getBeanName(), URL_PATH_HELPER_BEAN_NAME);
+		}
+		else if (!parserContext.getRegistry().isAlias(URL_PATH_HELPER_BEAN_NAME)
+				&& !parserContext.getRegistry().containsBeanDefinition(URL_PATH_HELPER_BEAN_NAME)) {
+			RootBeanDefinition urlPathHelperDef = new RootBeanDefinition(UrlPathHelper.class);
+			urlPathHelperDef.setSource(source);
+			urlPathHelperDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+			parserContext.getRegistry().registerBeanDefinition(URL_PATH_HELPER_BEAN_NAME, urlPathHelperDef);
+			parserContext.registerComponent(new BeanComponentDefinition(urlPathHelperDef, URL_PATH_HELPER_BEAN_NAME));
+		}
+		return new RuntimeBeanReference(URL_PATH_HELPER_BEAN_NAME);
+	}
+
+	/**
+	 * Adds an alias to an existing well-known name or registers a new instance of a {@link PathMatcher}
+	 * under that well-known name, unless already registered.
+	 * @return a RuntimeBeanReference to this {@link PathMatcher} instance
+	 * @since 3.2.17
+	 */
+	public static RuntimeBeanReference registerPathMatcher(RuntimeBeanReference pathMatcherRef,
+			ParserContext parserContext, Object source) {
+
+		if (pathMatcherRef != null) {
+			if (parserContext.getRegistry().isAlias(PATH_MATCHER_BEAN_NAME)) {
+				parserContext.getRegistry().removeAlias(PATH_MATCHER_BEAN_NAME);
+			}
+			parserContext.getRegistry().registerAlias(pathMatcherRef.getBeanName(), PATH_MATCHER_BEAN_NAME);
+		}
+		else if (!parserContext.getRegistry().isAlias(PATH_MATCHER_BEAN_NAME)
+				&& !parserContext.getRegistry().containsBeanDefinition(PATH_MATCHER_BEAN_NAME)) {
+			RootBeanDefinition pathMatcherDef = new RootBeanDefinition(AntPathMatcher.class);
+			pathMatcherDef.setSource(source);
+			pathMatcherDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+			parserContext.getRegistry().registerBeanDefinition(PATH_MATCHER_BEAN_NAME, pathMatcherDef);
+			parserContext.registerComponent(new BeanComponentDefinition(pathMatcherDef, PATH_MATCHER_BEAN_NAME));
+		}
+		return new RuntimeBeanReference(PATH_MATCHER_BEAN_NAME);
+	}
+
 	/**
 	 * Registers  an {@link HttpRequestHandlerAdapter} under a well-known
 	 * name unless already registered.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java
index 6bfdb9c56f..18e81969a0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.ManagedMap;
@@ -62,10 +63,15 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 		}
 		urlMap.put(resourceRequestPath, resourceHandlerName);
 
+		RuntimeBeanReference pathMatcherRef = MvcNamespaceUtils.registerPathMatcher(null, parserContext, source);
+		RuntimeBeanReference pathHelperRef = MvcNamespaceUtils.registerUrlPathHelper(null, parserContext, source);
+
 		RootBeanDefinition handlerMappingDef = new RootBeanDefinition(SimpleUrlHandlerMapping.class);
 		handlerMappingDef.setSource(source);
 		handlerMappingDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 		handlerMappingDef.getPropertyValues().add("urlMap", urlMap);
+		handlerMappingDef.getPropertyValues().add("pathMatcher", pathMatcherRef);
+		handlerMappingDef.getPropertyValues().add("urlPathHelper", pathHelperRef);
 
 		String order = element.getAttribute("order");
 		// use a default of near-lowest precedence, still allowing for even lower precedence in other mappings
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
index e580aea38b..3d077a7102 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,6 +76,10 @@ private BeanDefinition registerHandlerMapping(ParserContext parserContext, Objec
 			RootBeanDefinition handlerMappingDef = new RootBeanDefinition(SimpleUrlHandlerMapping.class);
 			handlerMappingDef.setSource(source);
 			handlerMappingDef.getPropertyValues().add("order", "1");
+			handlerMappingDef.getPropertyValues().add("pathMatcher",
+					MvcNamespaceUtils.registerPathMatcher(null, parserContext, source));
+			handlerMappingDef.getPropertyValues().add("urlPathHelper",
+					MvcNamespaceUtils.registerUrlPathHelper(null, parserContext, source));
 			handlerMappingDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 			parserContext.getRegistry().registerBeanDefinition(HANDLER_MAPPING_BEAN_NAME, handlerMappingDef);
 			parserContext.registerComponent(new BeanComponentDefinition(handlerMappingDef, HANDLER_MAPPING_BEAN_NAME));
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java
index d9d58035b1..46d4a1842f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@ public class DelegatingWebMvcConfiguration extends WebMvcConfigurationSupport {
 
 	private final WebMvcConfigurerComposite configurers = new WebMvcConfigurerComposite();
 
+
 	@Autowired(required = false)
 	public void setConfigurers(List<WebMvcConfigurer> configurers) {
 		if (configurers == null || configurers.isEmpty()) {
@@ -50,6 +51,7 @@ public void setConfigurers(List<WebMvcConfigurer> configurers) {
 		this.configurers.addWebMvcConfigurers(configurers);
 	}
 
+
 	@Override
 	protected void addInterceptors(InterceptorRegistry registry) {
 		this.configurers.addInterceptors(registry);
@@ -65,6 +67,11 @@ public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
 		this.configurers.configureAsyncSupport(configurer);
 	}
 
+	@Override
+	public void configurePathMatch(PathMatchConfigurer configurer) {
+		this.configurers.configurePathMatch(configurer);
+	}
+
 	@Override
 	protected void addViewControllers(ViewControllerRegistry registry) {
 		this.configurers.addViewControllers(registry);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java
new file mode 100644
index 0000000000..54e1160d92
--- /dev/null
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.servlet.config.annotation;
+
+import org.springframework.util.PathMatcher;
+import org.springframework.web.util.UrlPathHelper;
+
+/**
+ * Helps with configuring HandlerMappings path matching options such as trailing
+ * slash match, suffix registration, path matcher and path helper.
+ *
+ * <p>Configured path matcher and path helper instances are shared for:
+ * <ul>
+ * <li>RequestMappings</li>
+ * <li>ViewControllerMappings</li>
+ * <li>ResourcesMappings</li>
+ * </ul>
+ *
+ * @author Brian Clozel
+ * @since 3.2.17
+ * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping
+ * @see org.springframework.web.servlet.handler.SimpleUrlHandlerMapping
+ */
+public class PathMatchConfigurer {
+
+	private Boolean suffixPatternMatch;
+
+	private Boolean trailingSlashMatch;
+
+	private Boolean registeredSuffixPatternMatch;
+
+	private UrlPathHelper urlPathHelper;
+
+	private PathMatcher pathMatcher;
+
+
+	/**
+	 * Whether to use suffix pattern match (".*") when matching patterns to
+	 * requests. If enabled a method mapped to "/users" also matches to "/users.*".
+	 * <p>By default this is set to {@code true}.
+	 * @see #registeredSuffixPatternMatch
+	 */
+	public PathMatchConfigurer setUseSuffixPatternMatch(Boolean suffixPatternMatch) {
+		this.suffixPatternMatch = suffixPatternMatch;
+		return this;
+	}
+
+	/**
+	 * Whether to match to URLs irrespective of the presence of a trailing slash.
+	 * If enabled a method mapped to "/users" also matches to "/users/".
+	 * <p>The default value is {@code true}.
+	 */
+	public PathMatchConfigurer setUseTrailingSlashMatch(Boolean trailingSlashMatch) {
+		this.trailingSlashMatch = trailingSlashMatch;
+		return this;
+	}
+
+	/**
+	 * Whether suffix pattern matching should work only against path extensions
+	 * explicitly registered when you
+	 * {@link WebMvcConfigurer#configureContentNegotiation configure content
+	 * negotiation}. This is generally recommended to reduce ambiguity and to
+	 * avoid issues such as when a "." appears in the path for other reasons.
+	 * <p>By default this is set to "false".
+	 * @see WebMvcConfigurer#configureContentNegotiation
+	 */
+	public PathMatchConfigurer setUseRegisteredSuffixPatternMatch(
+			Boolean registeredSuffixPatternMatch) {
+
+		this.registeredSuffixPatternMatch = registeredSuffixPatternMatch;
+		return this;
+	}
+
+	/**
+	 * Set the UrlPathHelper to use for resolution of lookup paths.
+	 * <p>Use this to override the default UrlPathHelper with a custom subclass,
+	 * or to share common UrlPathHelper settings across multiple HandlerMappings
+	 * and MethodNameResolvers.
+	 */
+	public PathMatchConfigurer setUrlPathHelper(UrlPathHelper urlPathHelper) {
+		this.urlPathHelper = urlPathHelper;
+		return this;
+	}
+
+	/**
+	 * Set the PathMatcher implementation to use for matching URL paths
+	 * against registered URL patterns. Default is AntPathMatcher.
+	 * @see org.springframework.util.AntPathMatcher
+	 */
+	public PathMatchConfigurer setPathMatcher(PathMatcher pathMatcher) {
+		this.pathMatcher = pathMatcher;
+		return this;
+	}
+
+	public Boolean isUseSuffixPatternMatch() {
+		return this.suffixPatternMatch;
+	}
+
+	public Boolean isUseTrailingSlashMatch() {
+		return this.trailingSlashMatch;
+	}
+
+	public Boolean isUseRegisteredSuffixPatternMatch() {
+		return this.registeredSuffixPatternMatch;
+	}
+
+	public UrlPathHelper getUrlPathHelper() {
+		return this.urlPathHelper;
+	}
+
+	public PathMatcher getPathMatcher() {
+		return this.pathMatcher;
+	}
+
+}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
index c3d1fc0883..67427c3ae7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,11 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.transform.Source;
 
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -49,11 +47,12 @@
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter;
 import org.springframework.http.converter.xml.SourceHttpMessageConverter;
+import org.springframework.util.AntPathMatcher;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.PathMatcher;
 import org.springframework.validation.Errors;
 import org.springframework.validation.MessageCodesResolver;
 import org.springframework.validation.Validator;
-import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 import org.springframework.web.HttpRequestHandler;
 import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.bind.WebDataBinder;
@@ -78,6 +77,7 @@
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
+import org.springframework.web.util.UrlPathHelper;
 
 /**
  * This is the main class providing the configuration behind the MVC Java config.
@@ -90,60 +90,62 @@
  *
  * <p>This class registers the following {@link HandlerMapping}s:</p>
  * <ul>
- * 	<li>{@link RequestMappingHandlerMapping}
- * 	ordered at 0 for mapping requests to annotated controller methods.
- * 	<li>{@link HandlerMapping}
- * 	ordered at 1 to map URL paths directly to view names.
- * 	<li>{@link BeanNameUrlHandlerMapping}
- * 	ordered at 2 to map URL paths to controller bean names.
- * 	<li>{@link HandlerMapping}
- * 	ordered at {@code Integer.MAX_VALUE-1} to serve static resource requests.
- * 	<li>{@link HandlerMapping}
- * 	ordered at {@code Integer.MAX_VALUE} to forward requests to the default servlet.
+ * <li>{@link RequestMappingHandlerMapping}
+ * ordered at 0 for mapping requests to annotated controller methods.
+ * <li>{@link HandlerMapping}
+ * ordered at 1 to map URL paths directly to view names.
+ * <li>{@link BeanNameUrlHandlerMapping}
+ * ordered at 2 to map URL paths to controller bean names.
+ * <li>{@link HandlerMapping}
+ * ordered at {@code Integer.MAX_VALUE-1} to serve static resource requests.
+ * <li>{@link HandlerMapping}
+ * ordered at {@code Integer.MAX_VALUE} to forward requests to the default servlet.
  * </ul>
  *
  * <p>Registers these {@link HandlerAdapter}s:
  * <ul>
- * 	<li>{@link RequestMappingHandlerAdapter}
- * 	for processing requests with annotated controller methods.
- * 	<li>{@link HttpRequestHandlerAdapter}
- * 	for processing requests with {@link HttpRequestHandler}s.
- * 	<li>{@link SimpleControllerHandlerAdapter}
- * 	for processing requests with interface-based {@link Controller}s.
+ * <li>{@link RequestMappingHandlerAdapter}
+ * for processing requests with annotated controller methods.
+ * <li>{@link HttpRequestHandlerAdapter}
+ * for processing requests with {@link HttpRequestHandler}s.
+ * <li>{@link SimpleControllerHandlerAdapter}
+ * for processing requests with interface-based {@link Controller}s.
  * </ul>
  *
  * <p>Registers a {@link HandlerExceptionResolverComposite} with this chain of
  * exception resolvers:
  * <ul>
- * 	<li>{@link ExceptionHandlerExceptionResolver} for handling exceptions
- * 	through @{@link ExceptionHandler} methods.
- * 	<li>{@link ResponseStatusExceptionResolver} for exceptions annotated
- * 	with @{@link ResponseStatus}.
- * 	<li>{@link DefaultHandlerExceptionResolver} for resolving known Spring
- * 	exception types
+ * <li>{@link ExceptionHandlerExceptionResolver} for handling exceptions
+ * through @{@link ExceptionHandler} methods.
+ * <li>{@link ResponseStatusExceptionResolver} for exceptions annotated
+ * with @{@link ResponseStatus}.
+ * <li>{@link DefaultHandlerExceptionResolver} for resolving known Spring
+ * exception types
  * </ul>
  *
  * <p>Both the {@link RequestMappingHandlerAdapter} and the
  * {@link ExceptionHandlerExceptionResolver} are configured with default
  * instances of the following by default:
  * <ul>
- * 	<li>A {@link ContentNegotiationManager}
- * 	<li>A {@link DefaultFormattingConversionService}
- * 	<li>A {@link LocalValidatorFactoryBean} if a JSR-303 implementation is
- * 	available on the classpath
- * 	<li>A range of {@link HttpMessageConverter}s depending on the 3rd party
- * 	libraries available on the classpath.
+ * <li>a {@link ContentNegotiationManager}
+ * <li>a {@link DefaultFormattingConversionService}
+ * <li>a {@link org.springframework.validation.beanvalidation.LocalValidatorFactoryBean}
+ * if a JSR-303 implementation is available on the classpath
+ * <li>a range of {@link HttpMessageConverter}s depending on the third-party
+ * libraries available on the classpath.
  * </ul>
  *
+ * @author Rossen Stoyanchev
+ * @since 3.1
  * @see EnableWebMvc
  * @see WebMvcConfigurer
  * @see WebMvcConfigurerAdapter
- *
- * @author Rossen Stoyanchev
- * @since 3.1
  */
 public class WebMvcConfigurationSupport implements ApplicationContextAware, ServletContextAware {
 
+	private static boolean romePresent =
+			ClassUtils.isPresent("com.sun.syndication.feed.WireFeed", WebMvcConfigurationSupport.class.getClassLoader());
+
 	private static final boolean jaxb2Present =
 			ClassUtils.isPresent("javax.xml.bind.Binder", WebMvcConfigurationSupport.class.getClassLoader());
 
@@ -155,20 +157,27 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
 			ClassUtils.isPresent("org.codehaus.jackson.map.ObjectMapper", WebMvcConfigurationSupport.class.getClassLoader()) &&
 					ClassUtils.isPresent("org.codehaus.jackson.JsonGenerator", WebMvcConfigurationSupport.class.getClassLoader());
 
-	private static boolean romePresent =
-			ClassUtils.isPresent("com.sun.syndication.feed.WireFeed", WebMvcConfigurationSupport.class.getClassLoader());
-
-	private ServletContext servletContext;
 
 	private ApplicationContext applicationContext;
 
+	private ServletContext servletContext;
+
 	private List<Object> interceptors;
 
+	private PathMatchConfigurer pathMatchConfigurer;
+
 	private ContentNegotiationManager contentNegotiationManager;
 
 	private List<HttpMessageConverter<?>> messageConverters;
 
 
+	/**
+	 * Set the Spring {@link ApplicationContext}, e.g. for resource loading.
+	 */
+	public void setApplicationContext(ApplicationContext applicationContext) {
+		this.applicationContext = applicationContext;
+	}
+
 	/**
 	 * Set the {@link javax.servlet.ServletContext}, e.g. for resource handling,
 	 * looking up file extensions, etc.
@@ -177,12 +186,6 @@ public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
 
-	/**
-	 * Set the Spring {@link ApplicationContext}, e.g. for resource loading.
-	 */
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		this.applicationContext = applicationContext;
-	}
 
 	/**
 	 * Return a {@link RequestMappingHandlerMapping} ordered at 0 for mapping
@@ -194,6 +197,26 @@ public RequestMappingHandlerMapping requestMappingHandlerMapping() {
 		handlerMapping.setOrder(0);
 		handlerMapping.setInterceptors(getInterceptors());
 		handlerMapping.setContentNegotiationManager(mvcContentNegotiationManager());
+
+		PathMatchConfigurer configurer = getPathMatchConfigurer();
+		if (configurer.isUseSuffixPatternMatch() != null) {
+			handlerMapping.setUseSuffixPatternMatch(configurer.isUseSuffixPatternMatch());
+		}
+		if (configurer.isUseRegisteredSuffixPatternMatch() != null) {
+			handlerMapping.setUseRegisteredSuffixPatternMatch(configurer.isUseRegisteredSuffixPatternMatch());
+		}
+		if (configurer.isUseTrailingSlashMatch() != null) {
+			handlerMapping.setUseTrailingSlashMatch(configurer.isUseTrailingSlashMatch());
+		}
+		UrlPathHelper pathHelper = configurer.getUrlPathHelper();
+		if (pathHelper != null) {
+			handlerMapping.setUrlPathHelper(pathHelper);
+		}
+		PathMatcher pathMatcher = configurer.getPathMatcher();
+		if (pathMatcher != null) {
+			handlerMapping.setPathMatcher(pathMatcher);
+		}
+
 		return handlerMapping;
 	}
 
@@ -203,13 +226,13 @@ public RequestMappingHandlerMapping requestMappingHandlerMapping() {
 	 * use {@link #addInterceptors(InterceptorRegistry)} instead.
 	 */
 	protected final Object[] getInterceptors() {
-		if (interceptors == null) {
+		if (this.interceptors == null) {
 			InterceptorRegistry registry = new InterceptorRegistry();
 			addInterceptors(registry);
 			registry.addInterceptor(new ConversionServiceExposingInterceptor(mvcConversionService()));
-			interceptors = registry.getInterceptors();
+			this.interceptors = registry.getInterceptors();
 		}
-		return interceptors.toArray();
+		return this.interceptors.toArray();
 	}
 
 	/**
@@ -220,6 +243,53 @@ protected final Object[] getInterceptors() {
 	protected void addInterceptors(InterceptorRegistry registry) {
 	}
 
+	/**
+	 * Callback for building the {@link PathMatchConfigurer}.
+	 * Delegates to {@link #configurePathMatch}.
+	 * @since 3.2.17
+	 */
+	protected PathMatchConfigurer getPathMatchConfigurer() {
+		if (this.pathMatchConfigurer == null) {
+			this.pathMatchConfigurer = new PathMatchConfigurer();
+			configurePathMatch(this.pathMatchConfigurer);
+		}
+		return this.pathMatchConfigurer;
+	}
+
+	/**
+	 * Override this method to configure path matching options.
+	 * @see PathMatchConfigurer
+	 * @since 3.2.17
+	 */
+	public void configurePathMatch(PathMatchConfigurer configurer) {
+	}
+
+	/**
+	 * Return a global {@link PathMatcher} instance for path matching
+	 * patterns in {@link HandlerMapping}s.
+	 * This instance can be configured using the {@link PathMatchConfigurer}
+	 * in {@link #configurePathMatch(PathMatchConfigurer)}.
+	 * @since 3.2.17
+	 */
+	@Bean
+	public PathMatcher mvcPathMatcher() {
+		PathMatcher pathMatcher = getPathMatchConfigurer().getPathMatcher();
+		return (pathMatcher != null ? pathMatcher : new AntPathMatcher());
+	}
+
+	/**
+	 * Return a global {@link UrlPathHelper} instance for path matching
+	 * patterns in {@link HandlerMapping}s.
+	 * This instance can be configured using the {@link PathMatchConfigurer}
+	 * in {@link #configurePathMatch(PathMatchConfigurer)}.
+	 * @since 3.2.17
+	 */
+	@Bean
+	public UrlPathHelper mvcUrlPathHelper() {
+		UrlPathHelper pathHelper = getPathMatchConfigurer().getUrlPathHelper();
+		return (pathHelper != null ? pathHelper : new UrlPathHelper());
+	}
+
 	/**
 	 * Return a {@link ContentNegotiationManager} instance to use to determine
 	 * requested {@linkplain MediaType media types} in a given request.
@@ -233,25 +303,25 @@ public ContentNegotiationManager mvcContentNegotiationManager() {
 			try {
 				this.contentNegotiationManager = configurer.getContentNegotiationManager();
 			}
-			catch (Exception e) {
-				throw new BeanInitializationException("Could not create ContentNegotiationManager", e);
+			catch (Exception ex) {
+				throw new BeanInitializationException("Could not create ContentNegotiationManager", ex);
 			}
 		}
 		return this.contentNegotiationManager;
 	}
 
 	protected Map<String, MediaType> getDefaultMediaTypes() {
-		Map<String, MediaType> map = new HashMap<String, MediaType>();
+		Map<String, MediaType> map = new HashMap<String, MediaType>(4);
 		if (romePresent) {
 			map.put("atom", MediaType.APPLICATION_ATOM_XML);
 			map.put("rss", MediaType.valueOf("application/rss+xml"));
 		}
-		if (jackson2Present || jacksonPresent) {
-			map.put("json", MediaType.APPLICATION_JSON);
-		}
 		if (jaxb2Present) {
 			map.put("xml", MediaType.APPLICATION_XML);
 		}
+		if (jackson2Present || jacksonPresent) {
+			map.put("json", MediaType.APPLICATION_JSON);
+		}
 		return map;
 	}
 
@@ -273,8 +343,10 @@ public HandlerMapping viewControllerHandlerMapping() {
 		addViewControllers(registry);
 
 		AbstractHandlerMapping handlerMapping = registry.getHandlerMapping();
-		handlerMapping = handlerMapping != null ? handlerMapping : new EmptyHandlerMapping();
+		handlerMapping = (handlerMapping != null ? handlerMapping : new EmptyHandlerMapping());
 		handlerMapping.setInterceptors(getInterceptors());
+		handlerMapping.setPathMatcher(mvcPathMatcher());
+		handlerMapping.setUrlPathHelper(mvcUrlPathHelper());
 		return handlerMapping;
 	}
 
@@ -304,10 +376,17 @@ public BeanNameUrlHandlerMapping beanNameHandlerMapping() {
 	 */
 	@Bean
 	public HandlerMapping resourceHandlerMapping() {
-		ResourceHandlerRegistry registry = new ResourceHandlerRegistry(applicationContext, servletContext);
+		ResourceHandlerRegistry registry = new ResourceHandlerRegistry(this.applicationContext, this.servletContext);
 		addResourceHandlers(registry);
+
 		AbstractHandlerMapping handlerMapping = registry.getHandlerMapping();
-		handlerMapping = handlerMapping != null ? handlerMapping : new EmptyHandlerMapping();
+		if (handlerMapping != null) {
+			handlerMapping.setPathMatcher(mvcPathMatcher());
+			handlerMapping.setUrlPathHelper(mvcUrlPathHelper());
+		}
+		else {
+			handlerMapping = new EmptyHandlerMapping();
+		}
 		return handlerMapping;
 	}
 
@@ -344,9 +423,9 @@ protected void configureDefaultServletHandling(DefaultServletHandlerConfigurer c
 	 * through annotated controller methods. Consider overriding one of these
 	 * other more fine-grained methods:
 	 * <ul>
-	 *  <li>{@link #addArgumentResolvers} for adding custom argument resolvers.
-	 * 	<li>{@link #addReturnValueHandlers} for adding custom return value handlers.
-	 * 	<li>{@link #configureMessageConverters} for adding custom message converters.
+	 * <li>{@link #addArgumentResolvers} for adding custom argument resolvers.
+	 * <li>{@link #addReturnValueHandlers} for adding custom return value handlers.
+	 * <li>{@link #configureMessageConverters} for adding custom message converters.
 	 * </ul>
 	 */
 	@Bean
@@ -366,7 +445,6 @@ public RequestMappingHandlerAdapter requestMappingHandlerAdapter() {
 
 		AsyncSupportConfigurer configurer = new AsyncSupportConfigurer();
 		configureAsyncSupport(configurer);
-
 		if (configurer.getTaskExecutor() != null) {
 			adapter.setTaskExecutor(configurer.getTaskExecutor());
 		}
@@ -391,6 +469,20 @@ protected ConfigurableWebBindingInitializer getConfigurableWebBindingInitializer
 		return initializer;
 	}
 
+	/**
+	 * Override this method to provide a custom {@link MessageCodesResolver}.
+	 */
+	protected MessageCodesResolver getMessageCodesResolver() {
+		return null;
+	}
+
+	/**
+	 * Override this method to configure asynchronous request processing options.
+	 * @see AsyncSupportConfigurer
+	 */
+	protected void configureAsyncSupport(AsyncSupportConfigurer configurer) {
+	}
+
 	/**
 	 * Return a {@link FormattingConversionService} for use with annotated
 	 * controller methods and the {@code spring:eval} JSP tag.
@@ -403,6 +495,12 @@ public FormattingConversionService mvcConversionService() {
 		return conversionService;
 	}
 
+	/**
+	 * Override this method to add custom {@link Converter}s and {@link Formatter}s.
+	 */
+	protected void addFormatters(FormatterRegistry registry) {
+	}
+
 	/**
 	 * Return a global {@link Validator} instance for example for validating
 	 * {@code @ModelAttribute} and {@code @RequestBody} method arguments.
@@ -421,22 +519,16 @@ public Validator mvcValidator() {
 					String className = "org.springframework.validation.beanvalidation.LocalValidatorFactoryBean";
 					clazz = ClassUtils.forName(className, WebMvcConfigurationSupport.class.getClassLoader());
 				}
-				catch (ClassNotFoundException e) {
-					throw new BeanInitializationException("Could not find default validator", e);
+				catch (ClassNotFoundException ex) {
+					throw new BeanInitializationException("Could not find default validator class", ex);
 				}
-				catch (LinkageError e) {
-					throw new BeanInitializationException("Could not find default validator", e);
+				catch (LinkageError ex) {
+					throw new BeanInitializationException("Could not load default validator class", ex);
 				}
-				validator = (Validator) BeanUtils.instantiate(clazz);
+				validator = (Validator) BeanUtils.instantiateClass(clazz);
 			}
 			else {
-				validator = new Validator() {
-					public boolean supports(Class<?> clazz) {
-						return false;
-					}
-					public void validate(Object target, Errors errors) {
-					}
-				};
+				validator = new NoOpValidator();
 			}
 		}
 		return validator;
@@ -449,13 +541,6 @@ protected Validator getValidator() {
 		return null;
 	}
 
-	/**
-	 * Override this method to provide a custom {@link MessageCodesResolver}.
-	 */
-	protected MessageCodesResolver getMessageCodesResolver() {
-		return null;
-	}
-
 	/**
 	 * Add custom {@link HandlerMethodArgumentResolver}s to use in addition to
 	 * the ones registered by default.
@@ -494,14 +579,14 @@ protected void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> retu
 	 * used to add default message converters.
 	 */
 	protected final List<HttpMessageConverter<?>> getMessageConverters() {
-		if (messageConverters == null) {
-			messageConverters = new ArrayList<HttpMessageConverter<?>>();
-			configureMessageConverters(messageConverters);
-			if (messageConverters.isEmpty()) {
-				addDefaultHttpMessageConverters(messageConverters);
+		if (this.messageConverters == null) {
+			this.messageConverters = new ArrayList<HttpMessageConverter<?>>();
+			configureMessageConverters(this.messageConverters);
+			if (this.messageConverters.isEmpty()) {
+				addDefaultHttpMessageConverters(this.messageConverters);
 			}
 		}
-		return messageConverters;
+		return this.messageConverters;
 	}
 
 	/**
@@ -531,6 +616,7 @@ protected final void addDefaultHttpMessageConverters(List<HttpMessageConverter<?
 		messageConverters.add(new ResourceHttpMessageConverter());
 		messageConverters.add(new SourceHttpMessageConverter<Source>());
 		messageConverters.add(new AllEncompassingFormHttpMessageConverter());
+
 		if (romePresent) {
 			messageConverters.add(new AtomFeedHttpMessageConverter());
 			messageConverters.add(new RssChannelHttpMessageConverter());
@@ -546,19 +632,6 @@ else if (jacksonPresent) {
 		}
 	}
 
-	/**
-	 * Override this method to add custom {@link Converter}s and {@link Formatter}s.
-	 */
-	protected void addFormatters(FormatterRegistry registry) {
-	}
-
-	/**
-	 * Override this method to configure asynchronous request processing options.
-	 * @see AsyncSupportConfigurer
-	 */
-	public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
-	}
-
 	/**
 	 * Returns a {@link HttpRequestHandlerAdapter} for processing requests
 	 * with {@link HttpRequestHandler}s.
@@ -591,11 +664,9 @@ public SimpleControllerHandlerAdapter simpleControllerHandlerAdapter() {
 	public HandlerExceptionResolver handlerExceptionResolver() {
 		List<HandlerExceptionResolver> exceptionResolvers = new ArrayList<HandlerExceptionResolver>();
 		configureHandlerExceptionResolvers(exceptionResolvers);
-
 		if (exceptionResolvers.isEmpty()) {
 			addDefaultHandlerExceptionResolvers(exceptionResolvers);
 		}
-
 		HandlerExceptionResolverComposite composite = new HandlerExceptionResolverComposite();
 		composite.setOrder(0);
 		composite.setExceptionResolvers(exceptionResolvers);
@@ -618,32 +689,49 @@ protected void configureHandlerExceptionResolvers(List<HandlerExceptionResolver>
 	 * A method available to subclasses for adding default {@link HandlerExceptionResolver}s.
 	 * <p>Adds the following exception resolvers:
 	 * <ul>
-	 * 	<li>{@link ExceptionHandlerExceptionResolver}
-	 * 	for handling exceptions through @{@link ExceptionHandler} methods.
-	 * 	<li>{@link ResponseStatusExceptionResolver}
-	 * 	for exceptions annotated with @{@link ResponseStatus}.
-	 * 	<li>{@link DefaultHandlerExceptionResolver}
-	 * 	for resolving known Spring exception types
+	 * <li>{@link ExceptionHandlerExceptionResolver}
+	 * for handling exceptions through @{@link ExceptionHandler} methods.
+	 * <li>{@link ResponseStatusExceptionResolver}
+	 * for exceptions annotated with @{@link ResponseStatus}.
+	 * <li>{@link DefaultHandlerExceptionResolver}
+	 * for resolving known Spring exception types
 	 * </ul>
 	 */
 	protected final void addDefaultHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
 		ExceptionHandlerExceptionResolver exceptionHandlerExceptionResolver = new ExceptionHandlerExceptionResolver();
-		exceptionHandlerExceptionResolver.setApplicationContext(this.applicationContext);
 		exceptionHandlerExceptionResolver.setContentNegotiationManager(mvcContentNegotiationManager());
 		exceptionHandlerExceptionResolver.setMessageConverters(getMessageConverters());
+		exceptionHandlerExceptionResolver.setApplicationContext(this.applicationContext);
 		exceptionHandlerExceptionResolver.afterPropertiesSet();
-
 		exceptionResolvers.add(exceptionHandlerExceptionResolver);
-		exceptionResolvers.add(new ResponseStatusExceptionResolver());
+
+		ResponseStatusExceptionResolver responseStatusExceptionResolver = new ResponseStatusExceptionResolver();
+		responseStatusExceptionResolver.setMessageSource(this.applicationContext);
+		exceptionResolvers.add(responseStatusExceptionResolver);
+
 		exceptionResolvers.add(new DefaultHandlerExceptionResolver());
 	}
 
-	private final static class EmptyHandlerMapping extends AbstractHandlerMapping {
+
+	private static final class EmptyHandlerMapping extends AbstractHandlerMapping {
 
 		@Override
-		protected Object getHandlerInternal(HttpServletRequest request) throws Exception {
+		protected Object getHandlerInternal(HttpServletRequest request) {
 			return null;
 		}
 	}
 
+
+	private static final class NoOpValidator implements Validator {
+
+		@Override
+		public boolean supports(Class<?> clazz) {
+			return false;
+		}
+
+		@Override
+		public void validate(Object target, Errors errors) {
+		}
+	}
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java
index 215d34b7da..62e8caefec 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,14 +61,6 @@ public interface WebMvcConfigurer {
 	 */
 	void configureMessageConverters(List<HttpMessageConverter<?>> converters);
 
-	/**
-	 * Provide a custom {@link Validator} instead of the one created by default.
-	 * The default implementation, assuming JSR-303 is on the classpath, is:
-	 * {@link org.springframework.validation.beanvalidation.LocalValidatorFactoryBean}.
-	 * Leave the return value as {@code null} to keep the default.
-	 */
-	Validator getValidator();
-
 	/**
 	 * Configure content negotiation options.
 	 */
@@ -79,6 +71,19 @@ public interface WebMvcConfigurer {
 	 */
 	void configureAsyncSupport(AsyncSupportConfigurer configurer);
 
+	/**
+	 * Helps with configuring HandlerMappings path matching options such as trailing slash match,
+	 * suffix registration, path matcher and path helper.
+	 * Configured path matcher and path helper instances are shared for:
+	 * <ul>
+	 * <li>RequestMappings</li>
+	 * <li>ViewControllerMappings</li>
+	 * <li>ResourcesMappings</li>
+	 * </ul>
+	 * @since 3.2.17
+	 */
+	void configurePathMatch(PathMatchConfigurer configurer);
+
 	/**
 	 * Add resolvers to support custom controller method argument types.
 	 * <p>This does not override the built-in support for resolving handler
@@ -112,13 +117,6 @@ public interface WebMvcConfigurer {
 	 */
 	void addInterceptors(InterceptorRegistry registry);
 
-	/**
-	 * Provide a custom {@link MessageCodesResolver} for building message codes
-	 * from data binding and validation error codes. Leave the return value as
-	 * {@code null} to keep the default.
-	 */
-	MessageCodesResolver getMessageCodesResolver();
-
 	/**
 	 * Add view controllers to create a direct mapping between a URL path and
 	 * view name without the need for a controller in between.
@@ -140,4 +138,19 @@ public interface WebMvcConfigurer {
 	 */
 	void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer);
 
+	/**
+	 * Provide a custom {@link Validator} instead of the one created by default.
+	 * The default implementation, assuming JSR-303 is on the classpath, is:
+	 * {@link org.springframework.validation.beanvalidation.LocalValidatorFactoryBean}.
+	 * Leave the return value as {@code null} to keep the default.
+	 */
+	Validator getValidator();
+
+	/**
+	 * Provide a custom {@link MessageCodesResolver} for building message codes
+	 * from data binding and validation error codes. Leave the return value as
+	 * {@code null} to keep the default.
+	 */
+	MessageCodesResolver getMessageCodesResolver();
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java
index 6f6c82733c..f4744f2ce1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 
 /**
  * An implementation of {@link WebMvcConfigurer} with empty methods allowing
- * sub-classes to override only the methods they're interested in.
+ * subclasses to override only the methods they're interested in.
  *
  * @author Rossen Stoyanchev
  * @since 3.1
@@ -51,24 +51,23 @@ public void configureMessageConverters(List<HttpMessageConverter<?>> converters)
 
 	/**
 	 * {@inheritDoc}
-	 * <p>This implementation returns {@code null}
+	 * <p>This implementation is empty.
 	 */
-	public Validator getValidator() {
-		return null;
+	public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
 	}
 
 	/**
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
-	public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+	public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
 	}
 
 	/**
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
-	public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
+	public void configurePathMatch(PathMatchConfigurer configurer) {
 	}
 
 	/**
@@ -96,36 +95,44 @@ public void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> ex
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
-	public MessageCodesResolver getMessageCodesResolver() {
-		return null;
+	public void addInterceptors(InterceptorRegistry registry) {
 	}
 
 	/**
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
-	public void addInterceptors(InterceptorRegistry registry) {
+	public void addViewControllers(ViewControllerRegistry registry) {
 	}
 
 	/**
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
-	public void addViewControllers(ViewControllerRegistry registry) {
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
 	}
 
 	/**
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
-	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+	public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
 	}
 
 	/**
 	 * {@inheritDoc}
-	 * <p>This implementation is empty.
+	 * <p>This implementation returns {@code null}.
 	 */
-	public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+	public Validator getValidator() {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>This implementation returns {@code null}.
+	 */
+	public MessageCodesResolver getMessageCodesResolver() {
+		return null;
 	}
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java
index e222c3b126..b0312d30c8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 
 import org.springframework.format.FormatterRegistry;
 import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.MessageCodesResolver;
 import org.springframework.validation.Validator;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
@@ -28,7 +29,7 @@
 import org.springframework.web.servlet.HandlerExceptionResolver;
 
 /**
- * An {@link WebMvcConfigurer} implementation that delegates to other {@link WebMvcConfigurer} instances.
+ * A {@link WebMvcConfigurer} that delegates to one or more others.
  *
  * @author Rossen Stoyanchev
  * @since 3.1
@@ -37,12 +38,14 @@ class WebMvcConfigurerComposite implements WebMvcConfigurer {
 
 	private final List<WebMvcConfigurer> delegates = new ArrayList<WebMvcConfigurer>();
 
+
 	public void addWebMvcConfigurers(List<WebMvcConfigurer> configurers) {
-		if (configurers != null) {
+		if (!CollectionUtils.isEmpty(configurers)) {
 			this.delegates.addAll(configurers);
 		}
 	}
 
+
 	public void addFormatters(FormatterRegistry registry) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.addFormatters(registry);
@@ -61,6 +64,12 @@ public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
 		}
 	}
 
+	public void configurePathMatch(PathMatchConfigurer configurer) {
+		for (WebMvcConfigurer delegate : this.delegates) {
+			delegate.configurePathMatch(configurer);
+		}
+	}
+
 	public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.configureMessageConverters(converters);
@@ -120,6 +129,17 @@ public Validator getValidator() {
 		return selectSingleInstance(candidates, Validator.class);
 	}
 
+	public MessageCodesResolver getMessageCodesResolver() {
+		List<MessageCodesResolver> candidates = new ArrayList<MessageCodesResolver>();
+		for (WebMvcConfigurer configurer : this.delegates) {
+			MessageCodesResolver messageCodesResolver = configurer.getMessageCodesResolver();
+			if (messageCodesResolver != null) {
+				candidates.add(messageCodesResolver);
+			}
+		}
+		return selectSingleInstance(candidates, MessageCodesResolver.class);
+	}
+
 	private <T> T selectSingleInstance(List<T> instances, Class<T> instanceType) {
 		if (instances.size() > 1) {
 			throw new IllegalStateException(
@@ -133,15 +153,4 @@ else if (instances.size() == 1) {
 		}
 	}
 
-	public MessageCodesResolver getMessageCodesResolver() {
-		List<MessageCodesResolver> candidates = new ArrayList<MessageCodesResolver>();
-		for (WebMvcConfigurer configurer : this.delegates) {
-			MessageCodesResolver messageCodesResolver = configurer.getMessageCodesResolver();
-			if (messageCodesResolver != null) {
-				candidates.add(messageCodesResolver);
-			}
-		}
-		return selectSingleInstance(candidates, MessageCodesResolver.class);
-	}
-
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
index fdef487e48..330c187870 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
 
 	private int order = Ordered.LOWEST_PRECEDENCE;
 
-	private Set mappedHandlers;
+	private Set<?> mappedHandlers;
 
 	private Class[] mappedHandlerClasses;
 
@@ -76,7 +76,7 @@ public int getOrder() {
 	 * as fallback for all exceptions; any further HandlerExceptionResolvers in the chain will be
 	 * ignored in this case.
 	 */
-	public void setMappedHandlers(Set mappedHandlers) {
+	public void setMappedHandlers(Set<?> mappedHandlers) {
 		this.mappedHandlers = mappedHandlers;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
index b790a1e62b..a1464ce510 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.BeansException;
@@ -127,7 +126,7 @@ public void setUrlDecode(boolean urlDecode) {
 
 	/**
 	 * Set if ";" (semicolon) content should be stripped from the request URI.
-	 * <p>The default value is {@code false}.
+	 * <p>The default value is {@code true}.
 	 * @see org.springframework.web.util.UrlPathHelper#setRemoveSemicolonContent(boolean)
 	 */
 	public void setRemoveSemicolonContent(boolean removeSemicolonContent) {
@@ -203,29 +202,28 @@ protected void initApplicationContext() throws BeansException {
 	 * <p>Will be invoked before {@link #initInterceptors()} adapts the specified
 	 * interceptors into {@link HandlerInterceptor} instances.
 	 * <p>The default implementation is empty.
-	 * @param interceptors the configured interceptor List (never {@code null}),
-	 * allowing to add further interceptors before as well as after the existing
-	 * interceptors
+	 * @param interceptors the configured interceptor List (never {@code null}), allowing
+	 * to add further interceptors before as well as after the existing interceptors
 	 */
 	protected void extendInterceptors(List<Object> interceptors) {
 	}
 
 	/**
-	 * Detects beans of type {@link MappedInterceptor} and adds them to the list of mapped interceptors.
-	 * This is done in addition to any {@link MappedInterceptor}s that may have been provided via
-	 * {@link #setInterceptors(Object[])}. Subclasses can override this method to change that.
-	 *
-	 * @param mappedInterceptors an empty list to add MappedInterceptor types to
+	 * Detect beans of type {@link MappedInterceptor} and add them to the list of mapped interceptors.
+	 * <p>This is called in addition to any {@link MappedInterceptor}s that may have been provided
+	 * via {@link #setInterceptors}, by default adding all beans of type {@link MappedInterceptor}
+	 * from the current context and its ancestors. Subclasses can override and refine this policy.
+	 * @param mappedInterceptors an empty list to add {@link MappedInterceptor} instances to
 	 */
 	protected void detectMappedInterceptors(List<MappedInterceptor> mappedInterceptors) {
 		mappedInterceptors.addAll(
 				BeanFactoryUtils.beansOfTypeIncludingAncestors(
-						getApplicationContext(),MappedInterceptor.class, true, false).values());
+						getApplicationContext(), MappedInterceptor.class, true, false).values());
 	}
 
 	/**
-	 * Initialize the specified interceptors, checking for {@link MappedInterceptor}s and adapting
-	 * HandlerInterceptors where necessary.
+	 * Initialize the specified interceptors, checking for {@link MappedInterceptor}s and
+	 * adapting {@link HandlerInterceptor}s and {@link WebRequestInterceptor}s if necessary.
 	 * @see #setInterceptors
 	 * @see #adaptInterceptor
 	 */
@@ -237,19 +235,20 @@ protected void initInterceptors() {
 					throw new IllegalArgumentException("Entry number " + i + " in interceptors array is null");
 				}
 				if (interceptor instanceof MappedInterceptor) {
-					mappedInterceptors.add((MappedInterceptor) interceptor);
+					this.mappedInterceptors.add((MappedInterceptor) interceptor);
 				}
 				else {
-					adaptedInterceptors.add(adaptInterceptor(interceptor));
+					this.adaptedInterceptors.add(adaptInterceptor(interceptor));
 				}
 			}
 		}
 	}
 
 	/**
-	 * Adapt the given interceptor object to the HandlerInterceptor interface.
-	 * <p>Supported interceptor types are HandlerInterceptor and WebRequestInterceptor.
-	 * Each given WebRequestInterceptor will be wrapped in a WebRequestHandlerInterceptorAdapter.
+	 * Adapt the given interceptor object to the {@link HandlerInterceptor} interface.
+	 * <p>By default, the supported interceptor types are {@link HandlerInterceptor}
+	 * and {@link WebRequestInterceptor}. Each given {@link WebRequestInterceptor}
+	 * will be wrapped in a {@link WebRequestHandlerInterceptorAdapter}.
 	 * Can be overridden in subclasses.
 	 * @param interceptor the specified interceptor object
 	 * @return the interceptor wrapped as HandlerInterceptor
@@ -270,12 +269,12 @@ else if (interceptor instanceof WebRequestInterceptor) {
 	}
 
 	/**
-	 * Return the adapted interceptors as HandlerInterceptor array.
-	 * @return the array of HandlerInterceptors, or {@code null} if none
+	 * Return the adapted interceptors as {@link HandlerInterceptor} array.
+	 * @return the array of {@link HandlerInterceptor}s, or {@code null} if none
 	 */
 	protected final HandlerInterceptor[] getAdaptedInterceptors() {
-		int count = adaptedInterceptors.size();
-		return (count > 0) ? adaptedInterceptors.toArray(new HandlerInterceptor[count]) : null;
+		int count = this.adaptedInterceptors.size();
+		return (count > 0 ? this.adaptedInterceptors.toArray(new HandlerInterceptor[count]) : null);
 	}
 
 	/**
@@ -283,8 +282,8 @@ protected final HandlerInterceptor[] getAdaptedInterceptors() {
 	 * @return the array of {@link MappedInterceptor}s, or {@code null} if none
 	 */
 	protected final MappedInterceptor[] getMappedInterceptors() {
-		int count = mappedInterceptors.size();
-		return (count > 0) ? mappedInterceptors.toArray(new MappedInterceptor[count]) : null;
+		int count = this.mappedInterceptors.size();
+		return (count > 0 ? this.mappedInterceptors.toArray(new MappedInterceptor[count]) : null);
 	}
 
 	/**
@@ -324,31 +323,32 @@ public final HandlerExecutionChain getHandler(HttpServletRequest request) throws
 	protected abstract Object getHandlerInternal(HttpServletRequest request) throws Exception;
 
 	/**
-	 * Build a HandlerExecutionChain for the given handler, including applicable interceptors.
-	 * <p>The default implementation simply builds a standard HandlerExecutionChain with
-	 * the given handler, the handler mapping's common interceptors, and any {@link MappedInterceptor}s
-	 * matching to the current request URL. Subclasses may
-	 * override this in order to extend/rearrange the list of interceptors.
-	 * <p><b>NOTE:</b> The passed-in handler object may be a raw handler or a pre-built
-	 * HandlerExecutionChain. This method should handle those two cases explicitly,
-	 * either building a new HandlerExecutionChain or extending the existing chain.
-	 * <p>For simply adding an interceptor, consider calling {@code super.getHandlerExecutionChain}
-	 * and invoking {@link HandlerExecutionChain#addInterceptor} on the returned chain object.
+	 * Build a {@link HandlerExecutionChain} for the given handler, including
+	 * applicable interceptors.
+	 * <p>The default implementation builds a standard {@link HandlerExecutionChain}
+	 * with the given handler, the handler mapping's common interceptors, and any
+	 * {@link MappedInterceptor}s matching to the current request URL. Subclasses
+	 * may override this in order to extend/rearrange the list of interceptors.
+	 * <p><b>NOTE:</b> The passed-in handler object may be a raw handler or a
+	 * pre-built {@link HandlerExecutionChain}. This method should handle those
+	 * two cases explicitly, either building a new {@link HandlerExecutionChain}
+	 * or extending the existing chain.
+	 * <p>For simply adding an interceptor in a custom subclass, consider calling
+	 * {@code super.getHandlerExecutionChain(handler, request)} and invoking
+	 * {@link HandlerExecutionChain#addInterceptor} on the returned chain object.
 	 * @param handler the resolved handler instance (never {@code null})
 	 * @param request current HTTP request
 	 * @return the HandlerExecutionChain (never {@code null})
 	 * @see #getAdaptedInterceptors()
 	 */
 	protected HandlerExecutionChain getHandlerExecutionChain(Object handler, HttpServletRequest request) {
-		HandlerExecutionChain chain =
-			(handler instanceof HandlerExecutionChain) ?
-				(HandlerExecutionChain) handler : new HandlerExecutionChain(handler);
-
+		HandlerExecutionChain chain = (handler instanceof HandlerExecutionChain ?
+				(HandlerExecutionChain) handler : new HandlerExecutionChain(handler));
 		chain.addInterceptors(getAdaptedInterceptors());
 
-		String lookupPath = urlPathHelper.getLookupPathForRequest(request);
-		for (MappedInterceptor mappedInterceptor : mappedInterceptors) {
-			if (mappedInterceptor.matches(lookupPath, pathMatcher)) {
+		String lookupPath = this.urlPathHelper.getLookupPathForRequest(request);
+		for (MappedInterceptor mappedInterceptor : this.mappedInterceptors) {
+			if (mappedInterceptor.matches(lookupPath, this.pathMatcher)) {
 				chain.addInterceptor(mappedInterceptor.getInterceptor());
 			}
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
index 5a4c7d9248..7f9bc06665 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ public abstract class AbstractHandlerMethodExceptionResolver extends AbstractHan
 
 	/**
 	 * Checks if the handler is a {@link HandlerMethod} and then delegates to the
-	 * base class implementation of {@link #shouldApplyTo(HttpServletRequest, Object)}
+	 * base class implementation of {@code #shouldApplyTo(HttpServletRequest, Object)}
 	 * passing the bean of the {@code HandlerMethod}. Otherwise returns {@code false}.
 	 */
 	@Override
@@ -54,8 +54,7 @@ else if (handler instanceof HandlerMethod) {
 
 	@Override
 	protected final ModelAndView doResolveException(
-			HttpServletRequest request, HttpServletResponse response,
-			Object handler, Exception ex) {
+			HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
 
 		return doResolveHandlerMethodException(request, response, (HandlerMethod) handler, ex);
 	}
@@ -75,7 +74,6 @@ protected final ModelAndView doResolveException(
 	 * @return a corresponding ModelAndView to forward to, or {@code null} for default processing
 	 */
 	protected abstract ModelAndView doResolveHandlerMethodException(
-			HttpServletRequest request, HttpServletResponse response,
-			HandlerMethod handlerMethod, Exception ex);
+			HttpServletRequest request, HttpServletResponse response, HandlerMethod handlerMethod, Exception ex);
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
index ccdec77d51..0b2062829e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.IdentityHashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,7 +38,6 @@
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.method.HandlerMethodSelector;
 import org.springframework.web.servlet.HandlerMapping;
-import org.springframework.web.util.UrlPathHelper;
 
 /**
  * Abstract base class for {@link HandlerMapping} implementations that define a
@@ -62,12 +62,6 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
 	private final MultiValueMap<String, T> urlMap = new LinkedMultiValueMap<String, T>();
 
 
-	public AbstractHandlerMethodMapping() {
-		UrlPathHelper pathHelper = new UrlPathHelper();
-		pathHelper.setRemoveSemicolonContent(false);
-		setUrlPathHelper(pathHelper);
-	}
-
 	/**
 	 * Whether to detect handler methods in beans in ancestor ApplicationContexts.
 	 * <p>Default is "false": Only beans in the current ApplicationContext are
@@ -124,32 +118,33 @@ protected void initHandlerMethods() {
 	 */
 	protected abstract boolean isHandler(Class<?> beanType);
 
-	/**
-	 * Invoked after all handler methods have been detected.
-	 * @param handlerMethods a read-only map with handler methods and mappings.
-	 */
-	protected void handlerMethodsInitialized(Map<T, HandlerMethod> handlerMethods) {
-	}
-
 	/**
 	 * Look for handler methods in a handler.
 	 * @param handler the bean name of a handler or a handler instance
 	 */
 	protected void detectHandlerMethods(final Object handler) {
-		Class<?> handlerType = (handler instanceof String) ?
-				getApplicationContext().getType((String) handler) : handler.getClass();
+		Class<?> handlerType =
+				(handler instanceof String ? getApplicationContext().getType((String) handler) : handler.getClass());
 
+		// Avoid repeated calls to getMappingForMethod which would rebuild RequestMatchingInfo instances
+		final Map<Method, T> mappings = new IdentityHashMap<Method, T>();
 		final Class<?> userType = ClassUtils.getUserClass(handlerType);
 
 		Set<Method> methods = HandlerMethodSelector.selectMethods(userType, new MethodFilter() {
 			public boolean matches(Method method) {
-				return getMappingForMethod(method, userType) != null;
+				T mapping = getMappingForMethod(method, userType);
+				if (mapping != null) {
+					mappings.put(method, mapping);
+					return true;
+				}
+				else {
+					return false;
+				}
 			}
 		});
 
 		for (Method method : methods) {
-			T mapping = getMappingForMethod(method, userType);
-			registerHandlerMethod(handler, method, mapping);
+			registerHandlerMethod(handler, method, mappings.get(method));
 		}
 	}
 
@@ -173,11 +168,11 @@ public boolean matches(Method method) {
 	 */
 	protected void registerHandlerMethod(Object handler, Method method, T mapping) {
 		HandlerMethod newHandlerMethod = createHandlerMethod(handler, method);
-		HandlerMethod oldHandlerMethod = handlerMethods.get(mapping);
+		HandlerMethod oldHandlerMethod = this.handlerMethods.get(mapping);
 		if (oldHandlerMethod != null && !oldHandlerMethod.equals(newHandlerMethod)) {
-			throw new IllegalStateException("Ambiguous mapping found. Cannot map '" + newHandlerMethod.getBean()
-					+ "' bean method \n" + newHandlerMethod + "\nto " + mapping + ": There is already '"
-					+ oldHandlerMethod.getBean() + "' bean method\n" + oldHandlerMethod + " mapped.");
+			throw new IllegalStateException("Ambiguous mapping found. Cannot map '" + newHandlerMethod.getBean() +
+					"' bean method \n" + newHandlerMethod + "\nto " + mapping + ": There is already '" +
+					oldHandlerMethod.getBean() + "' bean method\n" + oldHandlerMethod + " mapped.");
 		}
 
 		this.handlerMethods.put(mapping, newHandlerMethod);
@@ -216,6 +211,14 @@ protected HandlerMethod createHandlerMethod(Object handler, Method method) {
 	 */
 	protected abstract Set<String> getMappingPathPatterns(T mapping);
 
+	/**
+	 * Invoked after all handler methods have been detected.
+	 * @param handlerMethods a read-only map with handler methods and mappings.
+	 */
+	protected void handlerMethodsInitialized(Map<T, HandlerMethod> handlerMethods) {
+	}
+
+
 	/**
 	 * Look up a handler method for the given request.
 	 */
@@ -225,9 +228,7 @@ protected HandlerMethod getHandlerInternal(HttpServletRequest request) throws Ex
 		if (logger.isDebugEnabled()) {
 			logger.debug("Looking up handler method for path " + lookupPath);
 		}
-
 		HandlerMethod handlerMethod = lookupHandlerMethod(lookupPath, request);
-
 		if (logger.isDebugEnabled()) {
 			if (handlerMethod != null) {
 				logger.debug("Returning handler method [" + handlerMethod + "]");
@@ -236,8 +237,7 @@ protected HandlerMethod getHandlerInternal(HttpServletRequest request) throws Ex
 				logger.debug("Did not find handler method for [" + lookupPath + "]");
 			}
 		}
-
-		return (handlerMethod != null) ? handlerMethod.createWithResolvedBean() : null;
+		return (handlerMethod != null ? handlerMethod.createWithResolvedBean() : null);
 	}
 
 	/**
@@ -251,25 +251,21 @@ protected HandlerMethod getHandlerInternal(HttpServletRequest request) throws Ex
 	 */
 	protected HandlerMethod lookupHandlerMethod(String lookupPath, HttpServletRequest request) throws Exception {
 		List<Match> matches = new ArrayList<Match>();
-
 		List<T> directPathMatches = this.urlMap.get(lookupPath);
 		if (directPathMatches != null) {
 			addMatchingMappings(directPathMatches, matches, request);
 		}
-
 		if (matches.isEmpty()) {
-			// No choice but to go through all mappings
+			// No choice but to go through all mappings...
 			addMatchingMappings(this.handlerMethods.keySet(), matches, request);
 		}
 
 		if (!matches.isEmpty()) {
 			Comparator<Match> comparator = new MatchComparator(getMappingComparator(request));
 			Collections.sort(matches, comparator);
-
 			if (logger.isTraceEnabled()) {
 				logger.trace("Found " + matches.size() + " matching mapping(s) for [" + lookupPath + "] : " + matches);
 			}
-
 			Match bestMatch = matches.get(0);
 			if (matches.size() > 1) {
 				Match secondBestMatch = matches.get(1);
@@ -281,7 +277,6 @@ protected HandlerMethod lookupHandlerMethod(String lookupPath, HttpServletReques
 							m1 + ", " + m2 + "}");
 				}
 			}
-
 			handleMatch(bestMatch.mapping, lookupPath, request);
 			return bestMatch.handlerMethod;
 		}
@@ -294,7 +289,7 @@ private void addMatchingMappings(Collection<T> mappings, List<Match> matches, Ht
 		for (T mapping : mappings) {
 			T match = getMatchingMapping(mapping, request);
 			if (match != null) {
-				matches.add(new Match(match, handlerMethods.get(mapping)));
+				matches.add(new Match(match, this.handlerMethods.get(mapping)));
 			}
 		}
 	}
@@ -341,7 +336,8 @@ protected HandlerMethod handleNoMatch(Set<T> mappings, String lookupPath, HttpSe
 
 
 	/**
-	 * A temporary container for a mapping matched to a request.
+	 * A thin wrapper around a matched HandlerMethod and its mapping, for the purpose of
+	 * comparing the best match with a comparator in the context of the current request.
 	 */
 	private class Match {
 
@@ -349,7 +345,7 @@ private class Match {
 
 		private final HandlerMethod handlerMethod;
 
-		private Match(T mapping, HandlerMethod handlerMethod) {
+		public Match(T mapping, HandlerMethod handlerMethod) {
 			this.mapping = mapping;
 			this.handlerMethod = handlerMethod;
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
index 82f1979856..d1b9c216fe 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,11 +28,12 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * {@link org.springframework.web.servlet.HandlerExceptionResolver} implementation that allows for mapping exception
- * class names to view names, either for a set of given handlers or for all handlers in the DispatcherServlet.
+ * {@link org.springframework.web.servlet.HandlerExceptionResolver} implementation
+ * that allows for mapping exception class names to view names, either for a set of
+ * given handlers or for all handlers in the DispatcherServlet.
  *
- * <p>Error views are analogous to error page JSPs, but can be used with any kind of exception including any checked
- * one, with fine-granular mappings for specific handlers.
+ * <p>Error views are analogous to error page JSPs, but can be used with any kind of
+ * exception including any checked one, with fine-granular mappings for specific handlers.
  *
  * @author Juergen Hoeller
  * @author Arjen Poutsma
@@ -45,6 +46,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 	/** The default name of the exception attribute: "exception". */
 	public static final String DEFAULT_EXCEPTION_ATTRIBUTE = "exception";
 
+
 	private Properties exceptionMappings;
 
 	private Class<?>[] excludedExceptions;
@@ -87,25 +89,27 @@ public void setExcludedExceptions(Class<?>... excludedExceptions) {
 	}
 
 	/**
-	 * Set the name of the default error view. This view will be returned if no specific mapping was found. <p>Default is
-	 * none.
+	 * Set the name of the default error view.
+	 * This view will be returned if no specific mapping was found.
+	 * <p>Default is none.
 	 */
 	public void setDefaultErrorView(String defaultErrorView) {
 		this.defaultErrorView = defaultErrorView;
 	}
 
 	/**
-	 * Set the HTTP status code that this exception resolver will apply for a given resolved error view. Keys are
-	 * view names; values are status codes.
-	 * <p>Note that this error code will only get applied in case of a top-level request. It will not be set for an include
-	 * request, since the HTTP status cannot be modified from within an include.
+	 * Set the HTTP status code that this exception resolver will apply for a given
+	 * resolved error view. Keys are view names; values are status codes.
+	 * <p>Note that this error code will only get applied in case of a top-level request.
+	 * It will not be set for an include request, since the HTTP status cannot be modified
+	 * from within an include.
 	 * <p>If not specified, the default status code will be applied.
 	 * @see #setDefaultStatusCode(int)
 	 */
 	public void setStatusCodes(Properties statusCodes) {
 		for (Enumeration<?> enumeration = statusCodes.propertyNames(); enumeration.hasMoreElements();) {
 			String viewName = (String) enumeration.nextElement();
-			Integer statusCode = new Integer(statusCodes.getProperty(viewName));
+			Integer statusCode = Integer.valueOf(statusCodes.getProperty(viewName));
 			this.statusCodes.put(viewName, statusCode);
 		}
 	}
@@ -127,12 +131,13 @@ public Map<String, Integer> getStatusCodesAsMap() {
 	}
 
 	/**
-	 * Set the default HTTP status code that this exception resolver will apply if it resolves an error view and if there
-	 * is no status code mapping defined.
-	 * <p>Note that this error code will only get applied in case of a top-level request. It will not be set for an
-	 * include request, since the HTTP status cannot be modified from within an include.
-	 * <p>If not specified, no status code will be applied, either leaving this to the controller or view, or keeping
-	 * the servlet engine's default of 200 (OK).
+	 * Set the default HTTP status code that this exception resolver will apply
+	 * if it resolves an error view and if there is no status code mapping defined.
+	 * <p>Note that this error code will only get applied in case of a top-level request.
+	 * It will not be set for an include request, since the HTTP status cannot be modified
+	 * from within an include.
+	 * <p>If not specified, no status code will be applied, either leaving this to the
+	 * controller or view, or keeping the servlet engine's default of 200 (OK).
 	 * @param defaultStatusCode HTTP status code value, for example 500
 	 * ({@link HttpServletResponse#SC_INTERNAL_SERVER_ERROR}) or 404 ({@link HttpServletResponse#SC_NOT_FOUND})
 	 * @see #setStatusCodes(Properties)
@@ -142,31 +147,34 @@ public void setDefaultStatusCode(int defaultStatusCode) {
 	}
 
 	/**
-	 * Set the name of the model attribute as which the exception should be exposed. Default is "exception". <p>This can be
-	 * either set to a different attribute name or to {@code null} for not exposing an exception attribute at all.
+	 * Set the name of the model attribute as which the exception should be exposed.
+	 * Default is "exception".
+	 * <p>This can be either set to a different attribute name or to {@code null}
+	 * for not exposing an exception attribute at all.
 	 * @see #DEFAULT_EXCEPTION_ATTRIBUTE
 	 */
 	public void setExceptionAttribute(String exceptionAttribute) {
 		this.exceptionAttribute = exceptionAttribute;
 	}
 
+
 	/**
-	 * Actually resolve the given exception that got thrown during on handler execution, returning a ModelAndView that
-	 * represents a specific error page if appropriate. <p>May be overridden in subclasses, in order to apply specific
-	 * exception checks. Note that this template method will be invoked <i>after</i> checking whether this resolved applies
-	 * ("mappedHandlers" etc), so an implementation may simply proceed with its actual exception handling.
+	 * Actually resolve the given exception that got thrown during on handler execution,
+	 * returning a ModelAndView that represents a specific error page if appropriate.
+	 * <p>May be overridden in subclasses, in order to apply specific exception checks.
+	 * Note that this template method will be invoked <i>after</i> checking whether this
+	 * resolved applies ("mappedHandlers" etc), so an implementation may simply proceed
+	 * with its actual exception handling.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @param handler the executed handler, or {@code null} if none chosen at the time of the exception (for example,
-	 * if multipart resolution failed)
+	 * @param handler the executed handler, or {@code null} if none chosen at the time
+	 * of the exception (for example, if multipart resolution failed)
 	 * @param ex the exception that got thrown during handler execution
 	 * @return a corresponding ModelAndView to forward to, or {@code null} for default processing
 	 */
 	@Override
-	protected ModelAndView doResolveException(HttpServletRequest request,
-			HttpServletResponse response,
-			Object handler,
-			Exception ex) {
+	protected ModelAndView doResolveException(HttpServletRequest request, HttpServletResponse response,
+			Object handler, Exception ex) {
 
 		// Expose ModelAndView for chosen error view.
 		String viewName = determineViewName(ex, request);
@@ -231,7 +239,8 @@ protected String findMatchingViewName(Properties exceptionMappings, Exception ex
 		for (Enumeration<?> names = exceptionMappings.propertyNames(); names.hasMoreElements();) {
 			String exceptionMapping = (String) names.nextElement();
 			int depth = getDepth(exceptionMapping, ex);
-			if (depth >= 0 && depth < deepest) {
+			if (depth >= 0 && (depth < deepest || (depth == deepest &&
+					dominantMapping != null && exceptionMapping.length() > dominantMapping.length()))) {
 				deepest = depth;
 				dominantMapping = exceptionMapping;
 				viewName = exceptionMappings.getProperty(exceptionMapping);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java
index 050d7d7927..f8df232acb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/UserRoleAuthorizationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public class UserRoleAuthorizationInterceptor extends HandlerInterceptorAdapter
 	 * Set the roles that this interceptor should treat as authorized.
 	 * @param authorizedRoles array of role names
 	 */
-	public final void setAuthorizedRoles(String[] authorizedRoles) {
+	public final void setAuthorizedRoles(String... authorizedRoles) {
 		this.authorizedRoles = authorizedRoles;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
index 661bb62ac7..dbac55b758 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,13 @@
 package org.springframework.web.servlet.i18n;
 
 import java.util.Locale;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.web.servlet.LocaleResolver;
 
 /**
- * Implementation of LocaleResolver that simply uses the primary locale
+ * {@link LocaleResolver} implementation that simply uses the primary locale
  * specified in the "accept-language" header of the HTTP request (that is,
  * the locale sent by the client browser, normally that of the client's OS).
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java
index a39919c3e8..833c296235 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/LocaleChangeInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 
 /**
  * Interceptor that allows for changing the current locale on every request,
- * via a configurable request parameter.
+ * via a configurable request parameter (default parameter name: "locale").
  *
  * @author Juergen Hoeller
  * @since 20.06.2003
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java
index de1bdd57c7..74de2aade1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java
@@ -24,9 +24,10 @@
 import org.springframework.web.util.WebUtils;
 
 /**
- * Implementation of LocaleResolver that uses a locale attribute in the user's
- * session in case of a custom setting, with a fallback to the specified default
- * locale or the request's accept-header locale.
+ * {@link org.springframework.web.servlet.LocaleResolver} implementation that
+ * uses a locale attribute in the user's session in case of a custom setting,
+ * with a fallback to the specified default locale or the request's
+ * accept-header locale.
  *
  * <p>This is most appropriate if the application needs user sessions anyway,
  * that is, when the HttpSession does not have to be created for the locale.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java
index 73607f6d7f..615d439d60 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
  * <p><b>Example:</b> web.xml, mapping all "/myservlet" requests to a Spring dispatcher.
  * Also defines a custom "myServlet", but <i>without</i> servlet mapping.
  *
- * <pre>
+ * <pre class="code">
  * &lt;servlet&gt;
  *   &lt;servlet-name&gt;myServlet&lt;/servlet-name&gt;
  *   &lt;servlet-class&gt;mypackage.TestServlet&lt;/servlet-class&gt;
@@ -59,7 +59,7 @@
  * configured HandlerInterceptor chain (e.g. an OpenSessionInViewInterceptor).
  * From the servlet point of view, everything will work as usual.
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping"&gt;
  *   &lt;property name="interceptors"&gt;
  *     &lt;list&gt;
@@ -80,10 +80,8 @@
  * @author Juergen Hoeller
  * @since 1.1.1
  * @see ServletWrappingController
- * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor
- * @see org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
- * @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewInterceptor
- * @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewFilter
+ * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor
+ * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter
  */
 public class ServletForwardingController extends AbstractController implements BeanNameAware {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
index 10dffda157..ea61231f88 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.util.Enumeration;
 import java.util.Properties;
-
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -48,7 +47,7 @@
  * through the configured HandlerInterceptor chain (e.g. an OpenSessionInViewInterceptor).
  * From the Struts point of view, everything will work as usual.
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping"&gt;
  *   &lt;property name="interceptors"&gt;
  *     &lt;list&gt;
@@ -79,15 +78,11 @@
  * @author Juergen Hoeller
  * @since 1.1.1
  * @see ServletForwardingController
- * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor
- * @see org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
- * @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewInterceptor
- * @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewFilter
  */
 public class ServletWrappingController extends AbstractController
-	implements BeanNameAware, InitializingBean, DisposableBean {
+		implements BeanNameAware, InitializingBean, DisposableBean {
 
-	private Class servletClass;
+	private Class<? extends Servlet> servletClass;
 
 	private String servletName;
 
@@ -103,7 +98,7 @@ public class ServletWrappingController extends AbstractController
 	 * Needs to implement {@code javax.servlet.Servlet}.
 	 * @see javax.servlet.Servlet
 	 */
-	public void setServletClass(Class servletClass) {
+	public void setServletClass(Class<? extends Servlet> servletClass) {
 		this.servletClass = servletClass;
 	}
 
@@ -134,27 +129,23 @@ public void setBeanName(String name) {
 	 */
 	public void afterPropertiesSet() throws Exception {
 		if (this.servletClass == null) {
-			throw new IllegalArgumentException("servletClass is required");
-		}
-		if (!Servlet.class.isAssignableFrom(this.servletClass)) {
-			throw new IllegalArgumentException("servletClass [" + this.servletClass.getName() +
-				"] needs to implement interface [javax.servlet.Servlet]");
+			throw new IllegalArgumentException("'servletClass' is required");
 		}
 		if (this.servletName == null) {
 			this.servletName = this.beanName;
 		}
-		this.servletInstance = (Servlet) this.servletClass.newInstance();
+		this.servletInstance = this.servletClass.newInstance();
 		this.servletInstance.init(new DelegatingServletConfig());
 	}
 
 
 	/**
-	 * Invoke the the wrapped Servlet instance.
+	 * Invoke the wrapped Servlet instance.
 	 * @see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
 	 */
 	@Override
 	protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response)
-		throws Exception {
+			throws Exception {
 
 		this.servletInstance.service(request, response);
 		return null;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ModelAndViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ModelAndViewResolver.java
index a6e25594b3..2f30a689e5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ModelAndViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ModelAndViewResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,39 +23,36 @@
 import org.springframework.web.servlet.ModelAndView;
 
 /**
- * SPI for resolving custom return values from a specific handler method. Typically implemented to detect special return
- * types, resolving well-known result values for them.
+ * SPI for resolving custom return values from a specific handler method.
+ * Typically implemented to detect special return types, resolving
+ * well-known result values for them.
  *
  * <p>A typical implementation could look like as follows:
  *
  * <pre class="code">
  * public class MyModelAndViewResolver implements ModelAndViewResolver {
  *
- *   public ModelAndView resolveModelAndView(Method handlerMethod,
- *		   			Class handlerType,
- *		   			Object returnValue,
- *		 			ExtendedModelMap implicitModel,
- *		 			NativeWebRequest webRequest) {
- *     if (returnValue instanceof MySpecialRetVal.class)) {
- *       return new MySpecialRetVal(returnValue);
+ *     public ModelAndView resolveModelAndView(Method handlerMethod, Class handlerType,
+ *             Object returnValue, ExtendedModelMap implicitModel, NativeWebRequest webRequest) {
+ *         if (returnValue instanceof MySpecialRetVal.class)) {
+ *             return new MySpecialRetVal(returnValue);
+ *         }
+ *         return UNRESOLVED;
  *     }
- *     return UNRESOLVED;
- *   }
  * }</pre>
  *
  * @author Arjen Poutsma
- * @see org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter#setCustomModelAndViewResolvers
- * @see org.springframework.web.portlet.mvc.annotation.AnnotationMethodHandlerAdapter#setCustomModelAndViewResolvers
  * @since 3.0
  */
 public interface ModelAndViewResolver {
 
-	/** Marker to be returned when the resolver does not know how to handle the given method parameter. */
+	/**
+	 * Marker to be returned when the resolver does not know how to handle the given method parameter.
+	 */
 	ModelAndView UNRESOLVED = new ModelAndView();
 
-	ModelAndView resolveModelAndView(Method handlerMethod,
-			Class handlerType,
-			Object returnValue,
-			ExtendedModelMap implicitModel,
-			NativeWebRequest webRequest);
+
+	ModelAndView resolveModelAndView(Method handlerMethod, Class<?> handlerType, Object returnValue,
+			ExtendedModelMap implicitModel, NativeWebRequest webRequest);
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
index bc65b27de2..ba0be31ad3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.http.MediaType;
 import org.springframework.web.HttpMediaTypeException;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,34 +41,36 @@ abstract class AbstractMediaTypeExpression implements Comparable<AbstractMediaTy
 
 	private final boolean isNegated;
 
+
 	AbstractMediaTypeExpression(String expression) {
 		if (expression.startsWith("!")) {
-			isNegated = true;
+			this.isNegated = true;
 			expression = expression.substring(1);
 		}
 		else {
-			isNegated = false;
+			this.isNegated = false;
 		}
 		this.mediaType = MediaType.parseMediaType(expression);
 	}
 
 	AbstractMediaTypeExpression(MediaType mediaType, boolean negated) {
 		this.mediaType = mediaType;
-		isNegated = negated;
+		this.isNegated = negated;
 	}
 
 	public MediaType getMediaType() {
-		return mediaType;
+		return this.mediaType;
 	}
 
 	public boolean isNegated() {
-		return isNegated;
+		return this.isNegated;
 	}
 
+
 	public final boolean match(HttpServletRequest request) {
 		try {
 			boolean match = matchMediaType(request);
-			return !isNegated ? match : !match;
+			return (!this.isNegated ? match : !match);
 		}
 		catch (HttpMediaTypeException ex) {
 			return false;
@@ -76,6 +79,7 @@ public final boolean match(HttpServletRequest request) {
 
 	protected abstract boolean matchMediaType(HttpServletRequest request) throws HttpMediaTypeException;
 
+
 	public int compareTo(AbstractMediaTypeExpression other) {
 		return MediaType.SPECIFICITY_COMPARATOR.compare(this.getMediaType(), other.getMediaType());
 	}
@@ -87,23 +91,23 @@ public boolean equals(Object obj) {
 		}
 		if (obj != null && getClass().equals(obj.getClass())) {
 			AbstractMediaTypeExpression other = (AbstractMediaTypeExpression) obj;
-			return (this.mediaType.equals(other.mediaType)) && (this.isNegated == other.isNegated);
+			return (this.mediaType.equals(other.mediaType) && this.isNegated == other.isNegated);
 		}
 		return false;
 	}
 
 	@Override
 	public int hashCode() {
-		return mediaType.hashCode();
+		return this.mediaType.hashCode();
 	}
 
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();
-		if (isNegated) {
+		if (this.isNegated) {
 			builder.append('!');
 		}
-		builder.append(mediaType.toString());
+		builder.append(this.mediaType.toString());
 		return builder.toString();
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java
index 921ecb249a..f67b1d20d4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,20 +28,13 @@
  */
 public abstract class AbstractRequestCondition<T extends AbstractRequestCondition<T>> implements RequestCondition<T> {
 
-	/**
-	 * Return the discrete items a request condition is composed of.
-	 * For example URL patterns, HTTP request methods, param expressions, etc.
-	 * @return a collection of objects, never {@code null}
-	 */
-	protected abstract Collection<?> getContent();
-
 	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
+	public boolean equals(Object obj) {
+		if (this == obj) {
 			return true;
 		}
-		if (o != null && getClass().equals(o.getClass())) {
-			AbstractRequestCondition<?> other = (AbstractRequestCondition<?>) o;
+		if (obj != null && getClass().equals(obj.getClass())) {
+			AbstractRequestCondition<?> other = (AbstractRequestCondition<?>) obj;
 			return getContent().equals(other.getContent());
 		}
 		return false;
@@ -66,6 +59,14 @@ public String toString() {
 		return builder.toString();
 	}
 
+
+	/**
+	 * Return the discrete items a request condition is composed of.
+	 * For example URL patterns, HTTP request methods, param expressions, etc.
+	 * @return a collection of objects, never {@code null}
+	 */
+	protected abstract Collection<?> getContent();
+
 	/**
 	 * The notation to use when printing discrete items of content.
 	 * For example " || " for URL patterns or " && " for param expressions.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java
index b7c8e0442a..14d51450ed 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.util.Assert;
@@ -43,6 +42,7 @@ public class CompositeRequestCondition extends AbstractRequestCondition<Composit
 
 	private final RequestConditionHolder[] requestConditions;
 
+
 	/**
 	 * Create an instance with 0 or more {@code RequestCondition} types. It is
 	 * important to create {@code CompositeRequestCondition} instances with the
@@ -53,6 +53,11 @@ public CompositeRequestCondition(RequestCondition<?>... requestConditions) {
 		this.requestConditions = wrap(requestConditions);
 	}
 
+	private CompositeRequestCondition(RequestConditionHolder[] requestConditions) {
+		this.requestConditions = requestConditions;
+	}
+
+
 	private RequestConditionHolder[] wrap(RequestCondition<?>... rawConditions) {
 		RequestConditionHolder[] wrappedConditions = new RequestConditionHolder[rawConditions.length];
 		for (int i = 0; i < rawConditions.length; i++) {
@@ -61,10 +66,6 @@ private RequestConditionHolder[] wrap(RequestCondition<?>... rawConditions) {
 		return wrappedConditions;
 	}
 
-	private CompositeRequestCondition(RequestConditionHolder[] requestConditions) {
-		this.requestConditions = requestConditions;
-	}
-
 	/**
 	 * Whether this instance contains 0 conditions or not.
 	 */
@@ -128,8 +129,9 @@ else if (isEmpty()) {
 
 	private void assertNumberOfConditions(CompositeRequestCondition other) {
 		Assert.isTrue(getLength() == other.getLength(),
-				"Cannot combine CompositeRequestConditions with a different number of conditions. "
-					+ this.requestConditions + " and  " + other.requestConditions);
+				"Cannot combine CompositeRequestConditions with a different number of conditions. " +
+				ObjectUtils.nullSafeToString(this.requestConditions) + " and  " +
+				ObjectUtils.nullSafeToString(other.requestConditions));
 	}
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java
index 05baa7b6fb..62e400eeaa 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.http.MediaType;
@@ -48,11 +47,12 @@ public final class ConsumesRequestCondition extends AbstractRequestCondition<Con
 
 	private final List<ConsumeMediaTypeExpression> expressions;
 
+
 	/**
 	 * Creates a new instance from 0 or more "consumes" expressions.
 	 * @param consumes expressions with the syntax described in
 	 * {@link RequestMapping#consumes()}; if 0 expressions are provided,
-	 * the condition will match to every request.
+	 * the condition will match to every request
 	 */
 	public ConsumesRequestCondition(String... consumes) {
 		this(consumes, null);
@@ -78,6 +78,7 @@ private ConsumesRequestCondition(Collection<ConsumeMediaTypeExpression> expressi
 		Collections.sort(this.expressions);
 	}
 
+
 	private static Set<ConsumeMediaTypeExpression> parseExpressions(String[] consumes, String[] headers) {
 		Set<ConsumeMediaTypeExpression> result = new LinkedHashSet<ConsumeMediaTypeExpression>();
 		if (headers != null) {
@@ -98,6 +99,7 @@ private static Set<ConsumeMediaTypeExpression> parseExpressions(String[] consume
 		return result;
 	}
 
+
 	/**
 	 * Return the contained MediaType expressions.
 	 */
@@ -149,12 +151,10 @@ public ConsumesRequestCondition combine(ConsumesRequestCondition other) {
 	 * request 'Content-Type' header and returns an instance that is guaranteed
 	 * to contain matching expressions only. The match is performed via
 	 * {@link MediaType#includes(MediaType)}.
-	 *
 	 * @param request the current request
-	 *
 	 * @return the same instance if the condition contains no expressions;
-	 * 		or a new condition with matching expressions only;
-	 * 		or {@code null} if no expressions match.
+	 * or a new condition with matching expressions only;
+	 * or {@code null} if no expressions match.
 	 */
 	public ConsumesRequestCondition getMatchingCondition(HttpServletRequest request) {
 		if (isEmpty()) {
@@ -173,11 +173,10 @@ public ConsumesRequestCondition getMatchingCondition(HttpServletRequest request)
 	/**
 	 * Returns:
 	 * <ul>
-	 * 	<li>0 if the two conditions have the same number of expressions
-	 * 	<li>Less than 0 if "this" has more or more specific media type expressions
-	 * 	<li>Greater than 0 if "other" has more or more specific media type expressions
+	 * <li>0 if the two conditions have the same number of expressions
+	 * <li>Less than 0 if "this" has more or more specific media type expressions
+	 * <li>Greater than 0 if "other" has more or more specific media type expressions
 	 * </ul>
-	 *
 	 * <p>It is assumed that both instances have been obtained via
 	 * {@link #getMatchingCondition(HttpServletRequest)} and each instance contains
 	 * the matching consumable media type expression only or is otherwise empty.
@@ -197,6 +196,7 @@ else if (other.expressions.isEmpty()) {
 		}
 	}
 
+
 	/**
 	 * Parses and matches a single media type expression to a request's 'Content-Type' header.
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
index 3ece7e8d73..ec26654964 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -41,12 +40,13 @@ public final class HeadersRequestCondition extends AbstractRequestCondition<Head
 
 	private final Set<HeaderExpression> expressions;
 
+
 	/**
 	 * Create a new instance from the given header expressions. Expressions with
 	 * header names 'Accept' or 'Content-Type' are ignored. See {@link ConsumesRequestCondition}
 	 * and {@link ProducesRequestCondition} for those.
 	 * @param headers media type expressions with syntax defined in {@link RequestMapping#headers()};
-	 * 		if 0, the condition will match to every request.
+	 * if 0, the condition will match to every request
 	 */
 	public HeadersRequestCondition(String... headers) {
 		this(parseExpressions(headers));
@@ -56,6 +56,7 @@ private HeadersRequestCondition(Collection<HeaderExpression> conditions) {
 		this.expressions = Collections.unmodifiableSet(new LinkedHashSet<HeaderExpression>(conditions));
 	}
 
+
 	private static Collection<HeaderExpression> parseExpressions(String... headers) {
 		Set<HeaderExpression> expressions = new LinkedHashSet<HeaderExpression>();
 		if (headers != null) {
@@ -113,11 +114,10 @@ public HeadersRequestCondition getMatchingCondition(HttpServletRequest request)
 	/**
 	 * Returns:
 	 * <ul>
-	 * 	<li>0 if the two conditions have the same number of header expressions
-	 * 	<li>Less than 0 if "this" instance has more header expressions
-	 * 	<li>Greater than 0 if the "other" instance has more header expressions
+	 * <li>0 if the two conditions have the same number of header expressions
+	 * <li>Less than 0 if "this" instance has more header expressions
+	 * <li>Greater than 0 if the "other" instance has more header expressions
 	 * </ul>
-	 *
 	 * <p>It is assumed that both instances have been obtained via
 	 * {@link #getMatchingCondition(HttpServletRequest)} and each instance
 	 * contains the matching header expression only or is otherwise empty.
@@ -126,6 +126,7 @@ public int compareTo(HeadersRequestCondition other, HttpServletRequest request)
 		return other.expressions.size() - this.expressions.size();
 	}
 
+
 	/**
 	 * Parses and matches a single header expression to a request.
 	 */
@@ -158,4 +159,5 @@ public int hashCode() {
 			return result;
 		}
 	}
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
index 294d4e6ed1..3c3ba38025 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,6 +37,7 @@ public final class ParamsRequestCondition extends AbstractRequestCondition<Param
 
 	private final Set<ParamExpression> expressions;
 
+
 	/**
 	 * Create a new instance from the given param expressions.
 	 * @param params expressions with syntax defined in {@link RequestMapping#params()};
@@ -51,6 +51,7 @@ private ParamsRequestCondition(Collection<ParamExpression> conditions) {
 		this.expressions = Collections.unmodifiableSet(new LinkedHashSet<ParamExpression>(conditions));
 	}
 
+
 	private static Collection<ParamExpression> parseExpressions(String... params) {
 		Set<ParamExpression> expressions = new LinkedHashSet<ParamExpression>();
 		if (params != null) {
@@ -61,6 +62,7 @@ private static Collection<ParamExpression> parseExpressions(String... params) {
 		return expressions;
 	}
 
+
 	/**
 	 * Return the contained request parameter expressions.
 	 */
@@ -70,7 +72,7 @@ public Set<NameValueExpression<String>> getExpressions() {
 
 	@Override
 	protected Collection<ParamExpression> getContent() {
-		return expressions;
+		return this.expressions;
 	}
 
 	@Override
@@ -104,19 +106,19 @@ public ParamsRequestCondition getMatchingCondition(HttpServletRequest request) {
 	/**
 	 * Returns:
 	 * <ul>
-	 * 	<li>0 if the two conditions have the same number of parameter expressions
-	 * 	<li>Less than 0 if "this" instance has more parameter expressions
-	 * 	<li>Greater than 0 if the "other" instance has more parameter expressions
+	 * <li>0 if the two conditions have the same number of parameter expressions
+	 * <li>Less than 0 if "this" instance has more parameter expressions
+	 * <li>Greater than 0 if the "other" instance has more parameter expressions
 	 * </ul>
-	 *
 	 * <p>It is assumed that both instances have been obtained via
 	 * {@link #getMatchingCondition(HttpServletRequest)} and each instance
 	 * contains the matching parameter expressions only or is otherwise empty.
 	 */
 	public int compareTo(ParamsRequestCondition other, HttpServletRequest request) {
-		return other.expressions.size() - this.expressions.size();
+		return (other.expressions.size() - this.expressions.size());
 	}
 
+
 	/**
 	 * Parses and matches a single param expression to a request.
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
index 53642385ca..69f10ad3bc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.util.AntPathMatcher;
@@ -42,13 +41,6 @@
  */
 public final class PatternsRequestCondition extends AbstractRequestCondition<PatternsRequestCondition> {
 
-	private static UrlPathHelper pathHelperNoSemicolonContent;
-
-	static {
-		pathHelperNoSemicolonContent = new UrlPathHelper();
-		pathHelperNoSemicolonContent.setRemoveSemicolonContent(true);
-	}
-
 	private final Set<String> patterns;
 
 	private final UrlPathHelper pathHelper;
@@ -61,6 +53,7 @@ public final class PatternsRequestCondition extends AbstractRequestCondition<Pat
 
 	private final List<String> fileExtensions = new ArrayList<String>();
 
+
 	/**
 	 * Creates a new instance with the given URL patterns.
 	 * Each pattern that is not empty and does not start with "/" is prepended with "/".
@@ -73,7 +66,6 @@ public PatternsRequestCondition(String... patterns) {
 	/**
 	 * Additional constructor with flags for using suffix pattern (.*) and
 	 * trailing slash matches.
-	 *
 	 * @param patterns the URL patterns to use; if 0, the condition will match to every request.
 	 * @param urlPathHelper for determining the lookup path of a request
 	 * @param pathMatcher for path matching with patterns
@@ -105,7 +97,6 @@ public PatternsRequestCondition(String[] patterns, UrlPathHelper urlPathHelper,
 
 	/**
 	 * Private constructor accepting a collection of patterns.
-	 * @param fileExtensionResolver
 	 */
 	private PatternsRequestCondition(Collection<String> patterns, UrlPathHelper urlPathHelper,
 			PathMatcher pathMatcher, boolean useSuffixPatternMatch, boolean useTrailingSlashMatch,
@@ -126,8 +117,9 @@ private PatternsRequestCondition(Collection<String> patterns, UrlPathHelper urlP
 		}
 	}
 
+
 	private static List<String> asList(String... patterns) {
-		return patterns != null ? Arrays.asList(patterns) : Collections.<String>emptyList();
+		return (patterns != null ? Arrays.asList(patterns) : Collections.<String>emptyList());
 	}
 
 	private static Set<String> prependLeadingSlash(Collection<String> patterns) {
@@ -162,12 +154,13 @@ protected String getToStringInfix() {
 	 * Returns a new instance with URL patterns from the current instance ("this") and
 	 * the "other" instance as follows:
 	 * <ul>
-	 * 	<li>If there are patterns in both instances, combine the patterns in "this" with
-	 * 		the patterns in "other" using {@link PathMatcher#combine(String, String)}.
-	 * 	<li>If only one instance has patterns, use them.
-	 *  <li>If neither instance has patterns, use an empty String (i.e. "").
+	 * <li>If there are patterns in both instances, combine the patterns in "this" with
+	 * the patterns in "other" using {@link PathMatcher#combine(String, String)}.
+	 * <li>If only one instance has patterns, use them.
+	 * <li>If neither instance has patterns, use an empty String (i.e. "").
 	 * </ul>
 	 */
+	@Override
 	public PatternsRequestCondition combine(PatternsRequestCondition other) {
 		Set<String> result = new LinkedHashSet<String>();
 		if (!this.patterns.isEmpty() && !other.patterns.isEmpty()) {
@@ -194,36 +187,28 @@ else if (!other.patterns.isEmpty()) {
 	 * Checks if any of the patterns match the given request and returns an instance
 	 * that is guaranteed to contain matching patterns, sorted via
 	 * {@link PathMatcher#getPatternComparator(String)}.
-	 *
 	 * <p>A matching pattern is obtained by making checks in the following order:
 	 * <ul>
-	 * 	<li>Direct match
-	 * 	<li>Pattern match with ".*" appended if the pattern doesn't already contain a "."
-	 * 	<li>Pattern match
-	 * 	<li>Pattern match with "/" appended if the pattern doesn't already end in "/"
+	 * <li>Direct match
+	 * <li>Pattern match with ".*" appended if the pattern doesn't already contain a "."
+	 * <li>Pattern match
+	 * <li>Pattern match with "/" appended if the pattern doesn't already end in "/"
 	 * </ul>
-	 *
 	 * @param request the current request
-	 *
 	 * @return the same instance if the condition contains no patterns;
-	 * 		or a new condition with sorted matching patterns;
-	 * 		or {@code null} if no patterns match.
+	 * or a new condition with sorted matching patterns;
+	 * or {@code null} if no patterns match.
 	 */
+	@Override
 	public PatternsRequestCondition getMatchingCondition(HttpServletRequest request) {
 		if (this.patterns.isEmpty()) {
 			return this;
 		}
 
 		String lookupPath = this.pathHelper.getLookupPathForRequest(request);
-		String lookupPathNoSemicolonContent = (lookupPath.indexOf(';') != -1) ?
-				pathHelperNoSemicolonContent.getLookupPathForRequest(request) : null;
-
 		List<String> matches = new ArrayList<String>();
-		for (String pattern : patterns) {
+		for (String pattern : this.patterns) {
 			String match = getMatchingPattern(pattern, lookupPath);
-			if (match == null && lookupPathNoSemicolonContent != null) {
-				match = getMatchingPattern(pattern, lookupPathNoSemicolonContent);
-			}
 			if (match != null) {
 				matches.add(match);
 			}
@@ -256,9 +241,8 @@ private String getMatchingPattern(String pattern, String lookupPath) {
 		if (this.pathMatcher.match(pattern, lookupPath)) {
 			return pattern;
 		}
-		boolean endsWithSlash = pattern.endsWith("/");
 		if (this.useTrailingSlashMatch) {
-			if (!endsWithSlash && this.pathMatcher.match(pattern + "/", lookupPath)) {
+			if (!pattern.endsWith("/") && this.pathMatcher.match(pattern + "/", lookupPath)) {
 				return pattern +"/";
 			}
 		}
@@ -271,17 +255,16 @@ private String getMatchingPattern(String pattern, String lookupPath) {
 	 * {@link PathMatcher#getPatternComparator(String)}. If all compared
 	 * patterns match equally, but one instance has more patterns, it is
 	 * considered a closer match.
-	 *
 	 * <p>It is assumed that both instances have been obtained via
 	 * {@link #getMatchingCondition(HttpServletRequest)} to ensure they
 	 * contain only patterns that match the request and are sorted with
 	 * the best matches on top.
 	 */
+	@Override
 	public int compareTo(PatternsRequestCondition other, HttpServletRequest request) {
 		String lookupPath = this.pathHelper.getLookupPathForRequest(request);
 		Comparator<String> patternComparator = this.pathMatcher.getPatternComparator(lookupPath);
-
-		Iterator<String> iterator = patterns.iterator();
+		Iterator<String> iterator = this.patterns.iterator();
 		Iterator<String> iteratorOther = other.patterns.iterator();
 		while (iterator.hasNext() && iteratorOther.hasNext()) {
 			int result = patternComparator.compare(iterator.next(), iteratorOther.next());
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
index 13292f1a76..136918ee80 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.http.MediaType;
@@ -46,10 +45,14 @@
  */
 public final class ProducesRequestCondition extends AbstractRequestCondition<ProducesRequestCondition> {
 
+	private final List<ProduceMediaTypeExpression> MEDIA_TYPE_ALL_LIST =
+			Collections.singletonList(new ProduceMediaTypeExpression("*/*"));
+
 	private final List<ProduceMediaTypeExpression> expressions;
 
 	private final ContentNegotiationManager contentNegotiationManager;
 
+
 	/**
 	 * Creates a new instance from "produces" expressions. If 0 expressions
 	 * are provided in total, this condition will match to any request.
@@ -78,21 +81,29 @@ public ProducesRequestCondition(String[] produces, String[] headers) {
 	 * @param headers expressions with syntax defined by {@link RequestMapping#headers()}
 	 * @param manager used to determine requested media types
 	 */
-	public ProducesRequestCondition(String[] produces, String[] headers,
-			ContentNegotiationManager manager) {
-
+	public ProducesRequestCondition(String[] produces, String[] headers, ContentNegotiationManager manager) {
 		this.expressions = new ArrayList<ProduceMediaTypeExpression>(parseExpressions(produces, headers));
 		Collections.sort(this.expressions);
-		this.contentNegotiationManager = (manager != null) ? manager : new ContentNegotiationManager();
+		this.contentNegotiationManager = (manager != null ? manager : new ContentNegotiationManager());
+	}
+
+	/**
+	 * Private constructor with already parsed media type expressions.
+	 */
+	private ProducesRequestCondition(Collection<ProduceMediaTypeExpression> expressions, ContentNegotiationManager manager) {
+		this.expressions = new ArrayList<ProduceMediaTypeExpression>(expressions);
+		Collections.sort(this.expressions);
+		this.contentNegotiationManager = (manager != null ? manager : new ContentNegotiationManager());
 	}
 
+
 	private Set<ProduceMediaTypeExpression> parseExpressions(String[] produces, String[] headers) {
 		Set<ProduceMediaTypeExpression> result = new LinkedHashSet<ProduceMediaTypeExpression>();
 		if (headers != null) {
 			for (String header : headers) {
 				HeaderExpression expr = new HeaderExpression(header);
 				if ("Accept".equalsIgnoreCase(expr.name)) {
-					for( MediaType mediaType : MediaType.parseMediaTypes(expr.value)) {
+					for (MediaType mediaType : MediaType.parseMediaTypes(expr.value)) {
 						result.add(new ProduceMediaTypeExpression(mediaType, expr.isNegated));
 					}
 				}
@@ -106,17 +117,6 @@ private Set<ProduceMediaTypeExpression> parseExpressions(String[] produces, Stri
 		return result;
 	}
 
-	/**
-	 * Private constructor with already parsed media type expressions.
-	 */
-	private ProducesRequestCondition(Collection<ProduceMediaTypeExpression> expressions,
-			ContentNegotiationManager manager) {
-
-		this.expressions = new ArrayList<ProduceMediaTypeExpression>(expressions);
-		Collections.sort(this.expressions);
-		this.contentNegotiationManager = (manager != null) ? manager : new ContentNegotiationManager();
-	}
-
 	/**
 	 * Return the contained "produces" expressions.
 	 */
@@ -160,7 +160,7 @@ protected String getToStringInfix() {
 	 * overrides a type-level "produces" condition.
 	 */
 	public ProducesRequestCondition combine(ProducesRequestCondition other) {
-		return !other.expressions.isEmpty() ? other : this;
+		return (!other.expressions.isEmpty() ? other : this);
 	}
 
 	/**
@@ -168,12 +168,10 @@ public ProducesRequestCondition combine(ProducesRequestCondition other) {
 	 * request 'Content-Type' header and returns an instance that is guaranteed
 	 * to contain matching expressions only. The match is performed via
 	 * {@link MediaType#isCompatibleWith(MediaType)}.
-	 *
 	 * @param request the current request
-	 *
 	 * @return the same instance if there are no expressions;
-	 * 		or a new condition with matching expressions;
-	 * 		or {@code null} if no expressions match.
+	 * or a new condition with matching expressions;
+	 * or {@code null} if no expressions match.
 	 */
 	public ProducesRequestCondition getMatchingCondition(HttpServletRequest request) {
 		if (isEmpty()) {
@@ -191,18 +189,16 @@ public ProducesRequestCondition getMatchingCondition(HttpServletRequest request)
 
 	/**
 	 * Compares this and another "produces" condition as follows:
-	 *
 	 * <ol>
-	 * 	<li>Sort 'Accept' header media types by quality value via
-	 * 	{@link MediaType#sortByQualityValue(List)} and iterate the list.
-	 * 	<li>Get the first index of matching media types in each "produces"
-	 * 	condition first matching with {@link MediaType#equals(Object)} and
-	 * 	then with {@link MediaType#includes(MediaType)}.
-	 *  <li>If a lower index is found, the condition at that index wins.
-	 *  <li>If both indexes are equal, the media types at the index are
-	 *  compared further with {@link MediaType#SPECIFICITY_COMPARATOR}.
+	 * <li>Sort 'Accept' header media types by quality value via
+	 * {@link MediaType#sortByQualityValue(List)} and iterate the list.
+	 * <li>Get the first index of matching media types in each "produces"
+	 * condition first matching with {@link MediaType#equals(Object)} and
+	 * then with {@link MediaType#includes(MediaType)}.
+	 * <li>If a lower index is found, the condition at that index wins.
+	 * <li>If both indexes are equal, the media types at the index are
+	 * compared further with {@link MediaType#SPECIFICITY_COMPARATOR}.
 	 * </ol>
-	 *
 	 * <p>It is assumed that both instances have been obtained via
 	 * {@link #getMatchingCondition(HttpServletRequest)} and each instance
 	 * contains the matching producible media type expression only or
@@ -211,7 +207,6 @@ public ProducesRequestCondition getMatchingCondition(HttpServletRequest request)
 	public int compareTo(ProducesRequestCondition other, HttpServletRequest request) {
 		try {
 			List<MediaType> acceptedMediaTypes = getAcceptedMediaTypes(request);
-
 			for (MediaType acceptedMediaType : acceptedMediaTypes) {
 				int thisIndex = this.indexOfEqualMediaType(acceptedMediaType);
 				int otherIndex = other.indexOfEqualMediaType(acceptedMediaType);
@@ -228,9 +223,9 @@ public int compareTo(ProducesRequestCondition other, HttpServletRequest request)
 			}
 			return 0;
 		}
-		catch (HttpMediaTypeNotAcceptableException e) {
+		catch (HttpMediaTypeNotAcceptableException ex) {
 			// should never happen
-			throw new IllegalStateException("Cannot compare without having any requested media types");
+			throw new IllegalStateException("Cannot compare without having any requested media types", ex);
 		}
 	}
 
@@ -259,14 +254,14 @@ private int indexOfIncludedMediaType(MediaType mediaType) {
 		return -1;
 	}
 
-	private int compareMatchingMediaTypes(ProducesRequestCondition condition1,
-			int index1, ProducesRequestCondition condition2, int index2) {
+	private int compareMatchingMediaTypes(ProducesRequestCondition condition1, int index1,
+			ProducesRequestCondition condition2, int index2) {
 
 		int result = 0;
 		if (index1 != index2) {
 			result = index2 - index1;
 		}
-		else if (index1 != -1 && index2 != -1) {
+		else if (index1 != -1) {
 			ProduceMediaTypeExpression expr1 = condition1.getExpressionsToCompare().get(index1);
 			ProduceMediaTypeExpression expr2 = condition2.getExpressionsToCompare().get(index2);
 			result = expr1.compareTo(expr2);
@@ -280,12 +275,9 @@ else if (index1 != -1 && index2 != -1) {
 	 * with a {@code MediaType_ALL} expression.
 	 */
 	private List<ProduceMediaTypeExpression> getExpressionsToCompare() {
-		return this.expressions.isEmpty() ? MEDIA_TYPE_ALL_LIST : this.expressions;
+		return (this.expressions.isEmpty() ? MEDIA_TYPE_ALL_LIST : this.expressions);
 	}
 
-	private final List<ProduceMediaTypeExpression> MEDIA_TYPE_ALL_LIST =
-			Collections.singletonList(new ProduceMediaTypeExpression("*/*"));
-
 
 	/**
 	 * Parses and matches a single media type expression to a request's 'Accept' header.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java
index d4c69a9360..0fad8079da 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,15 +21,14 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
- * The contract for request conditions.
+ * The contract for request conditions in Spring MVC's mapping infrastructure.
  *
  * <p>Request conditions can be combined via {@link #combine(Object)}, matched to
  * a request via {@link #getMatchingCondition(HttpServletRequest)}, and compared
  * to each other via {@link #compareTo(Object, HttpServletRequest)} to determine
  * which matches a request more closely.
  *
- * @param <T> The type of objects that this RequestCondition can be combined
- * with compared to.
+ * @param <T> the type of objects that this RequestCondition can be combined with and compared to
  *
  * @author Rossen Stoyanchev
  * @author Arjen Poutsma
@@ -41,10 +40,9 @@ public interface RequestCondition<T> {
 	 * Defines the rules for combining this condition (i.e. the current instance)
 	 * with another condition. For example combining type- and method-level
 	 * {@link RequestMapping} conditions.
-	 *
 	 * @param other the condition to combine with.
 	 * @return a request condition instance that is the result of combining
-	 * 	the two condition instances.
+	 * the two condition instances.
 	 */
 	T combine(T other);
 
@@ -54,9 +52,8 @@ public interface RequestCondition<T> {
 	 * current request. For example a condition with URL patterns might
 	 * return a new condition that contains matching patterns sorted
 	 * with best matching patterns on top.
-	 *
 	 * @return a condition instance in case of a match;
-	 * 		or {@code null} if there is no match.
+	 * or {@code null} if there is no match
 	 */
 	T getMatchingCondition(HttpServletRequest request);
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java
index 8779839fbb..75ca99a577 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestConditionHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,8 @@
 
 import java.util.Collection;
 import java.util.Collections;
-
 import javax.servlet.http.HttpServletRequest;
 
-
 /**
  * A holder for a {@link RequestCondition} useful when the type of the request
  * condition is not known ahead of time, e.g. custom condition. Since this
@@ -40,6 +38,7 @@ public final class RequestConditionHolder extends AbstractRequestCondition<Reque
 
 	private final RequestCondition<Object> condition;
 
+
 	/**
 	 * Create a new holder to wrap the given request condition.
 	 * @param requestCondition the condition to hold, may be {@code null}
@@ -49,6 +48,7 @@ public RequestConditionHolder(RequestCondition<?> requestCondition) {
 		this.condition = (RequestCondition<Object>) requestCondition;
 	}
 
+
 	/**
 	 * Return the held request condition, or {@code null} if not holding one.
 	 */
@@ -58,7 +58,7 @@ public RequestCondition<?> getCondition() {
 
 	@Override
 	protected Collection<?> getContent() {
-		return this.condition != null ? Collections.singleton(this.condition) : Collections.emptyList();
+		return (this.condition != null ? Collections.singleton(this.condition) : Collections.emptyList());
 	}
 
 	@Override
@@ -109,7 +109,7 @@ public RequestConditionHolder getMatchingCondition(HttpServletRequest request) {
 			return this;
 		}
 		RequestCondition<?> match = (RequestCondition<?>) this.condition.getMatchingCondition(request);
-		return (match != null) ? new RequestConditionHolder(match) : null;
+		return (match != null ? new RequestConditionHolder(match) : null);
 	}
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java
index 22d5e3b8b5..cc9cbbb46a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -39,36 +38,36 @@ public final class RequestMethodsRequestCondition extends AbstractRequestConditi
 
 	private final Set<RequestMethod> methods;
 
+
 	/**
 	 * Create a new instance with the given request methods.
 	 * @param requestMethods 0 or more HTTP request methods;
-	 * 		if, 0 the condition will match to every request.
+	 * if, 0 the condition will match to every request
 	 */
 	public RequestMethodsRequestCondition(RequestMethod... requestMethods) {
 		this(asList(requestMethods));
 	}
 
-	private static List<RequestMethod> asList(RequestMethod... requestMethods) {
-		return requestMethods != null ? Arrays.asList(requestMethods) : Collections.<RequestMethod>emptyList();
-	}
-
-	/**
-	 * Private constructor.
-	 */
 	private RequestMethodsRequestCondition(Collection<RequestMethod> requestMethods) {
 		this.methods = Collections.unmodifiableSet(new LinkedHashSet<RequestMethod>(requestMethods));
 	}
 
+
+	private static List<RequestMethod> asList(RequestMethod... requestMethods) {
+		return (requestMethods != null ? Arrays.asList(requestMethods) : Collections.<RequestMethod>emptyList());
+	}
+
+
 	/**
 	 * Returns all {@link RequestMethod}s contained in this condition.
 	 */
 	public Set<RequestMethod> getMethods() {
-		return methods;
+		return this.methods;
 	}
 
 	@Override
 	protected Collection<RequestMethod> getContent() {
-		return methods;
+		return this.methods;
 	}
 
 	@Override
@@ -89,7 +88,6 @@ public RequestMethodsRequestCondition combine(RequestMethodsRequestCondition oth
 	/**
 	 * Check if any of the HTTP request methods match the given request and
 	 * return an instance that contains the matching HTTP request method only.
-	 *
 	 * @param request the current request
 	 * @return the same instance if the condition is empty, a new condition with
 	 * the matched request method, or {@code null} if no request methods match
@@ -99,7 +97,7 @@ public RequestMethodsRequestCondition getMatchingCondition(HttpServletRequest re
 			return this;
 		}
 		RequestMethod incomingRequestMethod = getRequestMethod(request);
-		if(incomingRequestMethod != null) {
+		if (incomingRequestMethod != null) {
 			for (RequestMethod method : this.methods) {
 				if (method.equals(incomingRequestMethod)) {
 					return new RequestMethodsRequestCondition(method);
@@ -113,7 +111,7 @@ private RequestMethod getRequestMethod(HttpServletRequest request) {
 		try {
 			return RequestMethod.valueOf(request.getMethod());
 		}
-		catch (IllegalArgumentException e) {
+		catch (IllegalArgumentException ex) {
 			return null;
 		}
 	}
@@ -121,17 +119,16 @@ private RequestMethod getRequestMethod(HttpServletRequest request) {
 	/**
 	 * Returns:
 	 * <ul>
-	 * 	<li>0 if the two conditions contain the same number of HTTP request methods
-	 * 	<li>Less than 0 if "this" instance has an HTTP request method but "other" doesn't
-	 * 	<li>Greater than 0 "other" has an HTTP request method but "this" doesn't
+	 * <li>0 if the two conditions contain the same number of HTTP request methods
+	 * <li>Less than 0 if "this" instance has an HTTP request method but "other" doesn't
+	 * <li>Greater than 0 "other" has an HTTP request method but "this" doesn't
 	 * </ul>
-	 *
 	 * <p>It is assumed that both instances have been obtained via
 	 * {@link #getMatchingCondition(HttpServletRequest)} and therefore each instance
 	 * contains the matching HTTP request method only or is otherwise empty.
 	 */
 	public int compareTo(RequestMethodsRequestCondition other, HttpServletRequest request) {
-		return other.methods.size() - this.methods.size();
+		return (other.methods.size() - this.methods.size());
 	}
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java
index 9824b80e0e..342ad958f1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,11 +36,13 @@ public abstract class AbstractHandlerMethodAdapter extends WebContentGenerator i
 
 	private int order = Ordered.LOWEST_PRECEDENCE;
 
+
 	public AbstractHandlerMethodAdapter() {
 		// no restriction of HTTP methods by default
 		super(false);
 	}
 
+
 	/**
 	 * Specify the order value for this HandlerAdapter bean.
 	 * <p>Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered.
@@ -54,49 +56,47 @@ public int getOrder() {
 		return this.order;
 	}
 
+
 	/**
-	 * {@inheritDoc} <p>This implementation expects the handler to be an {@link HandlerMethod}.
-	 *
+	 * This implementation expects the handler to be an {@link HandlerMethod}.
 	 * @param handler the handler instance to check
 	 * @return whether or not this adapter can adapt the given handler
 	 */
 	public final boolean supports(Object handler) {
-		return handler instanceof HandlerMethod && supportsInternal((HandlerMethod) handler);
+		return (handler instanceof HandlerMethod && supportsInternal((HandlerMethod) handler));
 	}
 
 	/**
 	 * Given a handler method, return whether or not this adapter can support it.
-	 *
 	 * @param handlerMethod the handler method to check
 	 * @return whether or not this adapter can adapt the given method
 	 */
 	protected abstract boolean supportsInternal(HandlerMethod handlerMethod);
 
 	/**
-	 * {@inheritDoc} <p>This implementation expects the handler to be an {@link HandlerMethod}.
+	 * This implementation expects the handler to be an {@link HandlerMethod}.
 	 */
 	public final ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
+
 		return handleInternal(request, response, (HandlerMethod) handler);
 	}
 
 	/**
 	 * Use the given handler method to handle the request.
-	 *
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @param handlerMethod handler method to use. This object must have previously been passed to the
 	 * {@link #supportsInternal(HandlerMethod)} this interface, which must have returned {@code true}.
-	 * @return ModelAndView object with the name of the view and the required model data, or {@code null} if
-	 * the request has been handled directly
+	 * @return ModelAndView object with the name of the view and the required model data,
+	 * or {@code null} if the request has been handled directly
 	 * @throws Exception in case of errors
 	 */
 	protected abstract ModelAndView handleInternal(HttpServletRequest request,
-												   HttpServletResponse response,
-												   HandlerMethod handlerMethod) throws Exception;
+			HttpServletResponse response, HandlerMethod handlerMethod) throws Exception;
 
 	/**
-	 * {@inheritDoc} <p>This implementation expects the handler to be an {@link HandlerMethod}.
+	 * This implementation expects the handler to be an {@link HandlerMethod}.
 	 */
 	public final long getLastModified(HttpServletRequest request, Object handler) {
 		return getLastModifiedInternal(request, (HandlerMethod) handler);
@@ -104,10 +104,10 @@ public final long getLastModified(HttpServletRequest request, Object handler) {
 
 	/**
 	 * Same contract as for {@link javax.servlet.http.HttpServlet#getLastModified(HttpServletRequest)}.
-	 *
 	 * @param request current HTTP request
 	 * @param handlerMethod handler method to use
 	 * @return the lastModified value for the given handler
 	 */
 	protected abstract long getLastModifiedInternal(HttpServletRequest request, HandlerMethod handlerMethod);
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
index 6d0e3941e6..b517e79c7a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
  * 	<li>{@link HeadersRequestCondition}
  * 	<li>{@link ConsumesRequestCondition}
  * 	<li>{@link ProducesRequestCondition}
- * 	<li>{@code RequestCondition<?>} (optional, custom request condition)
+ * 	<li>{@code RequestCondition} (optional, custom request condition)
  * </ol>
  *
  * @author Arjen Poutsma
@@ -59,24 +59,20 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 
 	private final RequestConditionHolder customConditionHolder;
 
-	private int hash;
 
 	/**
 	 * Creates a new instance with the given request conditions.
 	 */
-	public RequestMappingInfo(PatternsRequestCondition patterns,
-							  RequestMethodsRequestCondition methods,
-							  ParamsRequestCondition params,
-							  HeadersRequestCondition headers,
-							  ConsumesRequestCondition consumes,
-							  ProducesRequestCondition produces,
-							  RequestCondition<?> custom) {
-		this.patternsCondition = patterns != null ? patterns : new PatternsRequestCondition();
-		this.methodsCondition = methods != null ? methods : new RequestMethodsRequestCondition();
-		this.paramsCondition = params != null ? params : new ParamsRequestCondition();
-		this.headersCondition = headers != null ? headers : new HeadersRequestCondition();
-		this.consumesCondition = consumes != null ? consumes : new ConsumesRequestCondition();
-		this.producesCondition = produces != null ? produces : new ProducesRequestCondition();
+	public RequestMappingInfo(PatternsRequestCondition patterns, RequestMethodsRequestCondition methods,
+			ParamsRequestCondition params, HeadersRequestCondition headers, ConsumesRequestCondition consumes,
+			ProducesRequestCondition produces, RequestCondition<?> custom) {
+
+		this.patternsCondition = (patterns != null ? patterns : new PatternsRequestCondition());
+		this.methodsCondition = (methods != null ? methods : new RequestMethodsRequestCondition());
+		this.paramsCondition = (params != null ? params : new ParamsRequestCondition());
+		this.headersCondition = (headers != null ? headers : new HeadersRequestCondition());
+		this.consumesCondition = (consumes != null ? consumes : new ConsumesRequestCondition());
+		this.producesCondition = (produces != null ? produces : new ProducesRequestCondition());
 		this.customConditionHolder = new RequestConditionHolder(custom);
 	}
 
@@ -88,61 +84,63 @@ public RequestMappingInfo(RequestMappingInfo info, RequestCondition<?> customReq
 				info.consumesCondition, info.producesCondition, customRequestCondition);
 	}
 
+
 	/**
 	 * Returns the URL patterns of this {@link RequestMappingInfo};
-	 * or instance with 0 patterns, never {@code null}
+	 * or instance with 0 patterns, never {@code null}.
 	 */
 	public PatternsRequestCondition getPatternsCondition() {
-		return patternsCondition;
+		return this.patternsCondition;
 	}
 
 	/**
 	 * Returns the HTTP request methods of this {@link RequestMappingInfo};
-	 * or instance with 0 request methods, never {@code null}
+	 * or instance with 0 request methods, never {@code null}.
 	 */
 	public RequestMethodsRequestCondition getMethodsCondition() {
-		return methodsCondition;
+		return this.methodsCondition;
 	}
 
 	/**
 	 * Returns the "parameters" condition of this {@link RequestMappingInfo};
-	 * or instance with 0 parameter expressions, never {@code null}
+	 * or instance with 0 parameter expressions, never {@code null}.
 	 */
 	public ParamsRequestCondition getParamsCondition() {
-		return paramsCondition;
+		return this.paramsCondition;
 	}
 
 	/**
 	 * Returns the "headers" condition of this {@link RequestMappingInfo};
-	 * or instance with 0 header expressions, never {@code null}
+	 * or instance with 0 header expressions, never {@code null}.
 	 */
 	public HeadersRequestCondition getHeadersCondition() {
-		return headersCondition;
+		return this.headersCondition;
 	}
 
 	/**
 	 * Returns the "consumes" condition of this {@link RequestMappingInfo};
-	 * or instance with 0 consumes expressions, never {@code null}
+	 * or instance with 0 consumes expressions, never {@code null}.
 	 */
 	public ConsumesRequestCondition getConsumesCondition() {
-		return consumesCondition;
+		return this.consumesCondition;
 	}
 
 	/**
 	 * Returns the "produces" condition of this {@link RequestMappingInfo};
-	 * or instance with 0 produces expressions, never {@code null}
+	 * or instance with 0 produces expressions, never {@code null}.
 	 */
 	public ProducesRequestCondition getProducesCondition() {
-		return producesCondition;
+		return this.producesCondition;
 	}
 
 	/**
-	 * Returns the "custom" condition of this {@link RequestMappingInfo}; or {@code null}
+	 * Returns the "custom" condition of this {@link RequestMappingInfo}; or {@code null}.
 	 */
 	public RequestCondition<?> getCustomCondition() {
-		return customConditionHolder.getCondition();
+		return this.customConditionHolder.getCondition();
 	}
 
+
 	/**
 	 * Combines "this" request mapping info (i.e. the current instance) with another request mapping info instance.
 	 * <p>Example: combine type- and method-level request mappings.
@@ -168,22 +166,22 @@ public RequestMappingInfo combine(RequestMappingInfo other) {
 	 * @return a new instance in case all conditions match; or {@code null} otherwise
 	 */
 	public RequestMappingInfo getMatchingCondition(HttpServletRequest request) {
-		RequestMethodsRequestCondition methods = methodsCondition.getMatchingCondition(request);
-		ParamsRequestCondition params = paramsCondition.getMatchingCondition(request);
-		HeadersRequestCondition headers = headersCondition.getMatchingCondition(request);
-		ConsumesRequestCondition consumes = consumesCondition.getMatchingCondition(request);
-		ProducesRequestCondition produces = producesCondition.getMatchingCondition(request);
+		RequestMethodsRequestCondition methods = this.methodsCondition.getMatchingCondition(request);
+		ParamsRequestCondition params = this.paramsCondition.getMatchingCondition(request);
+		HeadersRequestCondition headers = this.headersCondition.getMatchingCondition(request);
+		ConsumesRequestCondition consumes = this.consumesCondition.getMatchingCondition(request);
+		ProducesRequestCondition produces = this.producesCondition.getMatchingCondition(request);
 
 		if (methods == null || params == null || headers == null || consumes == null || produces == null) {
 			return null;
 		}
 
-		PatternsRequestCondition patterns = patternsCondition.getMatchingCondition(request);
+		PatternsRequestCondition patterns = this.patternsCondition.getMatchingCondition(request);
 		if (patterns == null) {
 			return null;
 		}
 
-		RequestConditionHolder custom = customConditionHolder.getMatchingCondition(request);
+		RequestConditionHolder custom = this.customConditionHolder.getMatchingCondition(request);
 		if (custom == null) {
 			return null;
 		}
@@ -191,38 +189,39 @@ public RequestMappingInfo getMatchingCondition(HttpServletRequest request) {
 		return new RequestMappingInfo(patterns, methods, params, headers, consumes, produces, custom.getCondition());
 	}
 
+
 	/**
 	 * Compares "this" info (i.e. the current instance) with another info in the context of a request.
-	 * <p>Note: it is assumed both instances have been obtained via
+	 * <p>Note: It is assumed both instances have been obtained via
 	 * {@link #getMatchingCondition(HttpServletRequest)} to ensure they have conditions with
 	 * content relevant to current request.
 	 */
 	public int compareTo(RequestMappingInfo other, HttpServletRequest request) {
-		int result = patternsCondition.compareTo(other.getPatternsCondition(), request);
+		int result = this.patternsCondition.compareTo(other.getPatternsCondition(), request);
 		if (result != 0) {
 			return result;
 		}
-		result = paramsCondition.compareTo(other.getParamsCondition(), request);
+		result = this.paramsCondition.compareTo(other.getParamsCondition(), request);
 		if (result != 0) {
 			return result;
 		}
-		result = headersCondition.compareTo(other.getHeadersCondition(), request);
+		result = this.headersCondition.compareTo(other.getHeadersCondition(), request);
 		if (result != 0) {
 			return result;
 		}
-		result = consumesCondition.compareTo(other.getConsumesCondition(), request);
+		result = this.consumesCondition.compareTo(other.getConsumesCondition(), request);
 		if (result != 0) {
 			return result;
 		}
-		result = producesCondition.compareTo(other.getProducesCondition(), request);
+		result = this.producesCondition.compareTo(other.getProducesCondition(), request);
 		if (result != 0) {
 			return result;
 		}
-		result = methodsCondition.compareTo(other.getMethodsCondition(), request);
+		result = this.methodsCondition.compareTo(other.getMethodsCondition(), request);
 		if (result != 0) {
 			return result;
 		}
-		result = customConditionHolder.compareTo(other.customConditionHolder, request);
+		result = this.customConditionHolder.compareTo(other.customConditionHolder, request);
 		if (result != 0) {
 			return result;
 		}
@@ -249,30 +248,22 @@ public boolean equals(Object obj) {
 
 	@Override
 	public int hashCode() {
-		int result = hash;
-		if (result == 0) {
-			result = patternsCondition.hashCode();
-			result = 31 * result + methodsCondition.hashCode();
-			result = 31 * result + paramsCondition.hashCode();
-			result = 31 * result + headersCondition.hashCode();
-			result = 31 * result + consumesCondition.hashCode();
-			result = 31 * result + producesCondition.hashCode();
-			result = 31 * result + customConditionHolder.hashCode();
-			hash = result;
-		}
-		return result;
+		return (this.patternsCondition.hashCode() * 31 +  // primary differentiation
+				this.methodsCondition.hashCode() + this.paramsCondition.hashCode() +
+				this.headersCondition.hashCode() + this.consumesCondition.hashCode() +
+				this.producesCondition.hashCode() + this.customConditionHolder.hashCode());
 	}
 
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder("{");
-		builder.append(patternsCondition);
-		builder.append(",methods=").append(methodsCondition);
-		builder.append(",params=").append(paramsCondition);
-		builder.append(",headers=").append(headersCondition);
-		builder.append(",consumes=").append(consumesCondition);
-		builder.append(",produces=").append(producesCondition);
-		builder.append(",custom=").append(customConditionHolder);
+		builder.append(this.patternsCondition);
+		builder.append(",methods=").append(this.methodsCondition);
+		builder.append(",params=").append(this.paramsCondition);
+		builder.append(",headers=").append(this.headersCondition);
+		builder.append(",consumes=").append(this.consumesCondition);
+		builder.append(",produces=").append(this.producesCondition);
+		builder.append(",custom=").append(this.customConditionHolder);
 		builder.append('}');
 		return builder.toString();
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
index 89fcb4e9e1..4e58fa9b38 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,14 @@
 package org.springframework.web.servlet.mvc.method;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
@@ -49,7 +50,7 @@
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
- * @since 3.1.0
+ * @since 3.1
  */
 public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMethodMapping<RequestMappingInfo> {
 
@@ -86,7 +87,6 @@ public int compare(RequestMappingInfo info1, RequestMappingInfo info2) {
 
 	/**
 	 * Expose URI template variables, matrix variables, and producible media types in the request.
-	 *
 	 * @see HandlerMapping#URI_TEMPLATE_VARIABLES_ATTRIBUTE
 	 * @see HandlerMapping#MATRIX_VARIABLES_ATTRIBUTE
 	 * @see HandlerMapping#PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE
@@ -95,16 +95,28 @@ public int compare(RequestMappingInfo info1, RequestMappingInfo info2) {
 	protected void handleMatch(RequestMappingInfo info, String lookupPath, HttpServletRequest request) {
 		super.handleMatch(info, lookupPath, request);
 
+		String bestPattern;
+		Map<String, String> uriVariables;
+		Map<String, String> decodedUriVariables;
+
 		Set<String> patterns = info.getPatternsCondition().getPatterns();
-		String bestPattern = patterns.isEmpty() ? lookupPath : patterns.iterator().next();
-		request.setAttribute(BEST_MATCHING_PATTERN_ATTRIBUTE, bestPattern);
+		if (patterns.isEmpty()) {
+			bestPattern = lookupPath;
+			uriVariables = Collections.emptyMap();
+			decodedUriVariables = Collections.emptyMap();
+		}
+		else {
+			bestPattern = patterns.iterator().next();
+			uriVariables = getPathMatcher().extractUriTemplateVariables(bestPattern, lookupPath);
+			decodedUriVariables = getUrlPathHelper().decodePathVariables(request, uriVariables);
+		}
 
-		Map<String, String> uriVariables = getPathMatcher().extractUriTemplateVariables(bestPattern, lookupPath);
-		Map<String, String> decodedUriVariables = getUrlPathHelper().decodePathVariables(request, uriVariables);
+		request.setAttribute(BEST_MATCHING_PATTERN_ATTRIBUTE, bestPattern);
 		request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, decodedUriVariables);
 
 		if (isMatrixVariableContentAvailable()) {
-			request.setAttribute(HandlerMapping.MATRIX_VARIABLES_ATTRIBUTE, extractMatrixVariables(request, uriVariables));
+			Map<String, MultiValueMap<String, String>> matrixVars = extractMatrixVariables(request, uriVariables);
+			request.setAttribute(HandlerMapping.MATRIX_VARIABLES_ATTRIBUTE, matrixVars);
 		}
 
 		if (!info.getProducesCondition().getProducibleMediaTypes().isEmpty()) {
@@ -149,19 +161,16 @@ private Map<String, MultiValueMap<String, String>> extractMatrixVariables(
 	/**
 	 * Iterate all RequestMappingInfos once again, look if any match by URL at
 	 * least and raise exceptions accordingly.
-	 *
-	 * @throws HttpRequestMethodNotSupportedException
-	 * 		if there are matches by URL but not by HTTP method
-	 * @throws HttpMediaTypeNotAcceptableException
-	 * 		if there are matches by URL but not by consumable media types
-	 * @throws HttpMediaTypeNotAcceptableException
-	 * 		if there are matches by URL but not by producible media types
+	 * @throws HttpRequestMethodNotSupportedException if there are matches by URL
+	 * but not by HTTP method
+	 * @throws HttpMediaTypeNotAcceptableException if there are matches by URL
+	 * but not by consumable/producible media types
 	 */
 	@Override
 	protected HandlerMethod handleNoMatch(Set<RequestMappingInfo> requestMappingInfos,
 			String lookupPath, HttpServletRequest request) throws ServletException {
 
-		Set<String> allowedMethods = new HashSet<String>(6);
+		Set<String> allowedMethods = new LinkedHashSet<String>(4);
 
 		Set<RequestMappingInfo> patternMatches = new HashSet<RequestMappingInfo>();
 		Set<RequestMappingInfo> patternAndMethodMatches = new HashSet<RequestMappingInfo>();
@@ -193,12 +202,12 @@ else if (patternAndMethodMatches.isEmpty() && !allowedMethods.isEmpty()) {
 
 		if (patternAndMethodMatches.isEmpty()) {
 			consumableMediaTypes = getConsumableMediaTypes(request, patternMatches);
-			producibleMediaTypes = getProdicubleMediaTypes(request, patternMatches);
+			producibleMediaTypes = getProducibleMediaTypes(request, patternMatches);
 			paramConditions = getRequestParams(request, patternMatches);
 		}
 		else {
 			consumableMediaTypes = getConsumableMediaTypes(request, patternAndMethodMatches);
-			producibleMediaTypes = getProdicubleMediaTypes(request, patternAndMethodMatches);
+			producibleMediaTypes = getProducibleMediaTypes(request, patternAndMethodMatches);
 			paramConditions = getRequestParams(request, patternAndMethodMatches);
 		}
 
@@ -236,7 +245,7 @@ private Set<MediaType> getConsumableMediaTypes(HttpServletRequest request, Set<R
 		return result;
 	}
 
-	private Set<MediaType> getProdicubleMediaTypes(HttpServletRequest request, Set<RequestMappingInfo> partialMatches) {
+	private Set<MediaType> getProducibleMediaTypes(HttpServletRequest request, Set<RequestMappingInfo> partialMatches) {
 		Set<MediaType> result = new HashSet<MediaType>();
 		for (RequestMappingInfo partialMatch : partialMatches) {
 			if (partialMatch.getProducesCondition().getMatchingCondition(request) == null) {
@@ -251,7 +260,7 @@ private Set<String> getRequestParams(HttpServletRequest request, Set<RequestMapp
 			ParamsRequestCondition condition = partialMatch.getParamsCondition();
 			if (!CollectionUtils.isEmpty(condition.getExpressions()) && (condition.getMatchingCondition(request) == null)) {
 				Set<String> expressions = new HashSet<String>();
-				for (NameValueExpression expr : condition.getExpressions()) {
+				for (NameValueExpression<String> expr : condition.getExpressions()) {
 					expressions.add(expr.toString());
 				}
 				return expressions;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
index 14c74c6077..211cb91988 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,14 +25,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpInputMessage;
+import org.springframework.http.InvalidMediaTypeException;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.GenericHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -58,12 +59,14 @@ public abstract class AbstractMessageConverterMethodArgumentResolver implements
 
 	protected final List<MediaType> allSupportedMediaTypes;
 
+
 	public AbstractMessageConverterMethodArgumentResolver(List<HttpMessageConverter<?>> messageConverters) {
 		Assert.notEmpty(messageConverters, "'messageConverters' must not be empty");
 		this.messageConverters = messageConverters;
 		this.allSupportedMediaTypes = getAllSupportedMediaTypes(messageConverters);
 	}
 
+
 	/**
 	 * Return the media types supported by all provided message converters sorted
 	 * by specificity via {@link MediaType#sortBySpecificity(List)}.
@@ -78,10 +81,10 @@ private static List<MediaType> getAllSupportedMediaTypes(List<HttpMessageConvert
 		return Collections.unmodifiableList(result);
 	}
 
+
 	/**
-	 * Creates the method argument value of the expected parameter type by
+	 * Create the method argument value of the expected parameter type by
 	 * reading from the given request.
-	 *
 	 * @param <T> the expected type of the argument value to be created
 	 * @param webRequest the current request
 	 * @param methodParam the method argument
@@ -98,9 +101,8 @@ protected <T> Object readWithMessageConverters(NativeWebRequest webRequest,
 	}
 
 	/**
-	 * Creates the method argument value of the expected parameter type by reading
+	 * Create the method argument value of the expected parameter type by reading
 	 * from the given HttpInputMessage.
-	 *
 	 * @param <T> the expected type of the argument value to be created
 	 * @param inputMessage the HTTP input message representing the current request
 	 * @param methodParam the method argument
@@ -115,43 +117,48 @@ protected <T> Object readWithMessageConverters(NativeWebRequest webRequest,
 	protected <T> Object readWithMessageConverters(HttpInputMessage inputMessage,
 			MethodParameter methodParam, Type targetType) throws IOException, HttpMediaTypeNotSupportedException {
 
-				MediaType contentType = inputMessage.getHeaders().getContentType();
-				if (contentType == null) {
-					contentType = MediaType.APPLICATION_OCTET_STREAM;
-				}
+		MediaType contentType;
+		try {
+			contentType = inputMessage.getHeaders().getContentType();
+		}
+		catch (InvalidMediaTypeException ex) {
+			throw new HttpMediaTypeNotSupportedException(ex.getMessage());
+		}
+		if (contentType == null) {
+			contentType = MediaType.APPLICATION_OCTET_STREAM;
+		}
 
-				Class<?> contextClass = methodParam.getDeclaringClass();
-				Map<TypeVariable, Type> map = GenericTypeResolver.getTypeVariableMap(contextClass);
-				Class<T> targetClass = (Class<T>) GenericTypeResolver.resolveType(targetType, map);
-
-				for (HttpMessageConverter<?> converter : this.messageConverters) {
-					if (converter instanceof GenericHttpMessageConverter) {
-						GenericHttpMessageConverter genericConverter = (GenericHttpMessageConverter) converter;
-						if (genericConverter.canRead(targetType, contextClass, contentType)) {
-							if (logger.isDebugEnabled()) {
-								logger.debug("Reading [" + targetType + "] as \"" +
-										contentType + "\" using [" + converter + "]");
-							}
-							return genericConverter.read(targetType, contextClass, inputMessage);
-						}
+		Class<?> contextClass = methodParam.getDeclaringClass();
+		Map<TypeVariable, Type> map = GenericTypeResolver.getTypeVariableMap(contextClass);
+		Class<T> targetClass = (Class<T>) GenericTypeResolver.resolveType(targetType, map);
+
+		for (HttpMessageConverter<?> converter : this.messageConverters) {
+			if (converter instanceof GenericHttpMessageConverter) {
+				GenericHttpMessageConverter genericConverter = (GenericHttpMessageConverter) converter;
+				if (genericConverter.canRead(targetType, contextClass, contentType)) {
+					if (logger.isDebugEnabled()) {
+						logger.debug("Reading [" + targetType + "] as \"" +
+								contentType + "\" using [" + converter + "]");
 					}
-					if (targetClass != null) {
-						if (converter.canRead(targetClass, contentType)) {
-							if (logger.isDebugEnabled()) {
-								logger.debug("Reading [" + targetClass.getName() + "] as \"" +
-										contentType + "\" using [" + converter + "]");
-							}
-							return ((HttpMessageConverter<T>) converter).read(targetClass, inputMessage);
-						}
+					return genericConverter.read(targetType, contextClass, inputMessage);
+				}
+			}
+			if (targetClass != null) {
+				if (converter.canRead(targetClass, contentType)) {
+					if (logger.isDebugEnabled()) {
+						logger.debug("Reading [" + targetClass.getName() + "] as \"" +
+								contentType + "\" using [" + converter + "]");
 					}
+					return ((HttpMessageConverter<T>) converter).read(targetClass, inputMessage);
 				}
-
-				throw new HttpMediaTypeNotSupportedException(contentType, allSupportedMediaTypes);
 			}
+		}
+
+		throw new HttpMediaTypeNotSupportedException(contentType, this.allSupportedMediaTypes);
+	}
 
 	/**
-	 * Creates a new {@link HttpInputMessage} from the given {@link NativeWebRequest}.
-	 *
+	 * Create a new {@link HttpInputMessage} from the given {@link NativeWebRequest}.
 	 * @param webRequest the web request to create an input message from
 	 * @return the input message
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
index 48cff20fe5..bab0705414 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,31 +18,36 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.core.MethodParameter;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.http.server.ServletServerHttpResponse;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.HttpMediaTypeNotAcceptableException;
 import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
 import org.springframework.web.servlet.HandlerMapping;
+import org.springframework.web.util.UrlPathHelper;
 
 /**
- * Extends {@link AbstractMessageConverterMethodArgumentResolver} with the ability to handle method return
- * values by writing to the response with {@link HttpMessageConverter}s.
+ * Extends {@link AbstractMessageConverterMethodArgumentResolver} with the ability to handle
+ * method return values by writing to the response with {@link HttpMessageConverter}s.
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
@@ -53,8 +58,25 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe
 
 	private static final MediaType MEDIA_TYPE_APPLICATION = new MediaType("application");
 
+	private static final UrlPathHelper RAW_URL_PATH_HELPER = new UrlPathHelper();
+
+	private static final UrlPathHelper DECODING_URL_PATH_HELPER = new UrlPathHelper();
+
+	static {
+		RAW_URL_PATH_HELPER.setRemoveSemicolonContent(false);
+		RAW_URL_PATH_HELPER.setUrlDecode(false);
+	}
+
+	/* Extensions associated with the built-in message converters */
+	private static final Set<String> WHITELISTED_EXTENSIONS = new HashSet<String>(Arrays.asList(
+			"txt", "text", "json", "xml", "atom", "rss", "png", "jpe", "jpeg", "jpg", "gif", "wbmp", "bmp"));
+
+
 	private final ContentNegotiationManager contentNegotiationManager;
 
+	private final Set<String> safeExtensions = new HashSet<String>();
+
+
 	protected AbstractMessageConverterMethodProcessor(List<HttpMessageConverter<?>> messageConverters) {
 		this(messageConverters, null);
 	}
@@ -63,12 +85,14 @@ protected AbstractMessageConverterMethodProcessor(List<HttpMessageConverter<?>>
 			ContentNegotiationManager manager) {
 
 		super(messageConverters);
-		this.contentNegotiationManager = (manager != null) ? manager : new ContentNegotiationManager();
+		this.contentNegotiationManager = (manager != null ? manager : new ContentNegotiationManager());
+		this.safeExtensions.addAll(this.contentNegotiationManager.getAllFileExtensions());
+		this.safeExtensions.addAll(WHITELISTED_EXTENSIONS);
 	}
 
+
 	/**
 	 * Creates a new {@link HttpOutputMessage} from the given {@link NativeWebRequest}.
-	 *
 	 * @param webRequest the web request to create an output message from
 	 * @return the output message
 	 */
@@ -81,10 +105,9 @@ protected ServletServerHttpResponse createOutputMessage(NativeWebRequest webRequ
 	 * Writes the given return value to the given web request. Delegates to
 	 * {@link #writeWithMessageConverters(Object, MethodParameter, ServletServerHttpRequest, ServletServerHttpResponse)}
 	 */
-	protected <T> void writeWithMessageConverters(T returnValue,
-												MethodParameter returnType,
-												NativeWebRequest webRequest)
+	protected <T> void writeWithMessageConverters(T returnValue, MethodParameter returnType, NativeWebRequest webRequest)
 			throws IOException, HttpMediaTypeNotAcceptableException {
+
 		ServletServerHttpRequest inputMessage = createInputMessage(webRequest);
 		ServletServerHttpResponse outputMessage = createOutputMessage(webRequest);
 		writeWithMessageConverters(returnValue, returnType, inputMessage, outputMessage);
@@ -92,7 +115,6 @@ protected <T> void writeWithMessageConverters(T returnValue,
 
 	/**
 	 * Writes the given return type to the given output message.
-	 *
 	 * @param returnValue the value to write to the output message
 	 * @param returnType the type of the value
 	 * @param inputMessage the input messages. Used to inspect the {@code Accept} header.
@@ -102,23 +124,20 @@ protected <T> void writeWithMessageConverters(T returnValue,
 	 * the request cannot be met by the message converters
 	 */
 	@SuppressWarnings("unchecked")
-	protected <T> void writeWithMessageConverters(T returnValue,
-												MethodParameter returnType,
-												ServletServerHttpRequest inputMessage,
-												ServletServerHttpResponse outputMessage)
+	protected <T> void writeWithMessageConverters(T returnValue, MethodParameter returnType,
+			ServletServerHttpRequest inputMessage, ServletServerHttpResponse outputMessage)
 			throws IOException, HttpMediaTypeNotAcceptableException {
 
 		Class<?> returnValueClass = returnValue.getClass();
-
 		HttpServletRequest servletRequest = inputMessage.getServletRequest();
 		List<MediaType> requestedMediaTypes = getAcceptableMediaTypes(servletRequest);
 		List<MediaType> producibleMediaTypes = getProducibleMediaTypes(servletRequest, returnValueClass);
 
 		Set<MediaType> compatibleMediaTypes = new LinkedHashSet<MediaType>();
-		for (MediaType r : requestedMediaTypes) {
-			for (MediaType p : producibleMediaTypes) {
-				if (r.isCompatibleWith(p)) {
-					compatibleMediaTypes.add(getMostSpecificMediaType(r, p));
+		for (MediaType requestedType : requestedMediaTypes) {
+			for (MediaType producibleType : producibleMediaTypes) {
+				if (requestedType.isCompatibleWith(producibleType)) {
+					compatibleMediaTypes.add(getMostSpecificMediaType(requestedType, producibleType));
 				}
 			}
 		}
@@ -143,8 +162,9 @@ else if (mediaType.equals(MediaType.ALL) || mediaType.equals(MEDIA_TYPE_APPLICAT
 
 		if (selectedMediaType != null) {
 			selectedMediaType = selectedMediaType.removeQualityValue();
-			for (HttpMessageConverter<?> messageConverter : messageConverters) {
+			for (HttpMessageConverter<?> messageConverter : this.messageConverters) {
 				if (messageConverter.canWrite(returnValueClass, selectedMediaType)) {
+					addContentDispositionHeader(inputMessage, outputMessage);
 					((HttpMessageConverter<T>) messageConverter).write(returnValue, selectedMediaType, outputMessage);
 					if (logger.isDebugEnabled()) {
 						logger.debug("Written [" + returnValue + "] as \"" + selectedMediaType + "\" using [" +
@@ -154,15 +174,15 @@ else if (mediaType.equals(MediaType.ALL) || mediaType.equals(MEDIA_TYPE_APPLICAT
 				}
 			}
 		}
-		throw new HttpMediaTypeNotAcceptableException(allSupportedMediaTypes);
+		throw new HttpMediaTypeNotAcceptableException(this.allSupportedMediaTypes);
 	}
 
 	/**
 	 * Returns the media types that can be produced:
 	 * <ul>
-	 * 	<li>The producible media types specified in the request mappings, or
-	 * 	<li>Media types of configured converters that can write the specific return value, or
-	 * 	<li>{@link MediaType#ALL}
+	 * <li>The producible media types specified in the request mappings, or
+	 * <li>Media types of configured converters that can write the specific return value, or
+	 * <li>{@link MediaType#ALL}
 	 * </ul>
 	 */
 	@SuppressWarnings("unchecked")
@@ -171,9 +191,9 @@ protected List<MediaType> getProducibleMediaTypes(HttpServletRequest request, Cl
 		if (!CollectionUtils.isEmpty(mediaTypes)) {
 			return new ArrayList<MediaType>(mediaTypes);
 		}
-		else if (!allSupportedMediaTypes.isEmpty()) {
+		else if (!this.allSupportedMediaTypes.isEmpty()) {
 			List<MediaType> result = new ArrayList<MediaType>();
-			for (HttpMessageConverter<?> converter : messageConverters) {
+			for (HttpMessageConverter<?> converter : this.messageConverters) {
 				if (converter.canWrite(returnValueClass, null)) {
 					result.addAll(converter.getSupportedMediaTypes());
 				}
@@ -187,7 +207,7 @@ else if (!allSupportedMediaTypes.isEmpty()) {
 
 	private List<MediaType> getAcceptableMediaTypes(HttpServletRequest request) throws HttpMediaTypeNotAcceptableException {
 		List<MediaType> mediaTypes = this.contentNegotiationManager.resolveMediaTypes(new ServletWebRequest(request));
-		return mediaTypes.isEmpty() ? Collections.singletonList(MediaType.ALL) : mediaTypes;
+		return (mediaTypes.isEmpty() ? Collections.singletonList(MediaType.ALL) : mediaTypes);
 	}
 
 	/**
@@ -195,8 +215,70 @@ private List<MediaType> getAcceptableMediaTypes(HttpServletRequest request) thro
 	 * with the q-value of the former.
 	 */
 	private MediaType getMostSpecificMediaType(MediaType acceptType, MediaType produceType) {
-		produceType = produceType.copyQualityValue(acceptType);
-		return MediaType.SPECIFICITY_COMPARATOR.compare(acceptType, produceType) <= 0 ? acceptType : produceType;
+		MediaType produceTypeToUse = produceType.copyQualityValue(acceptType);
+		return (MediaType.SPECIFICITY_COMPARATOR.compare(acceptType, produceTypeToUse) <= 0 ? acceptType : produceTypeToUse);
+	}
+
+	/**
+	 * Check if the path has a file extension and whether the extension is either
+	 * {@link #WHITELISTED_EXTENSIONS whitelisted} or
+	 * {@link ContentNegotiationManager#getAllFileExtensions() explicitly
+	 * registered}. If not add a 'Content-Disposition' header with a safe
+	 * attachment file name ("f.txt") to prevent RFD exploits.
+	 */
+	private void addContentDispositionHeader(ServletServerHttpRequest request,
+			ServletServerHttpResponse response) {
+
+		HttpHeaders headers = response.getHeaders();
+		if (headers.containsKey("Content-Disposition")) {
+			return;
+		}
+
+		HttpServletRequest servletRequest = request.getServletRequest();
+		String requestUri = RAW_URL_PATH_HELPER.getOriginatingRequestUri(servletRequest);
+
+		int index = requestUri.lastIndexOf('/') + 1;
+		String filename = requestUri.substring(index);
+		String pathParams = "";
+
+		index = filename.indexOf(';');
+		if (index != -1) {
+			pathParams = filename.substring(index);
+			filename = filename.substring(0, index);
+		}
+
+		filename = DECODING_URL_PATH_HELPER.decodeRequestString(servletRequest, filename);
+		String ext = StringUtils.getFilenameExtension(filename);
+
+		pathParams = DECODING_URL_PATH_HELPER.decodeRequestString(servletRequest, pathParams);
+		String extInPathParams = StringUtils.getFilenameExtension(pathParams);
+
+		if (!safeExtension(servletRequest, ext) || !safeExtension(servletRequest, extInPathParams)) {
+			headers.add("Content-Disposition", "inline;filename=f.txt");
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private boolean safeExtension(HttpServletRequest request, String extension) {
+		if (!StringUtils.hasText(extension)) {
+			return true;
+		}
+		extension = extension.toLowerCase(Locale.ENGLISH);
+		if (this.safeExtensions.contains(extension)) {
+			return true;
+		}
+		String pattern = (String) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
+		if (pattern != null && pattern.endsWith("." + extension)) {
+			return true;
+		}
+		if (extension.equals("html")) {
+			String name = HandlerMapping.PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE;
+			Set<MediaType> mediaTypes = (Set<MediaType>) request.getAttribute(name);
+			if (!CollectionUtils.isEmpty(mediaTypes) && mediaTypes.contains(MediaType.TEXT_HTML)) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
index 757d2744dd..8b0645f807 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.Source;
 
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -68,34 +67,31 @@
  * @author Rossen Stoyanchev
  * @since 3.1
  */
-public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExceptionResolver implements
-		InitializingBean, ApplicationContextAware {
+public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExceptionResolver
+		implements ApplicationContextAware, InitializingBean {
 
 	private List<HandlerMethodArgumentResolver> customArgumentResolvers;
 
+	private HandlerMethodArgumentResolverComposite argumentResolvers;
+
 	private List<HandlerMethodReturnValueHandler> customReturnValueHandlers;
 
+	private HandlerMethodReturnValueHandlerComposite returnValueHandlers;
+
 	private List<HttpMessageConverter<?>> messageConverters;
 
 	private ContentNegotiationManager contentNegotiationManager = new ContentNegotiationManager();
 
+	private ApplicationContext applicationContext;
+
 	private final Map<Class<?>, ExceptionHandlerMethodResolver> exceptionHandlerCache =
 			new ConcurrentHashMap<Class<?>, ExceptionHandlerMethodResolver>(64);
 
 	private final Map<ControllerAdviceBean, ExceptionHandlerMethodResolver> exceptionHandlerAdviceCache =
 			new LinkedHashMap<ControllerAdviceBean, ExceptionHandlerMethodResolver>();
 
-	private HandlerMethodArgumentResolverComposite argumentResolvers;
-
-	private HandlerMethodReturnValueHandlerComposite returnValueHandlers;
-
-	private ApplicationContext applicationContext;
 
-	/**
-	 * Default constructor.
-	 */
 	public ExceptionHandlerExceptionResolver() {
-
 		StringHttpMessageConverter stringHttpMessageConverter = new StringHttpMessageConverter();
 		stringHttpMessageConverter.setWriteAcceptCharset(false); // See SPR-7316
 
@@ -106,6 +102,7 @@ public ExceptionHandlerExceptionResolver() {
 		this.messageConverters.add(new AllEncompassingFormHttpMessageConverter());
 	}
 
+
 	/**
 	 * Provide resolvers for custom argument types. Custom resolvers are ordered
 	 * after built-in ones. To override the built-in support for argument
@@ -194,7 +191,7 @@ public void setMessageConverters(List<HttpMessageConverter<?>> messageConverters
 	 * Return the configured message body converters.
 	 */
 	public List<HttpMessageConverter<?>> getMessageConverters() {
-		return messageConverters;
+		return this.messageConverters;
 	}
 
 	/**
@@ -205,7 +202,7 @@ public void setContentNegotiationManager(ContentNegotiationManager contentNegoti
 		this.contentNegotiationManager = contentNegotiationManager;
 	}
 
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 	}
 
@@ -213,6 +210,7 @@ public ApplicationContext getApplicationContext() {
 		return this.applicationContext;
 	}
 
+
 	public void afterPropertiesSet() {
 		if (this.argumentResolvers == null) {
 			List<HandlerMethodArgumentResolver> resolvers = getDefaultArgumentResolvers();
@@ -296,6 +294,7 @@ private void initExceptionHandlerAdviceCache() {
 		}
 	}
 
+
 	/**
 	 * Find an {@code @ExceptionHandler} method and invoke it to handle the raised exception.
 	 */
@@ -321,7 +320,9 @@ protected ModelAndView doResolveHandlerMethodException(HttpServletRequest reques
 			exceptionHandlerMethod.invokeAndHandle(webRequest, mavContainer, exception);
 		}
 		catch (Exception invocationEx) {
-			logger.error("Failed to invoke @ExceptionHandler method: " + exceptionHandlerMethod, invocationEx);
+			if (logger.isErrorEnabled()) {
+				logger.error("Failed to invoke @ExceptionHandler method: " + exceptionHandlerMethod, invocationEx);
+			}
 			return null;
 		}
 
@@ -344,7 +345,7 @@ protected ModelAndView doResolveHandlerMethodException(HttpServletRequest reques
 	 * and if not found, it continues searching for additional {@code @ExceptionHandler}
 	 * methods assuming some {@linkplain ControllerAdvice @ControllerAdvice}
 	 * Spring-managed beans were detected.
-	 * @param handlerMethod the method where the exception was raised, possibly {@code null}
+	 * @param handlerMethod the method where the exception was raised (may be {@code null})
 	 * @param exception the raised exception
 	 * @return a method to handle the exception, or {@code null}
 	 */
@@ -361,12 +362,14 @@ protected ServletInvocableHandlerMethod getExceptionHandlerMethod(HandlerMethod
 				return new ServletInvocableHandlerMethod(handlerMethod.getBean(), method);
 			}
 		}
+
 		for (Entry<ControllerAdviceBean, ExceptionHandlerMethodResolver> entry : this.exceptionHandlerAdviceCache.entrySet()) {
 			Method method = entry.getValue().resolveMethod(exception);
 			if (method != null) {
 				return new ServletInvocableHandlerMethod(entry.getKey().resolveBean(), method);
 			}
 		}
+
 		return null;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
index edb113e607..4f02a0b735 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
@@ -61,18 +61,16 @@ public HttpEntityMethodProcessor(List<HttpMessageConverter<?>> messageConverters
 		super(messageConverters, contentNegotiationManager);
 	}
 
+
 	public boolean supportsParameter(MethodParameter parameter) {
-		Class<?> parameterType = parameter.getParameterType();
-		return HttpEntity.class.equals(parameterType);
+		return HttpEntity.class.equals(parameter.getParameterType());
 	}
 
 	public boolean supportsReturnType(MethodParameter returnType) {
-		Class<?> parameterType = returnType.getParameterType();
-		return HttpEntity.class.isAssignableFrom(parameterType) || ResponseEntity.class.isAssignableFrom(parameterType);
+		return HttpEntity.class.isAssignableFrom(returnType.getParameterType());
 	}
 
-	public Object resolveArgument(
-			MethodParameter parameter, ModelAndViewContainer mavContainer,
+	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
 			throws IOException, HttpMediaTypeNotSupportedException {
 
@@ -85,22 +83,21 @@ public Object resolveArgument(
 
 	private Type getHttpEntityType(MethodParameter parameter) {
 		Assert.isAssignable(HttpEntity.class, parameter.getParameterType());
-		ParameterizedType type = (ParameterizedType) parameter.getGenericParameterType();
-		if (type.getActualTypeArguments().length == 1) {
-			return type.getActualTypeArguments()[0];
+		Type parameterType = parameter.getGenericParameterType();
+		if (parameterType instanceof ParameterizedType) {
+			ParameterizedType type = (ParameterizedType) parameterType;
+			if (type.getActualTypeArguments().length == 1) {
+				return type.getActualTypeArguments()[0];
+			}
 		}
-		throw new IllegalArgumentException("HttpEntity parameter ("
-				+ parameter.getParameterName() + ") in method " + parameter.getMethod()
-				+ " is not parameterized or has more than one parameter");
+		throw new IllegalArgumentException("HttpEntity parameter '" + parameter.getParameterName() +
+				"' in method " + parameter.getMethod() + " is not parameterized or has more than one parameter");
 	}
 
-	public void handleReturnValue(
-			Object returnValue, MethodParameter returnType,
-			ModelAndViewContainer mavContainer, NativeWebRequest webRequest)
-			throws Exception {
+	public void handleReturnValue(Object returnValue, MethodParameter returnType,
+			ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception {
 
 		mavContainer.setRequestHandled(true);
-
 		if (returnValue == null) {
 			return;
 		}
@@ -124,7 +121,7 @@ public void handleReturnValue(
 			writeWithMessageConverters(body, returnType, inputMessage, outputMessage);
 		}
 		else {
-			// flush headers to the HttpServletResponse
+			// Flush headers to the HttpServletResponse
 			outputMessage.getBody();
 		}
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
index 848e912703..38b593bd62 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -63,11 +62,11 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.context.request.async.WebAsyncTask;
 import org.springframework.web.context.request.async.AsyncWebRequest;
 import org.springframework.web.context.request.async.CallableProcessingInterceptor;
 import org.springframework.web.context.request.async.DeferredResultProcessingInterceptor;
 import org.springframework.web.context.request.async.WebAsyncManager;
+import org.springframework.web.context.request.async.WebAsyncTask;
 import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.method.ControllerAdviceBean;
 import org.springframework.web.method.HandlerMethod;
@@ -113,8 +112,8 @@
  * @see HandlerMethodArgumentResolver
  * @see HandlerMethodReturnValueHandler
  */
-public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter implements BeanFactoryAware,
-		InitializingBean {
+public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter
+		implements BeanFactoryAware, InitializingBean {
 
 	private List<HandlerMethodArgumentResolver> customArgumentResolvers;
 
@@ -138,9 +137,9 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter i
 
 	private Long asyncRequestTimeout;
 
-	private CallableProcessingInterceptor[] callableInterceptors = new CallableProcessingInterceptor[] {};
+	private CallableProcessingInterceptor[] callableInterceptors = new CallableProcessingInterceptor[0];
 
-	private DeferredResultProcessingInterceptor[] deferredResultInterceptors = new DeferredResultProcessingInterceptor[] {};
+	private DeferredResultProcessingInterceptor[] deferredResultInterceptors = new DeferredResultProcessingInterceptor[0];
 
 	private boolean ignoreDefaultModelOnRedirect = false;
 
@@ -169,21 +168,18 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter i
 			new LinkedHashMap<ControllerAdviceBean, Set<Method>>();
 
 
-	/**
-	 * Default constructor.
-	 */
 	public RequestMappingHandlerAdapter() {
-
 		StringHttpMessageConverter stringHttpMessageConverter = new StringHttpMessageConverter();
-		stringHttpMessageConverter.setWriteAcceptCharset(false); // See SPR-7316
+		stringHttpMessageConverter.setWriteAcceptCharset(false);  // see SPR-7316
 
-		this.messageConverters = new ArrayList<HttpMessageConverter<?>>();
+		this.messageConverters = new ArrayList<HttpMessageConverter<?>>(4);
 		this.messageConverters.add(new ByteArrayHttpMessageConverter());
 		this.messageConverters.add(stringHttpMessageConverter);
 		this.messageConverters.add(new SourceHttpMessageConverter<Source>());
 		this.messageConverters.add(new AllEncompassingFormHttpMessageConverter());
 	}
 
+
 	/**
 	 * Provide resolvers for custom argument types. Custom resolvers are ordered
 	 * after built-in ones. To override the built-in support for argument
@@ -306,6 +302,14 @@ public List<ModelAndViewResolver> getModelAndViewResolvers() {
 		return modelAndViewResolvers;
 	}
 
+	/**
+	 * Set the {@link ContentNegotiationManager} to use to determine requested media types.
+	 * If not set, the default constructor is used.
+	 */
+	public void setContentNegotiationManager(ContentNegotiationManager contentNegotiationManager) {
+		this.contentNegotiationManager = contentNegotiationManager;
+	}
+
 	/**
 	 * Provide the converters to use in argument resolvers and return value
 	 * handlers that support reading and/or writing to the body of the
@@ -315,19 +319,11 @@ public void setMessageConverters(List<HttpMessageConverter<?>> messageConverters
 		this.messageConverters = messageConverters;
 	}
 
-	/**
-	 * Set the {@link ContentNegotiationManager} to use to determine requested media types.
-	 * If not set, the default constructor is used.
-	 */
-	public void setContentNegotiationManager(ContentNegotiationManager contentNegotiationManager) {
-		this.contentNegotiationManager = contentNegotiationManager;
-	}
-
 	/**
 	 * Return the configured message body converters.
 	 */
 	public List<HttpMessageConverter<?>> getMessageConverters() {
-		return messageConverters;
+		return this.messageConverters;
 	}
 
 	/**
@@ -339,10 +335,10 @@ public void setWebBindingInitializer(WebBindingInitializer webBindingInitializer
 	}
 
 	/**
-	 * Return the configured WebBindingInitializer, or {@code null}.
+	 * Return the configured WebBindingInitializer, or {@code null} if none.
 	 */
 	public WebBindingInitializer getWebBindingInitializer() {
-		return webBindingInitializer;
+		return this.webBindingInitializer;
 	}
 
 	/**
@@ -452,18 +448,17 @@ public void setSynchronizeOnSession(boolean synchronizeOnSession) {
 	}
 
 	/**
-	 * Set the ParameterNameDiscoverer to use for resolving method parameter
-	 * names if needed (e.g. for default attribute names). Default is a
-	 * {@link org.springframework.core.LocalVariableTableParameterNameDiscoverer}.
+	 * Set the ParameterNameDiscoverer to use for resolving method parameter names if needed
+	 * (e.g. for default attribute names).
+	 * <p>Default is a {@link org.springframework.core.LocalVariableTableParameterNameDiscoverer}.
 	 */
 	public void setParameterNameDiscoverer(ParameterNameDiscoverer parameterNameDiscoverer) {
 		this.parameterNameDiscoverer = parameterNameDiscoverer;
 	}
 
 	/**
-	 * {@inheritDoc}
-	 * <p>A {@link ConfigurableBeanFactory} is expected for resolving
-	 * expressions in method argument default values.
+	 * A {@link ConfigurableBeanFactory} is expected for resolving expressions
+	 * in method argument default values.
 	 */
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (beanFactory instanceof ConfigurableBeanFactory) {
@@ -472,12 +467,13 @@ public void setBeanFactory(BeanFactory beanFactory) {
 	}
 
 	/**
-	 * Return the owning factory of this bean instance, or {@code null}.
+	 * Return the owning factory of this bean instance, or {@code null} if none.
 	 */
 	protected ConfigurableBeanFactory getBeanFactory() {
 		return this.beanFactory;
 	}
 
+
 	public void afterPropertiesSet() {
 		if (this.argumentResolvers == null) {
 			List<HandlerMethodArgumentResolver> resolvers = getDefaultArgumentResolvers();
@@ -635,6 +631,7 @@ private void initControllerAdviceCache() {
 		}
 	}
 
+
 	/**
 	 * Always return {@code true} since any method argument and return value
 	 * type will be processed in some way. A method argument not recognized
@@ -648,17 +645,6 @@ protected boolean supportsInternal(HandlerMethod handlerMethod) {
 		return true;
 	}
 
-	/**
-	 * This implementation always returns -1. An {@code @RequestMapping}
-	 * method can calculate the lastModified value, call
-	 * {@link WebRequest#checkNotModified(long)}, and return {@code null}
-	 * if the result of that call is {@code true}.
-	 */
-	@Override
-	protected long getLastModifiedInternal(HttpServletRequest request, HandlerMethod handlerMethod) {
-		return -1;
-	}
-
 	@Override
 	protected final ModelAndView handleInternal(HttpServletRequest request,
 			HttpServletResponse response, HandlerMethod handlerMethod) throws Exception {
@@ -687,14 +673,25 @@ protected final ModelAndView handleInternal(HttpServletRequest request,
 	}
 
 	/**
-	 * Return the {@link SessionAttributesHandler} instance for the given
-	 * handler type, never {@code null}.
+	 * This implementation always returns -1. An {@code @RequestMapping} method can
+	 * calculate the lastModified value, call {@link WebRequest#checkNotModified(long)},
+	 * and return {@code null} if the result of that call is {@code true}.
+	 */
+	@Override
+	protected long getLastModifiedInternal(HttpServletRequest request, HandlerMethod handlerMethod) {
+		return -1;
+	}
+
+
+	/**
+	 * Return the {@link SessionAttributesHandler} instance for the given handler type
+	 * (never {@code null}).
 	 */
 	private SessionAttributesHandler getSessionAttributesHandler(HandlerMethod handlerMethod) {
 		Class<?> handlerType = handlerMethod.getBeanType();
 		SessionAttributesHandler sessionAttrHandler = this.sessionAttributesHandlerCache.get(handlerType);
 		if (sessionAttrHandler == null) {
-			synchronized(this.sessionAttributesHandlerCache) {
+			synchronized (this.sessionAttributesHandlerCache) {
 				sessionAttrHandler = this.sessionAttributesHandlerCache.get(handlerType);
 				if (sessionAttrHandler == null) {
 					sessionAttrHandler = new SessionAttributesHandler(handlerType, sessionAttributeStore);
@@ -706,7 +703,8 @@ private SessionAttributesHandler getSessionAttributesHandler(HandlerMethod handl
 	}
 
 	/**
-	 * Invoke the {@link RequestMapping} handler method preparing a {@link ModelAndView} if view resolution is required.
+	 * Invoke the {@link RequestMapping} handler method preparing a {@link ModelAndView}
+	 * if view resolution is required.
 	 */
 	private ModelAndView invokeHandleMethod(HttpServletRequest request,
 			HttpServletResponse response, HandlerMethod handlerMethod) throws Exception {
@@ -772,16 +770,17 @@ private ModelFactory getModelFactory(HandlerMethod handlerMethod, WebDataBinderF
 			this.modelAttributeCache.put(handlerType, methods);
 		}
 		List<InvocableHandlerMethod> attrMethods = new ArrayList<InvocableHandlerMethod>();
-		for (Method method : methods) {
-			Object bean = handlerMethod.getBean();
-			attrMethods.add(createModelAttributeMethod(binderFactory, bean, method));
-		}
+		// Global methods first
 		for (Entry<ControllerAdviceBean, Set<Method>> entry : this.modelAttributeAdviceCache.entrySet()) {
 			Object bean = entry.getKey().resolveBean();
 			for (Method method : entry.getValue()) {
 				attrMethods.add(createModelAttributeMethod(binderFactory, bean, method));
 			}
 		}
+		for (Method method : methods) {
+			Object bean = handlerMethod.getBean();
+			attrMethods.add(createModelAttributeMethod(binderFactory, bean, method));
+		}
 		return new ModelFactory(attrMethods, binderFactory, sessionAttrHandler);
 	}
 
@@ -801,16 +800,17 @@ private WebDataBinderFactory getDataBinderFactory(HandlerMethod handlerMethod) t
 			this.initBinderCache.put(handlerType, methods);
 		}
 		List<InvocableHandlerMethod> initBinderMethods = new ArrayList<InvocableHandlerMethod>();
-		for (Method method : methods) {
-			Object bean = handlerMethod.getBean();
-			initBinderMethods.add(createInitBinderMethod(bean, method));
-		}
+		// Global methods first
 		for (Entry<ControllerAdviceBean, Set<Method>> entry : this.initBinderAdviceCache .entrySet()) {
 			Object bean = entry.getKey().resolveBean();
 			for (Method method : entry.getValue()) {
 				initBinderMethods.add(createInitBinderMethod(bean, method));
 			}
 		}
+		for (Method method : methods) {
+			Object bean = handlerMethod.getBean();
+			initBinderMethods.add(createInitBinderMethod(bean, method));
+		}
 		return createDataBinderFactory(initBinderMethods);
 	}
 
@@ -840,7 +840,6 @@ private ModelAndView getModelAndView(ModelAndViewContainer mavContainer,
 			ModelFactory modelFactory, NativeWebRequest webRequest) throws Exception {
 
 		modelFactory.updateModel(webRequest, mavContainer);
-
 		if (mavContainer.isRequestHandled()) {
 			return null;
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
index bb9ddd72b1..b4a4a0fcbe 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,7 +78,6 @@ public void setUseSuffixPatternMatch(boolean useSuffixPatternMatch) {
 	/**
 	 * Whether to use suffix pattern match for registered file extensions only
 	 * when matching patterns to requests.
-	 *
 	 * <p>If enabled, a controller method mapped to "/users" also matches to
 	 * "/users.json" assuming ".json" is a file extension registered with the
 	 * provided {@link #setContentNegotiationManager(ContentNegotiationManager)
@@ -87,14 +86,13 @@ public void setUseSuffixPatternMatch(boolean useSuffixPatternMatch) {
 	 * can lead to ambiguous interpretation of path variable content, (e.g. given
 	 * "/users/{user}" and incoming URLs such as "/users/john.j.joe" and
 	 * "/users/john.j.joe.json").
-	 *
 	 * <p>If enabled, this flag also enables
 	 * {@link #setUseSuffixPatternMatch(boolean) useSuffixPatternMatch}. The
 	 * default value is {@code false}.
 	 */
-	public void setUseRegisteredSuffixPatternMatch(boolean useRegsiteredSuffixPatternMatch) {
-		this.useRegisteredSuffixPatternMatch = useRegsiteredSuffixPatternMatch;
-		this.useSuffixPatternMatch = useRegsiteredSuffixPatternMatch ? true : this.useSuffixPatternMatch;
+	public void setUseRegisteredSuffixPatternMatch(boolean useRegisteredSuffixPatternMatch) {
+		this.useRegisteredSuffixPatternMatch = useRegisteredSuffixPatternMatch;
+		this.useSuffixPatternMatch = (useRegisteredSuffixPatternMatch || this.useSuffixPatternMatch);
 	}
 
 	/**
@@ -106,20 +104,30 @@ public void setUseTrailingSlashMatch(boolean useTrailingSlashMatch) {
 		this.useTrailingSlashMatch = useTrailingSlashMatch;
 	}
 
-	@Override
-	public void setEmbeddedValueResolver(StringValueResolver resolver) {
-		this.embeddedValueResolver  = resolver;
-	}
-
 	/**
 	 * Set the {@link ContentNegotiationManager} to use to determine requested media types.
 	 * If not set, the default constructor is used.
 	 */
 	public void setContentNegotiationManager(ContentNegotiationManager contentNegotiationManager) {
-		Assert.notNull(contentNegotiationManager);
+		Assert.notNull(contentNegotiationManager, "ContentNegotiationManager must not be null");
 		this.contentNegotiationManager = contentNegotiationManager;
 	}
 
+	@Override
+	public void setEmbeddedValueResolver(StringValueResolver resolver) {
+		this.embeddedValueResolver  = resolver;
+	}
+
+	@Override
+	public void afterPropertiesSet() {
+		if (this.useRegisteredSuffixPatternMatch) {
+			this.fileExtensions.addAll(this.contentNegotiationManager.getAllFileExtensions());
+		}
+		super.afterPropertiesSet();
+	}
+
+
+
 	/**
 	 * Whether to use suffix pattern matching.
 	 */
@@ -131,11 +139,11 @@ public boolean useSuffixPatternMatch() {
 	 * Whether to use registered suffixes for pattern matching.
 	 */
 	public boolean useRegisteredSuffixPatternMatch() {
-		return useRegisteredSuffixPatternMatch;
+		return this.useRegisteredSuffixPatternMatch;
 	}
 
 	/**
-	 * Whether to match to URLs irrespective of the presence of a trailing  slash.
+	 * Whether to match to URLs irrespective of the presence of a trailing slash.
 	 */
 	public boolean useTrailingSlashMatch() {
 		return this.useTrailingSlashMatch;
@@ -155,13 +163,6 @@ public List<String> getFileExtensions() {
 		return this.fileExtensions;
 	}
 
-	@Override
-	public void afterPropertiesSet() {
-		if (this.useRegisteredSuffixPatternMatch) {
-			this.fileExtensions.addAll(contentNegotiationManager.getAllFileExtensions());
-		}
-		super.afterPropertiesSet();
-	}
 
 	/**
 	 * {@inheritDoc}
@@ -176,10 +177,8 @@ protected boolean isHandler(Class<?> beanType) {
 	/**
 	 * Uses method and type-level @{@link RequestMapping} annotations to create
 	 * the RequestMappingInfo.
-	 *
 	 * @return the created RequestMappingInfo, or {@code null} if the method
 	 * does not have a {@code @RequestMapping} annotation.
-	 *
 	 * @see #getCustomMethodCondition(Method)
 	 * @see #getCustomTypeCondition(Class)
 	 */
@@ -204,11 +203,9 @@ protected RequestMappingInfo getMappingForMethod(Method method, Class<?> handler
 	 * The custom {@link RequestCondition} can be of any type so long as the
 	 * same condition type is returned from all calls to this method in order
 	 * to ensure custom request conditions can be combined and compared.
-	 *
 	 * <p>Consider extending {@link AbstractRequestCondition} for custom
 	 * condition types and using {@link CompositeRequestCondition} to provide
 	 * multiple custom conditions.
-	 *
 	 * @param handlerType the handler type for which to create the condition
 	 * @return the condition, or {@code null}
 	 */
@@ -221,11 +218,9 @@ protected RequestCondition<?> getCustomTypeCondition(Class<?> handlerType) {
 	 * The custom {@link RequestCondition} can be of any type so long as the
 	 * same condition type is returned from all calls to this method in order
 	 * to ensure custom request conditions can be combined and compared.
-	 *
 	 * <p>Consider extending {@link AbstractRequestCondition} for custom
 	 * condition types and using {@link CompositeRequestCondition} to provide
 	 * multiple custom conditions.
-	 *
 	 * @param method the handler method for which to create the condition
 	 * @return the condition, or {@code null}
 	 */
@@ -236,7 +231,7 @@ protected RequestCondition<?> getCustomMethodCondition(Method method) {
 	/**
 	 * Created a RequestMappingInfo from a RequestMapping annotation.
 	 */
-	private RequestMappingInfo createRequestMappingInfo(RequestMapping annotation, RequestCondition<?> customCondition) {
+	protected RequestMappingInfo createRequestMappingInfo(RequestMapping annotation, RequestCondition<?> customCondition) {
 		String[] patterns = resolveEmbeddedValuesInPatterns(annotation.value());
 		return new RequestMappingInfo(
 				new PatternsRequestCondition(patterns, getUrlPathHelper(), getPathMatcher(),
@@ -259,7 +254,7 @@ protected String[] resolveEmbeddedValuesInPatterns(String[] patterns) {
 		}
 		else {
 			String[] resolvedPatterns = new String[patterns.length];
-			for (int i=0; i < patterns.length; i++) {
+			for (int i = 0; i < patterns.length; i++) {
 				resolvedPatterns[i] = this.embeddedValueResolver.resolveStringValue(patterns[i]);
 			}
 			return resolvedPatterns;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
index cea6c55783..96aa5ea93d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,18 +49,15 @@
 /**
  * Resolves the following method arguments:
  * <ul>
- * 	<li>Annotated with {@code @RequestPart}
- * 	<li>Of type {@link MultipartFile} in conjunction with Spring's
- *  {@link MultipartResolver} abstraction
- * 	<li>Of type {@code javax.servlet.http.Part} in conjunction with
- * 	Servlet 3.0 multipart requests
+ * <li>Annotated with {@code @RequestPart}
+ * <li>Of type {@link MultipartFile} in conjunction with Spring's {@link MultipartResolver} abstraction
+ * <li>Of type {@code javax.servlet.http.Part} in conjunction with Servlet 3.0 multipart requests
  * </ul>
  *
- * <p>When a parameter is annotated with {@code @RequestPart} the content of the
- * part is passed through an {@link HttpMessageConverter} to resolve the method
- * argument with the 'Content-Type' of the request part in mind. This is
- * analogous to what @{@link RequestBody} does to resolve an argument based on
- * the content of a regular request.
+ * <p>When a parameter is annotated with {@code @RequestPart}, the content of the part is
+ * passed through an {@link HttpMessageConverter} to resolve the method argument with the
+ * 'Content-Type' of the request part in mind. This is analogous to what @{@link RequestBody}
+ * does to resolve an argument based on the content of a regular request.
  *
  * <p>When a parameter is not annotated or the name of the part is not specified,
  * it is derived from the name of the method argument.
@@ -79,12 +76,13 @@ public RequestPartMethodArgumentResolver(List<HttpMessageConverter<?>> messageCo
 		super(messageConverters);
 	}
 
+
 	/**
 	 * Supports the following:
 	 * <ul>
-	 * 	<li>Annotated with {@code @RequestPart}
-	 * 	<li>Of type {@link MultipartFile} unless annotated with {@code @RequestParam}.
-	 * 	<li>Of type {@code javax.servlet.http.Part} unless annotated with {@code @RequestParam}.
+	 * <li>annotated with {@code @RequestPart}
+	 * <li>of type {@link MultipartFile} unless annotated with {@code @RequestParam}
+	 * <li>of type {@code javax.servlet.http.Part} unless annotated with {@code @RequestParam}
 	 * </ul>
 	 */
 	public boolean supportsParameter(MethodParameter parameter) {
@@ -114,7 +112,7 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
 		assertIsMultipartRequest(servletRequest);
 
 		MultipartHttpServletRequest multipartRequest =
-			WebUtils.getNativeRequest(servletRequest, MultipartHttpServletRequest.class);
+				WebUtils.getNativeRequest(servletRequest, MultipartHttpServletRequest.class);
 
 		String partName = getPartName(parameter);
 		Object arg;
@@ -146,8 +144,8 @@ else if ("javax.servlet.http.Part".equals(parameter.getParameterType().getName()
 			}
 		}
 
-		RequestPart annot = parameter.getParameterAnnotation(RequestPart.class);
-		boolean isRequired = (annot == null || annot.required());
+		RequestPart ann = parameter.getParameterAnnotation(RequestPart.class);
+		boolean isRequired = (ann == null || ann.required());
 
 		if (arg == null && isRequired) {
 			throw new MissingServletRequestPartException(partName);
@@ -163,56 +161,66 @@ private static void assertIsMultipartRequest(HttpServletRequest request) {
 		}
 	}
 
-	private String getPartName(MethodParameter parameter) {
-		RequestPart annot = parameter.getParameterAnnotation(RequestPart.class);
-		String partName = (annot != null) ? annot.value() : "";
+	private String getPartName(MethodParameter methodParam) {
+		RequestPart ann = methodParam.getParameterAnnotation(RequestPart.class);
+		String partName = (ann != null ? ann.value() : "");
 		if (partName.length() == 0) {
-			partName = parameter.getParameterName();
-			Assert.notNull(partName, "Request part name for argument type [" + parameter.getParameterType().getName()
-					+ "] not available, and parameter name information not found in class file either.");
+			partName = methodParam.getParameterName();
+			if (partName == null) {
+				throw new IllegalArgumentException("Request part name for argument type [" +
+						methodParam.getNestedParameterType().getName() +
+						"] not specified, and parameter name information not found in class file either.");
+			}
 		}
 		return partName;
 	}
 
-	private boolean isMultipartFileCollection(MethodParameter parameter) {
-		Class<?> paramType = parameter.getParameterType();
+	private boolean isMultipartFileCollection(MethodParameter methodParam) {
+		Class<?> paramType = methodParam.getParameterType();
 		if (Collection.class.equals(paramType) || List.class.isAssignableFrom(paramType)){
-			Class<?> valueType = GenericCollectionTypeResolver.getCollectionParameterType(parameter);
-			if (valueType != null && valueType.equals(MultipartFile.class)) {
+			Class<?> valueType = GenericCollectionTypeResolver.getCollectionParameterType(methodParam);
+			if (MultipartFile.class.equals(valueType)) {
 				return true;
 			}
 		}
 		return false;
 	}
 
-	private void validate(WebDataBinder binder, MethodParameter parameter) throws MethodArgumentNotValidException {
-
-		Annotation[] annotations = parameter.getParameterAnnotations();
-		for (Annotation annot : annotations) {
-			if (annot.annotationType().getSimpleName().startsWith("Valid")) {
-				Object hints = AnnotationUtils.getValue(annot);
+	/**
+	 * Validate the request part if applicable.
+	 * <p>The default implementation checks for {@code @javax.validation.Valid},
+	 * Spring's {@link org.springframework.validation.annotation.Validated},
+	 * and custom annotations whose name starts with "Valid".
+	 * @param binder the DataBinder to be used
+	 * @param methodParam the method parameter
+	 * @throws MethodArgumentNotValidException in case of a binding error which
+	 * is meant to be fatal (i.e. without a declared {@link Errors} parameter)
+	 */
+	private void validate(WebDataBinder binder, MethodParameter methodParam) throws MethodArgumentNotValidException {
+		Annotation[] annotations = methodParam.getParameterAnnotations();
+		for (Annotation ann : annotations) {
+			if (ann.annotationType().getSimpleName().startsWith("Valid")) {
+				Object hints = AnnotationUtils.getValue(ann);
 				binder.validate(hints instanceof Object[] ? (Object[]) hints : new Object[] {hints});
 				BindingResult bindingResult = binder.getBindingResult();
-				if (bindingResult.hasErrors()) {
-					if (isBindExceptionRequired(binder, parameter)) {
-						throw new MethodArgumentNotValidException(parameter, bindingResult);
-					}
+				if (bindingResult.hasErrors() && isBindExceptionRequired(binder, methodParam)) {
+					throw new MethodArgumentNotValidException(methodParam, bindingResult);
 				}
+				break;
 			}
 		}
 	}
 
 	/**
-	 * Whether to raise a {@link MethodArgumentNotValidException} on validation errors.
+	 * Whether to raise a fatal bind exception on validation errors.
 	 * @param binder the data binder used to perform data binding
-	 * @param parameter the method argument
-	 * @return {@code true} if the next method argument is not of type {@link Errors}.
+	 * @param methodParam the method argument
+	 * @return {@code true} if the next method argument is not of type {@link Errors}
 	 */
-	private boolean isBindExceptionRequired(WebDataBinder binder, MethodParameter parameter) {
-		int i = parameter.getParameterIndex();
-		Class<?>[] paramTypes = parameter.getMethod().getParameterTypes();
+	private boolean isBindExceptionRequired(WebDataBinder binder, MethodParameter methodParam) {
+		int i = methodParam.getParameterIndex();
+		Class<?>[] paramTypes = methodParam.getMethod().getParameterTypes();
 		boolean hasBindingResult = (paramTypes.length > (i + 1) && Errors.class.isAssignableFrom(paramTypes[i + 1]));
-
 		return !hasBindingResult;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
index a7473a60f1..a3d786ee33 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.core.Conventions;
@@ -47,16 +46,14 @@
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
 
 /**
- * Resolves method arguments annotated with {@code @RequestBody} and handles
- * return values from methods annotated with {@code @ResponseBody} by reading
- * and writing to the body of the request or response with an
- * {@link HttpMessageConverter}.
+ * Resolves method arguments annotated with {@code @RequestBody} and handles return
+ * values from methods annotated with {@code @ResponseBody} by reading and writing
+ * to the body of the request or response with an {@link HttpMessageConverter}.
  *
- * <p>An {@code @RequestBody} method argument is also validated if it is
- * annotated with {@code @javax.validation.Valid}. In case of validation
- * failure, {@link MethodArgumentNotValidException} is raised and results
- * in a 400 response status code if {@link DefaultHandlerExceptionResolver}
- * is configured.
+ * <p>An {@code @RequestBody} method argument is also validated if it is annotated
+ * with {@code @javax.validation.Valid}. In case of validation failure,
+ * {@link MethodArgumentNotValidException} is raised and results in an HTTP 400
+ * response status code if {@link DefaultHandlerExceptionResolver} is configured.
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
@@ -74,50 +71,53 @@ public RequestResponseBodyMethodProcessor(List<HttpMessageConverter<?>> messageC
 		super(messageConverters, contentNegotiationManager);
 	}
 
+
 	public boolean supportsParameter(MethodParameter parameter) {
 		return parameter.hasParameterAnnotation(RequestBody.class);
 	}
 
 	public boolean supportsReturnType(MethodParameter returnType) {
-		return returnType.getMethodAnnotation(ResponseBody.class) != null;
+		return (returnType.getMethodAnnotation(ResponseBody.class) != null);
 	}
 
 	/**
-	 * {@inheritDoc}
-	 * @throws MethodArgumentNotValidException if validation fails
+	 * Throws MethodArgumentNotValidException if validation fails.
 	 * @throws HttpMessageNotReadableException if {@link RequestBody#required()}
-	 * 	is {@code true} and there is no body content or if there is no suitable
-	 * 	converter to read the content with.
+	 * is {@code true} and there is no body content or if there is no suitable
+	 * converter to read the content with.
 	 */
 	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
 
-		Object argument = readWithMessageConverters(webRequest, parameter, parameter.getGenericParameterType());
-
+		Object arg = readWithMessageConverters(webRequest, parameter, parameter.getGenericParameterType());
 		String name = Conventions.getVariableNameForParameter(parameter);
-		WebDataBinder binder = binderFactory.createBinder(webRequest, argument, name);
-
-		if (argument != null) {
+		WebDataBinder binder = binderFactory.createBinder(webRequest, arg, name);
+		if (arg != null) {
 			validate(binder, parameter);
 		}
-
 		mavContainer.addAttribute(BindingResult.MODEL_KEY_PREFIX + name, binder.getBindingResult());
-
-		return argument;
+		return arg;
 	}
 
-	private void validate(WebDataBinder binder, MethodParameter parameter) throws Exception, MethodArgumentNotValidException {
-
-		Annotation[] annotations = parameter.getParameterAnnotations();
-		for (Annotation annot : annotations) {
-			if (annot.annotationType().getSimpleName().startsWith("Valid")) {
-				Object hints = AnnotationUtils.getValue(annot);
+	/**
+	 * Validate the request part if applicable.
+	 * <p>The default implementation checks for {@code @javax.validation.Valid},
+	 * Spring's {@link org.springframework.validation.annotation.Validated},
+	 * and custom annotations whose name starts with "Valid".
+	 * @param binder the DataBinder to be used
+	 * @param methodParam the method parameter
+	 * @throws MethodArgumentNotValidException in case of a binding error which
+	 * is meant to be fatal (i.e. without a declared {@link Errors} parameter)
+	 */
+	private void validate(WebDataBinder binder, MethodParameter methodParam) throws MethodArgumentNotValidException {
+		Annotation[] annotations = methodParam.getParameterAnnotations();
+		for (Annotation ann : annotations) {
+			if (ann.annotationType().getSimpleName().startsWith("Valid")) {
+				Object hints = AnnotationUtils.getValue(ann);
 				binder.validate(hints instanceof Object[] ? (Object[]) hints : new Object[] {hints});
 				BindingResult bindingResult = binder.getBindingResult();
-				if (bindingResult.hasErrors()) {
-					if (isBindExceptionRequired(binder, parameter)) {
-						throw new MethodArgumentNotValidException(parameter, bindingResult);
-					}
+				if (bindingResult.hasErrors() && isBindExceptionRequired(binder, methodParam)) {
+					throw new MethodArgumentNotValidException(methodParam, bindingResult);
 				}
 				break;
 			}
@@ -125,28 +125,27 @@ private void validate(WebDataBinder binder, MethodParameter parameter) throws Ex
 	}
 
 	/**
-	 * Whether to raise a {@link MethodArgumentNotValidException} on validation errors.
+	 * Whether to raise a fatal bind exception on validation errors.
 	 * @param binder the data binder used to perform data binding
-	 * @param parameter the method argument
-	 * @return {@code true} if the next method argument is not of type {@link Errors}.
+	 * @param methodParam the method argument
+	 * @return {@code true} if the next method argument is not of type {@link Errors}
 	 */
-	private boolean isBindExceptionRequired(WebDataBinder binder, MethodParameter parameter) {
-		int i = parameter.getParameterIndex();
-		Class<?>[] paramTypes = parameter.getMethod().getParameterTypes();
+	private boolean isBindExceptionRequired(WebDataBinder binder, MethodParameter methodParam) {
+		int i = methodParam.getParameterIndex();
+		Class<?>[] paramTypes = methodParam.getMethod().getParameterTypes();
 		boolean hasBindingResult = (paramTypes.length > (i + 1) && Errors.class.isAssignableFrom(paramTypes[i + 1]));
-
 		return !hasBindingResult;
 	}
 
 	@Override
-	protected <T> Object readWithMessageConverters(NativeWebRequest webRequest,
-			MethodParameter methodParam,  Type paramType) throws IOException, HttpMediaTypeNotSupportedException {
+	protected <T> Object readWithMessageConverters(NativeWebRequest webRequest, MethodParameter methodParam,
+			Type paramType) throws IOException, HttpMediaTypeNotSupportedException {
 
-		final HttpServletRequest servletRequest = webRequest.getNativeRequest(HttpServletRequest.class);
+		HttpServletRequest servletRequest = webRequest.getNativeRequest(HttpServletRequest.class);
 		HttpInputMessage inputMessage = new ServletServerHttpRequest(servletRequest);
 
-		RequestBody annot = methodParam.getParameterAnnotation(RequestBody.class);
-		if (!annot.required()) {
+		RequestBody ann = methodParam.getParameterAnnotation(RequestBody.class);
+		if (!ann.required()) {
 			InputStream inputStream = inputMessage.getBody();
 			if (inputStream == null) {
 				return null;
@@ -169,7 +168,7 @@ else if (inputStream.markSupported()) {
 				}
 				inputMessage = new ServletServerHttpRequest(servletRequest) {
 					@Override
-					public InputStream getBody() throws IOException {
+					public InputStream getBody() {
 						// Form POST should not get here
 						return pushbackInputStream;
 					}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
index 8e00031dc2..35bb4d4072 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseEntityExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.mvc.method.annotation;
 
 import java.util.List;
@@ -20,6 +21,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.ConversionNotSupportedException;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.http.HttpHeaders;
@@ -43,34 +45,35 @@
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.multipart.support.MissingServletRequestPartException;
 import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+import org.springframework.web.util.WebUtils;
 
 /**
  * A convenient base class for {@link ControllerAdvice @ControllerAdvice} classes
  * that wish to provide centralized exception handling across all
  * {@code @RequestMapping} methods through {@code @ExceptionHandler} methods.
  *
- * <p>This base class provides an {@code @ExceptionHandler} for handling standard
- * Spring MVC exceptions that returns a {@code ResponseEntity} to be written with
- * {@link HttpMessageConverter message converters}. This is in contrast to
+ * <p>This base class provides an {@code @ExceptionHandler} method for handling
+ * internal Spring MVC exceptions. This method returns a {@code ResponseEntity}
+ * for writing to the response with a {@link HttpMessageConverter message converter}.
+ * in contrast to
  * {@link org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver
- * DefaultHandlerExceptionResolver} which returns a {@code ModelAndView} instead.
+ * DefaultHandlerExceptionResolver} which returns a
+ * {@link org.springframework.web.servlet.ModelAndView ModelAndView}.
  *
- * <p>If there is no need to write error content to the response body, or if using
- * view resolution, e.g. {@code ContentNegotiatingViewResolver}, then use
- * {@code DefaultHandlerExceptionResolver} instead.
+ * <p>If there is no need to write error content to the response body, or when
+ * using view resolution (e.g., via {@code ContentNegotiatingViewResolver}),
+ * then {@code DefaultHandlerExceptionResolver} is good enough.
  *
  * <p>Note that in order for an {@code @ControllerAdvice} sub-class to be
  * detected, {@link ExceptionHandlerExceptionResolver} must be configured.
  *
  * @author Rossen Stoyanchev
  * @since 3.2
- *
+ * @see #handleException(Exception, WebRequest)
  * @see org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver
  */
 public abstract class ResponseEntityExceptionHandler {
 
-	protected final Log logger = LogFactory.getLog(getClass());
-
 	/**
 	 * Log category to use when no mapped handler is found for a request.
 	 * @see #pageNotFoundLogger
@@ -78,18 +81,23 @@ public abstract class ResponseEntityExceptionHandler {
 	public static final String PAGE_NOT_FOUND_LOG_CATEGORY = "org.springframework.web.servlet.PageNotFound";
 
 	/**
-	 * Additional logger to use when no mapped handler is found for a request.
+	 * Specific logger to use when no mapped handler is found for a request.
 	 * @see #PAGE_NOT_FOUND_LOG_CATEGORY
 	 */
 	protected static final Log pageNotFoundLogger = LogFactory.getLog(PAGE_NOT_FOUND_LOG_CATEGORY);
 
+	/**
+	 * Common logger for use in subclasses.
+	 */
+	protected final Log logger = LogFactory.getLog(getClass());
+
 
 	/**
 	 * Provides handling for standard Spring MVC exceptions.
 	 * @param ex the target exception
 	 * @param request the current request
 	 */
-	@ExceptionHandler(value={
+	@ExceptionHandler({
 			NoSuchRequestHandlingMethodException.class,
 			HttpRequestMethodNotSupportedException.class,
 			HttpMediaTypeNotSupportedException.class,
@@ -105,9 +113,7 @@ public abstract class ResponseEntityExceptionHandler {
 			BindException.class
 		})
 	public final ResponseEntity<Object> handleException(Exception ex, WebRequest request) {
-
 		HttpHeaders headers = new HttpHeaders();
-
 		if (ex instanceof NoSuchRequestHandlingMethodException) {
 			HttpStatus status = HttpStatus.NOT_FOUND;
 			return handleNoSuchRequestHandlingMethod((NoSuchRequestHandlingMethodException) ex, headers, status, request);
@@ -169,27 +175,27 @@ else if (ex instanceof BindException) {
 
 	/**
 	 * A single place to customize the response body of all Exception types.
-	 * This method returns {@code null} by default.
+	 * <p>The default implementation sets the {@link WebUtils#ERROR_EXCEPTION_ATTRIBUTE}
+	 * request attribute and creates a {@link ResponseEntity} from the given
+	 * body, headers, and status.
 	 * @param ex the exception
-	 * @param body the body to use for the response
-	 * @param headers the headers to be written to the response
-	 * @param status the selected response status
+	 * @param body the body for the response
+	 * @param headers the headers for the response
+	 * @param status the response status
 	 * @param request the current request
 	 */
 	protected ResponseEntity<Object> handleExceptionInternal(Exception ex, Object body,
 			HttpHeaders headers, HttpStatus status, WebRequest request) {
 
 		if (HttpStatus.INTERNAL_SERVER_ERROR.equals(status)) {
-			request.setAttribute("javax.servlet.error.exception", ex, WebRequest.SCOPE_REQUEST);
+			request.setAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE, ex, WebRequest.SCOPE_REQUEST);
 		}
-
 		return new ResponseEntity<Object>(body, headers, status);
 	}
 
 	/**
 	 * Customize the response for NoSuchRequestHandlingMethodException.
-	 * This method logs a warning and delegates to
-	 * {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method logs a warning and delegates to {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
@@ -206,8 +212,8 @@ protected ResponseEntity<Object> handleNoSuchRequestHandlingMethod(NoSuchRequest
 
 	/**
 	 * Customize the response for HttpRequestMethodNotSupportedException.
-	 * This method logs a warning, sets the "Allow" header, and delegates to
-	 * {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method logs a warning, sets the "Allow" header, and delegates to
+	 * {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
@@ -223,14 +229,13 @@ protected ResponseEntity<Object> handleHttpRequestMethodNotSupported(HttpRequest
 		if (!supportedMethods.isEmpty()) {
 			headers.setAllow(supportedMethods);
 		}
-
 		return handleExceptionInternal(ex, null, headers, status, request);
 	}
 
 	/**
 	 * Customize the response for HttpMediaTypeNotSupportedException.
-	 * This method sets the "Accept" header and delegates to
-	 * {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method sets the "Accept" header and delegates to
+	 * {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
@@ -250,7 +255,7 @@ protected ResponseEntity<Object> handleHttpMediaTypeNotSupported(HttpMediaTypeNo
 
 	/**
 	 * Customize the response for HttpMediaTypeNotAcceptableException.
-	 * This method delegates to {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method delegates to {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
@@ -265,7 +270,7 @@ protected ResponseEntity<Object> handleHttpMediaTypeNotAcceptable(HttpMediaTypeN
 
 	/**
 	 * Customize the response for MissingServletRequestParameterException.
-	 * This method delegates to {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method delegates to {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
@@ -280,7 +285,7 @@ protected ResponseEntity<Object> handleMissingServletRequestParameter(MissingSer
 
 	/**
 	 * Customize the response for ServletRequestBindingException.
-	 * This method delegates to {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method delegates to {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
@@ -295,7 +300,7 @@ protected ResponseEntity<Object> handleServletRequestBindingException(ServletReq
 
 	/**
 	 * Customize the response for ConversionNotSupportedException.
-	 * This method delegates to {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method delegates to {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
@@ -310,7 +315,7 @@ protected ResponseEntity<Object> handleConversionNotSupported(ConversionNotSuppo
 
 	/**
 	 * Customize the response for TypeMismatchException.
-	 * This method delegates to {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method delegates to {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
@@ -325,7 +330,7 @@ protected ResponseEntity<Object> handleTypeMismatch(TypeMismatchException ex, Ht
 
 	/**
 	 * Customize the response for HttpMessageNotReadableException.
-	 * This method delegates to {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method delegates to {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
@@ -340,7 +345,7 @@ protected ResponseEntity<Object> handleHttpMessageNotReadable(HttpMessageNotRead
 
 	/**
 	 * Customize the response for HttpMessageNotWritableException.
-	 * This method delegates to {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method delegates to {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
@@ -355,7 +360,7 @@ protected ResponseEntity<Object> handleHttpMessageNotWritable(HttpMessageNotWrit
 
 	/**
 	 * Customize the response for MethodArgumentNotValidException.
-	 * This method delegates to {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method delegates to {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
@@ -370,7 +375,7 @@ protected ResponseEntity<Object> handleMethodArgumentNotValid(MethodArgumentNotV
 
 	/**
 	 * Customize the response for MissingServletRequestPartException.
-	 * This method delegates to {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method delegates to {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
@@ -385,7 +390,7 @@ protected ResponseEntity<Object> handleMissingServletRequestPart(MissingServletR
 
 	/**
 	 * Customize the response for BindException.
-	 * This method delegates to {@link #handleExceptionInternal(Exception, Object, HttpHeaders, HttpStatus, WebRequest)}.
+	 * <p>This method delegates to {@link #handleExceptionInternal}.
 	 * @param ex the exception
 	 * @param headers the headers to be written to the response
 	 * @param status the selected response status
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java
index 3cfd087e33..6fcea9d548 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.util.Collections;
 import java.util.Map;
-
 import javax.servlet.ServletRequest;
 
 import org.springframework.core.MethodParameter;
@@ -36,7 +35,7 @@
 import org.springframework.web.servlet.HandlerMapping;
 
 /**
- * A Servlet-specific {@link org.springframework.web.method.annotation.ModelAttributeMethodProcessor} that applies data
+ * A Servlet-specific {@link ModelAttributeMethodProcessor} that applies data
  * binding through a WebDataBinder of type {@link ServletRequestDataBinder}.
  *
  * <p>Also adds a fall-back strategy to instantiate the model attribute from a
@@ -51,34 +50,34 @@ public class ServletModelAttributeMethodProcessor extends ModelAttributeMethodPr
 	/**
 	 * @param annotationNotRequired if "true", non-simple method arguments and
 	 * return values are considered model attributes with or without a
-	 * {@code @ModelAttribute} annotation.
+	 * {@code @ModelAttribute} annotation
 	 */
 	public ServletModelAttributeMethodProcessor(boolean annotationNotRequired) {
 		super(annotationNotRequired);
 	}
 
+
 	/**
 	 * Instantiate the model attribute from a URI template variable or from a
 	 * request parameter if the name matches to the model attribute name and
 	 * if there is an appropriate type conversion strategy. If none of these
 	 * are true delegate back to the base class.
-	 * @see #createAttributeFromRequestValue(String, String, MethodParameter, WebDataBinderFactory, NativeWebRequest)
+	 * @see #createAttributeFromRequestValue
 	 */
 	@Override
-	protected final Object createAttribute(String attributeName,
-										   MethodParameter parameter,
-										   WebDataBinderFactory binderFactory,
-										   NativeWebRequest request) throws Exception {
+	protected final Object createAttribute(String attributeName, MethodParameter methodParam,
+			WebDataBinderFactory binderFactory, NativeWebRequest request) throws Exception {
 
 		String value = getRequestValueForAttribute(attributeName, request);
 		if (value != null) {
-			Object attribute = createAttributeFromRequestValue(value, attributeName, parameter, binderFactory, request);
+			Object attribute = createAttributeFromRequestValue(
+					value, attributeName, methodParam, binderFactory, request);
 			if (attribute != null) {
 				return attribute;
 			}
 		}
 
-		return super.createAttribute(attributeName, parameter, binderFactory, request);
+		return super.createAttribute(attributeName, methodParam, binderFactory, request);
 	}
 
 	/**
@@ -105,10 +104,9 @@ else if (StringUtils.hasText(request.getParameter(attributeName))) {
 
 	@SuppressWarnings("unchecked")
 	protected final Map<String, String> getUriTemplateVariables(NativeWebRequest request) {
-		Map<String, String> variables =
-			(Map<String, String>) request.getAttribute(
-					HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, RequestAttributes.SCOPE_REQUEST);
-		return (variables != null) ? variables : Collections.<String, String>emptyMap();
+		Map<String, String> variables = (Map<String, String>) request.getAttribute(
+				HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, RequestAttributes.SCOPE_REQUEST);
+		return (variables != null ? variables : Collections.<String, String>emptyMap());
 	}
 
 	/**
@@ -118,32 +116,31 @@ protected final Map<String, String> getUriTemplateVariables(NativeWebRequest req
 	 * {@link Converter} that can perform the conversion.
 	 * @param sourceValue the source value to create the model attribute from
 	 * @param attributeName the name of the attribute, never {@code null}
-	 * @param parameter the method parameter
+	 * @param methodParam the method parameter
 	 * @param binderFactory for creating WebDataBinder instance
 	 * @param request the current request
 	 * @return the created model attribute, or {@code null}
 	 * @throws Exception
 	 */
-	protected Object createAttributeFromRequestValue(String sourceValue,
-												 String attributeName,
-												 MethodParameter parameter,
-												 WebDataBinderFactory binderFactory,
-												 NativeWebRequest request) throws Exception {
+	protected Object createAttributeFromRequestValue(String sourceValue, String attributeName,
+			MethodParameter methodParam, WebDataBinderFactory binderFactory, NativeWebRequest request)
+			throws Exception {
+
 		DataBinder binder = binderFactory.createBinder(request, null, attributeName);
 		ConversionService conversionService = binder.getConversionService();
 		if (conversionService != null) {
 			TypeDescriptor source = TypeDescriptor.valueOf(String.class);
-			TypeDescriptor target = new TypeDescriptor(parameter);
+			TypeDescriptor target = new TypeDescriptor(methodParam);
 			if (conversionService.canConvert(source, target)) {
-				return binder.convertIfNecessary(sourceValue, parameter.getParameterType(), parameter);
+				return binder.convertIfNecessary(sourceValue, methodParam.getParameterType(), methodParam);
 			}
 		}
 		return null;
 	}
 
 	/**
-	 * {@inheritDoc}
-	 * <p>Downcast {@link WebDataBinder} to {@link ServletRequestDataBinder} before binding.
+	 * This implementation downcasts {@link WebDataBinder} to
+	 * {@link ServletRequestDataBinder} before binding.
 	 * @see ServletRequestDataBinderFactory
 	 */
 	@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
index d0c3a02024..a1047423c2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import java.lang.reflect.Method;
 import java.security.Principal;
 import java.util.Locale;
 
@@ -102,9 +101,9 @@ else if (Reader.class.isAssignableFrom(paramType)) {
 			return request.getReader();
 		}
 		else {
-			// should never happen..
-			Method method = parameter.getMethod();
-			throw new UnsupportedOperationException("Unknown parameter type: " + paramType + " in method: " + method);
+			// should never happen...
+			throw new UnsupportedOperationException(
+					"Unknown parameter type: " + paramType + " in method: " + parameter.getMethod());
 		}
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java
index 1a2e175fb1..f6ecd806ae 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -124,7 +124,7 @@ public void setParamName(String paramName) {
 	 * can be considered a logical name only.
 	 * @see #setParamName
 	 */
-	public void setMethodParamNames(String[] methodParamNames) {
+	public void setMethodParamNames(String... methodParamNames) {
 		this.methodParamNames = methodParamNames;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/package-info.java
index 320384a29f..0659e76f91 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/package-info.java
@@ -12,13 +12,6 @@
  * naming convention. Classes are analyzed at startup and methods cached,
  * so the performance overhead of reflection in this approach is negligible.
  *
- * <p>This approach is analogous to the Struts 1.1 <b>DispatcherAction</b>
- * class, but more sophisticated, as it supports configurable mapping from
- * requests to URLs and allows for delegation as well as subclassing.
- *
- * <p>This package is discussed in Chapter 12 of <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
- * by Rod Johnson, and used in the sample application.
- *
  */
 package org.springframework.web.servlet.mvc.multiaction;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/package-info.java
index 55998febda..c3380ae12a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/package-info.java
@@ -1,43 +1,8 @@
+
 /**
  *
- * <p>
- *     Standard controller implementations for the servlet MVC framework that comes
- *     with Spring. Provides both abstract base classes and concrete implementations
- *     for often seen use cases.
- * </p>
- *
- * <p>
- *     A {@code Controller} - as defined in this package - is analogous to a Struts
- *     {@code Action}. Usually {@code Controllers} are JavaBeans
- *     to allow easy configuration. Controllers define the {@code C} from so-called
- *     MVC paradigm and can be used in conjunction with the
- *     {@link org.springframework.web.servlet.ModelAndView ModelAndView}
- *     to achieve interactive applications. The view might be represented by a
- *     HTML interface, but, because of model and the controller being completely
- *     independent of the view, PDF views are possible, as well as for instance Excel
- *     views.
- * </p>
- *
- * <p>
- *     How to actually set up a (web)application using the MVC framework Spring
- *     provides is explained in more detail in the
- *     <a href="../../../../../../MVC-step-by-step/Spring-MVC-step-by-step.html">MVC-Step-by-Step
- *     tutorial</a>, also provided in this package (or have a look
- *     <a href="http://www.springframework.org">here</a> for an online version).
- *     The classes contained by this package explain in more detail the actual
- *     workflow of some of the abstract and concrete controller and how to extend
- *     and fully use their functionality.
- * </p>
- *
- * <p>
- *     Especially useful to read, while getting into the Spring MVC framework
- *     are the following:
- *     <ul>
- *         <li><a href="Controller.html">Controller</a></li>
- *         <li><a href="SimpleFormController.html">BaseCommandController</a></li>
- *         <li><a href="ParameterizableViewController.html">ParameterizableViewController</a></li>
- *     </ul>
- * </p>
+ * Standard controller implementations for the Servlet MVC framework that comes with
+ * Spring. Provides various controller styles, including an annotation-based model.
  *
  */
 package org.springframework.web.servlet.mvc;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java
index 7c4f94535f..7893bc5954 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public abstract class AbstractControllerUrlHandlerMapping extends AbstractDetect
 
 	private Set<String> excludedPackages = Collections.singleton("org.springframework.web.servlet.mvc");
 
-	private Set<Class> excludedClasses = Collections.emptySet();
+	private Set<Class<?>> excludedClasses = Collections.emptySet();
 
 
 	/**
@@ -60,7 +60,7 @@ public void setIncludeAnnotatedControllers(boolean includeAnnotatedControllers)
 	 * e.g. a {@link org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping},
 	 * alongside this ControllerClassNameHandlerMapping for application controllers.
 	 */
-	public void setExcludedPackages(String[] excludedPackages) {
+	public void setExcludedPackages(String... excludedPackages) {
 		this.excludedPackages = (excludedPackages != null) ?
 				new HashSet<String>(Arrays.asList(excludedPackages)) : new HashSet<String>();
 	}
@@ -69,9 +69,9 @@ public void setExcludedPackages(String[] excludedPackages) {
 	 * Specify controller classes that should be excluded from this mapping.
 	 * Any such classes will simply be ignored by this HandlerMapping.
 	 */
-	public void setExcludedClasses(Class[] excludedClasses) {
+	public void setExcludedClasses(Class<?>... excludedClasses) {
 		this.excludedClasses = (excludedClasses != null) ?
-				new HashSet<Class>(Arrays.asList(excludedClasses)) : new HashSet<Class>();
+				new HashSet<Class<?>>(Arrays.asList(excludedClasses)) : new HashSet<Class<?>>();
 	}
 
 
@@ -81,7 +81,7 @@ public void setExcludedClasses(Class[] excludedClasses) {
 	 */
 	@Override
 	protected String[] determineUrlsForHandler(String beanName) {
-		Class beanClass = getApplicationContext().getType(beanName);
+		Class<?> beanClass = getApplicationContext().getType(beanName);
 		if (isEligibleForMapping(beanName, beanClass)) {
 			return buildUrlsForHandler(beanName, beanClass);
 		}
@@ -98,7 +98,7 @@ protected String[] determineUrlsForHandler(String beanName) {
 	 * @see #setExcludedPackages
 	 * @see #setExcludedClasses
 	 */
-	protected boolean isEligibleForMapping(String beanName, Class beanClass) {
+	protected boolean isEligibleForMapping(String beanName, Class<?> beanClass) {
 		if (beanClass == null) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Excluding controller bean '" + beanName + "' from class name mapping " +
@@ -131,7 +131,7 @@ protected boolean isEligibleForMapping(String beanName, Class beanClass) {
 	 * that is supported by this mapping strategy.
 	 * @param beanClass the class to introspect
 	 */
-	protected boolean isControllerType(Class beanClass) {
+	protected boolean isControllerType(Class<?> beanClass) {
 		return this.predicate.isControllerType(beanClass);
 	}
 
@@ -140,7 +140,7 @@ protected boolean isControllerType(Class beanClass) {
 	 * that dispatches to multiple action methods.
 	 * @param beanClass the class to introspect
 	 */
-	protected boolean isMultiActionControllerType(Class beanClass) {
+	protected boolean isMultiActionControllerType(Class<?> beanClass) {
 		return this.predicate.isMultiActionControllerType(beanClass);
 	}
 
@@ -151,6 +151,6 @@ protected boolean isMultiActionControllerType(Class beanClass) {
 	 * @param beanClass the type of the bean
 	 * @return the URLs determined for the bean
 	 */
-	protected abstract String[] buildUrlsForHandler(String beanName, Class beanClass);
+	protected abstract String[] buildUrlsForHandler(String beanName, Class<?> beanClass);
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
index 0a928be3a4..126ddb3e49 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.List;
 import javax.activation.FileTypeMap;
 import javax.activation.MimetypesFileTypeMap;
@@ -25,16 +27,23 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
 import org.springframework.http.MediaType;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.FileCopyUtils;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ResourceUtils;
+import org.springframework.util.StreamUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.HttpRequestHandler;
 import org.springframework.web.context.request.ServletWebRequest;
+import org.springframework.web.context.support.ServletContextResource;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.support.WebContentGenerator;
 
@@ -69,6 +78,8 @@
  */
 public class ResourceHttpRequestHandler extends WebContentGenerator implements HttpRequestHandler, InitializingBean {
 
+	private final static Log logger = LogFactory.getLog(ResourceHttpRequestHandler.class);
+
 	private static final boolean jafPresent =
 			ClassUtils.isPresent("javax.activation.FileTypeMap", ResourceHttpRequestHandler.class.getClassLoader());
 
@@ -89,7 +100,9 @@ public void setLocations(List<Resource> locations) {
 	}
 
 	public void afterPropertiesSet() throws Exception {
-		Assert.notEmpty(locations, "Locations list must not be empty");
+		if (logger.isWarnEnabled() && CollectionUtils.isEmpty(this.locations)) {
+			logger.warn("Locations list is empty. No resources will be served");
+		}
 	}
 
 	/**
@@ -151,14 +164,30 @@ protected Resource getResource(HttpServletRequest request) {
 			throw new IllegalStateException("Required request attribute '" +
 					HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE + "' is not set");
 		}
-
+		path = processPath(path);
 		if (!StringUtils.hasText(path) || isInvalidPath(path)) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Ignoring invalid resource path [" + path + "]");
 			}
 			return null;
 		}
-
+		if (path.contains("%")) {
+			try {
+				// Use URLDecoder (vs UriUtils) to preserve potentially decoded UTF-8 chars
+				if (isInvalidPath(URLDecoder.decode(path, "UTF-8"))) {
+					if (logger.isTraceEnabled()) {
+						logger.trace("Ignoring invalid resource path with escape sequences [" + path + "].");
+					}
+					return null;
+				}
+			}
+			catch (UnsupportedEncodingException e) {
+				// ignore: shouldn't happen
+			}
+			catch (IllegalArgumentException ex) {
+				// ignore
+			}
+		}
 		for (Resource location : this.locations) {
 			try {
 				if (logger.isDebugEnabled()) {
@@ -166,10 +195,19 @@ protected Resource getResource(HttpServletRequest request) {
 				}
 				Resource resource = location.createRelative(path);
 				if (resource.exists() && resource.isReadable()) {
-					if (logger.isDebugEnabled()) {
-						logger.debug("Found matching resource: " + resource);
+					if (isResourceUnderLocation(resource, location)) {
+						if (logger.isDebugEnabled()) {
+							logger.debug("Found matching resource: " + resource);
+						}
+						return resource;
+					}
+					else {
+						if (logger.isTraceEnabled()) {
+							logger.trace("resource=\"" + resource + "\" was successfully resolved " +
+									"but is not under the location=\"" + location);
+						}
+						return null;
 					}
-					return resource;
 				}
 				else if (logger.isTraceEnabled()) {
 					logger.trace("Relative resource doesn't exist or isn't readable: " + resource);
@@ -183,14 +221,118 @@ else if (logger.isTraceEnabled()) {
 	}
 
 	/**
-	 * Validates the given path: returns {@code true} if the given path is not a valid resource path.
-	 * <p>The default implementation rejects paths containing "WEB-INF" or "META-INF" as well as paths
-	 * with relative paths ("../") that result in access of a parent directory.
+	 * Process the given resource path to be used.
+	 * <p>The default implementation replaces any combination of leading '/' and
+	 * control characters (00-1F and 7F) with a single "/" or "". For example
+	 * {@code "  // /// ////  foo/bar"} becomes {@code "/foo/bar"}.
+	 * @since 3.2.12
+	 */
+	protected String processPath(String path) {
+		boolean slash = false;
+		for (int i = 0; i < path.length(); i++) {
+			if (path.charAt(i) == '/') {
+				slash = true;
+			}
+			else if (path.charAt(i) > ' ' && path.charAt(i) != 127) {
+				if (i == 0 || (i == 1 && slash)) {
+					return path;
+				}
+				path = slash ? "/" + path.substring(i) : path.substring(i);
+				if (logger.isTraceEnabled()) {
+					logger.trace("Path trimmed for leading '/' and control characters: " + path);
+				}
+				return path;
+			}
+		}
+		return (slash ? "/" : "");
+	}
+
+	/**
+	 * Identifies invalid resource paths. By default rejects:
+	 * <ul>
+	 * <li>Paths that contain "WEB-INF" or "META-INF"
+	 * <li>Paths that contain "../" after a call to
+	 * {@link org.springframework.util.StringUtils#cleanPath}.
+	 * <li>Paths that represent a {@link org.springframework.util.ResourceUtils#isUrl
+	 * valid URL} or would represent one after the leading slash is removed.
+	 * </ul>
+	 * <p><strong>Note:</strong> this method assumes that leading, duplicate '/'
+	 * or control characters (e.g. white space) have been trimmed so that the
+	 * path starts predictably with a single '/' or does not have one.
 	 * @param path the path to validate
-	 * @return {@code true} if the path has been recognized as invalid, {@code false} otherwise
+	 * @return {@code true} if the path is invalid, {@code false} otherwise
 	 */
 	protected boolean isInvalidPath(String path) {
-		return (path.contains("WEB-INF") || path.contains("META-INF") || StringUtils.cleanPath(path).startsWith(".."));
+		if (logger.isTraceEnabled()) {
+			logger.trace("Applying \"invalid path\" checks to path: " + path);
+		}
+		if (path.contains("WEB-INF") || path.contains("META-INF")) {
+			if (logger.isTraceEnabled()) {
+				logger.trace("Path contains \"WEB-INF\" or \"META-INF\".");
+			}
+			return true;
+		}
+		if (path.contains(":/")) {
+			String relativePath = (path.charAt(0) == '/' ? path.substring(1) : path);
+			if (ResourceUtils.isUrl(relativePath) || relativePath.startsWith("url:")) {
+				if (logger.isTraceEnabled()) {
+					logger.trace("Path represents URL or has \"url:\" prefix.");
+				}
+				return true;
+			}
+		}
+		if (path.contains("..")) {
+			path = StringUtils.cleanPath(path);
+			if (path.contains("../")) {
+				if (logger.isTraceEnabled()) {
+					logger.trace("Path contains \"../\" after call to StringUtils#cleanPath.");
+				}
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private boolean isResourceUnderLocation(Resource resource, Resource location) throws IOException {
+		if (!resource.getClass().equals(location.getClass())) {
+			return false;
+		}
+		String resourcePath;
+		String locationPath;
+		if (resource instanceof UrlResource) {
+			resourcePath = resource.getURL().toExternalForm();
+			locationPath = location.getURL().toExternalForm();
+		}
+		else if (resource instanceof ClassPathResource) {
+			resourcePath = ((ClassPathResource) resource).getPath();
+			locationPath = ((ClassPathResource) location).getPath();
+		}
+		else if (resource instanceof ServletContextResource) {
+			resourcePath = ((ServletContextResource) resource).getPath();
+			locationPath = ((ServletContextResource) location).getPath();
+		}
+		else {
+			resourcePath = resource.getURL().getPath();
+			locationPath = location.getURL().getPath();
+		}
+		if(locationPath.equals(resourcePath)) {
+			return true;
+		}
+		locationPath = (locationPath.endsWith("/") ||
+				!StringUtils.hasLength(locationPath) ? locationPath : locationPath + "/");
+		if (!resourcePath.startsWith(locationPath)) {
+			return false;
+		}
+		if (resourcePath.contains("%")) {
+			// Use URLDecoder (vs UriUtils) to preserve potentially decoded UTF-8 chars...
+			if (URLDecoder.decode(resourcePath, "UTF-8").contains("../")) {
+				if (logger.isTraceEnabled()) {
+					logger.trace("Resolved resource path contains \"../\" after decoding: " + resourcePath);
+				}
+				return false;
+			}
+		}
+		return true;
 	}
 
 	/**
@@ -241,7 +383,17 @@ protected void setHeaders(HttpServletResponse response, Resource resource, Media
 	 * @throws IOException in case of errors while writing the content
 	 */
 	protected void writeContent(HttpServletResponse response, Resource resource) throws IOException {
-		FileCopyUtils.copy(resource.getInputStream(), response.getOutputStream());
+		InputStream in = resource.getInputStream();
+		try {
+			StreamUtils.copy(in, response.getOutputStream());
+		}
+		finally {
+			try {
+				in.close();
+			}
+			catch (IOException ex) {
+			}
+		}
 	}
 
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractAnnotationConfigDispatcherServletInitializer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractAnnotationConfigDispatcherServletInitializer.java
index 70bdd82689..6a1777fe10 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractAnnotationConfigDispatcherServletInitializer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractAnnotationConfigDispatcherServletInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,21 @@
 
 package org.springframework.web.servlet.support;
 
-import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 
 /**
- * Base class for {@link org.springframework.web.WebApplicationInitializer
- * WebApplicationInitializer} implementations that register a {@link
- * org.springframework.web.servlet.DispatcherServlet DispatcherServlet}
- * configured with annotated classes, e.g. Spring's {@link
- * org.springframework.context.annotation.Configuration @Configuration} classes.
+ * Base class for {@link org.springframework.web.WebApplicationInitializer}
+ * implementations that register a
+ * {@link org.springframework.web.servlet.DispatcherServlet DispatcherServlet}
+ * configured with annotated classes, e.g. Spring's
+ * {@link org.springframework.context.annotation.Configuration @Configuration} classes.
  *
- * <p>Concrete implementations are required to implement {@link #getRootConfigClasses()},
- * {@link #getServletConfigClasses()}, as well as {@link #getServletMappings()}. Further
- * template and customization methods are provided by {@link
- * AbstractDispatcherServletInitializer}.
+ * <p>Concrete implementations are required to implement {@link #getRootConfigClasses()}
+ * and {@link #getServletConfigClasses()} as well as {@link #getServletMappings()}.
+ * Further template and customization methods are provided by
+ * {@link AbstractDispatcherServletInitializer}.
  *
  * @author Arjen Poutsma
  * @author Chris Beams
@@ -48,11 +47,10 @@ public abstract class AbstractAnnotationConfigDispatcherServletInitializer
 	 */
 	@Override
 	protected WebApplicationContext createRootApplicationContext() {
-		Class<?>[] rootConfigClasses = this.getRootConfigClasses();
-		if (!ObjectUtils.isEmpty(rootConfigClasses)) {
-			AnnotationConfigWebApplicationContext rootAppContext =
-					new AnnotationConfigWebApplicationContext();
-			rootAppContext.register(rootConfigClasses);
+		Class<?>[] configClasses = getRootConfigClasses();
+		if (!ObjectUtils.isEmpty(configClasses)) {
+			AnnotationConfigWebApplicationContext rootAppContext = new AnnotationConfigWebApplicationContext();
+			rootAppContext.register(configClasses);
 			return rootAppContext;
 		}
 		else {
@@ -64,18 +62,14 @@ protected WebApplicationContext createRootApplicationContext() {
 	 * {@inheritDoc}
 	 * <p>This implementation creates an {@link AnnotationConfigWebApplicationContext},
 	 * providing it the annotated classes returned by {@link #getServletConfigClasses()}.
-	 * @throws IllegalArgumentException if {@link #getServletConfigClasses()} returns
-	 * empty or {@code null}
 	 */
 	@Override
 	protected WebApplicationContext createServletApplicationContext() {
-		AnnotationConfigWebApplicationContext servletAppContext =
-				new AnnotationConfigWebApplicationContext();
-		Class<?>[] servletConfigClasses = this.getServletConfigClasses();
-		Assert.notEmpty(servletConfigClasses,
-				"getServletConfigClasses() did not return any configuration classes");
-
-		servletAppContext.register(servletConfigClasses);
+		AnnotationConfigWebApplicationContext servletAppContext = new AnnotationConfigWebApplicationContext();
+		Class<?>[] configClasses = getServletConfigClasses();
+		if (!ObjectUtils.isEmpty(configClasses)) {
+			servletAppContext.register(configClasses);
+		}
 		return servletAppContext;
 	}
 
@@ -94,7 +88,7 @@ protected WebApplicationContext createServletApplicationContext() {
 	 * provided to the {@linkplain #createServletApplicationContext() dispatcher servlet
 	 * application context}.
 	 * @return the configuration classes for the dispatcher servlet application context
-	 * (may not be empty or {@code null}).
+	 * (may not be empty or {@code null})
 	 */
 	protected abstract Class<?>[] getServletConfigClasses();
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractDispatcherServletInitializer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractDispatcherServletInitializer.java
index d6e6d01053..4b97870005 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractDispatcherServletInitializer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractDispatcherServletInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.web.servlet.support;
 
 import java.util.EnumSet;
-
 import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
 import javax.servlet.FilterRegistration;
@@ -34,14 +33,13 @@
 import org.springframework.web.servlet.DispatcherServlet;
 
 /**
- * Base class for {@link org.springframework.web.WebApplicationInitializer
- * WebApplicationInitializer} implementations that register a {@link DispatcherServlet} in
- * the servlet context.
+ * Base class for {@link org.springframework.web.WebApplicationInitializer}
+ * implementations that register a {@link DispatcherServlet} in the servlet context.
  *
- * <p>Concrete implementations are required to implement {@link
- * #createServletApplicationContext()}, as well as {@link #getServletMappings()}, both of
- * which gets invoked from {@link #registerDispatcherServlet(ServletContext)}. Further
- * customization can be achieved by overriding
+ * <p>Concrete implementations are required to implement
+ * {@link #createServletApplicationContext()}, as well as {@link #getServletMappings()},
+ * both of which get invoked from {@link #registerDispatcherServlet(ServletContext)}.
+ * Further customization can be achieved by overriding
  * {@link #customizeRegistration(ServletRegistration.Dynamic)}.
  *
  * <p>Because this class extends from {@link AbstractContextLoaderInitializer}, concrete
@@ -55,19 +53,19 @@
  * @author Rossen Stoyanchev
  * @since 3.2
  */
-public abstract class AbstractDispatcherServletInitializer
-		extends AbstractContextLoaderInitializer {
+public abstract class AbstractDispatcherServletInitializer extends AbstractContextLoaderInitializer {
 
 	/**
 	 * The default servlet name. Can be customized by overriding {@link #getServletName}.
 	 */
 	public static final String DEFAULT_SERVLET_NAME = "dispatcher";
 
+
 	@Override
 	public void onStartup(ServletContext servletContext) throws ServletException {
 		super.onStartup(servletContext);
 
-		this.registerDispatcherServlet(servletContext);
+		registerDispatcherServlet(servletContext);
 	}
 
 	/**
@@ -81,20 +79,16 @@ public void onStartup(ServletContext servletContext) throws ServletException {
 	 * @param servletContext the context to register the servlet against
 	 */
 	protected void registerDispatcherServlet(ServletContext servletContext) {
-		String servletName = this.getServletName();
-		Assert.hasLength(servletName,
-				"getServletName() may not return empty or null");
+		String servletName = getServletName();
+		Assert.hasLength(servletName, "getServletName() may not return empty or null");
 
-		WebApplicationContext servletAppContext = this.createServletApplicationContext();
+		WebApplicationContext servletAppContext = createServletApplicationContext();
 		Assert.notNull(servletAppContext,
 				"createServletApplicationContext() did not return an application " +
-						"context for servlet [" + servletName + "]");
+				"context for servlet [" + servletName + "]");
 
 		DispatcherServlet dispatcherServlet = new DispatcherServlet(servletAppContext);
-
-		ServletRegistration.Dynamic registration =
-				servletContext.addServlet(servletName, dispatcherServlet);
-
+		ServletRegistration.Dynamic registration = servletContext.addServlet(servletName, dispatcherServlet);
 		Assert.notNull(registration,
 				"Failed to register servlet with name '" + servletName + "'." +
 				"Check if there is another servlet registered under the same name.");
@@ -110,7 +104,7 @@ protected void registerDispatcherServlet(ServletContext servletContext) {
 			}
 		}
 
-		this.customizeRegistration(registration);
+		customizeRegistration(registration);
 	}
 
 	/**
@@ -125,22 +119,22 @@ protected String getServletName() {
 	/**
 	 * Create a servlet application context to be provided to the {@code DispatcherServlet}.
 	 * <p>The returned context is delegated to Spring's
-	 * {@link DispatcherServlet#DispatcherServlet(WebApplicationContext)} As such, it
-	 * typically contains controllers, view resolvers, locale resolvers, and other
+	 * {@link DispatcherServlet#DispatcherServlet(WebApplicationContext)}. As such,
+	 * it typically contains controllers, view resolvers, locale resolvers, and other
 	 * web-related beans.
 	 * @see #registerDispatcherServlet(ServletContext)
 	 */
 	protected abstract WebApplicationContext createServletApplicationContext();
 
 	/**
-	 * Specify the servlet mapping(s) for the {@code DispatcherServlet}, e.g. '/', '/app', etc.
+	 * Specify the servlet mapping(s) for the {@code DispatcherServlet} &mdash;
+	 * for example {@code "/"}, {@code "/app"}, etc.
 	 * @see #registerDispatcherServlet(ServletContext)
 	 */
 	protected abstract String[] getServletMappings();
 
 	/**
-	 * Specify filters to add and also map to the {@code DispatcherServlet}.
-	 *
+	 * Specify filters to add and map to the {@code DispatcherServlet}.
 	 * @return an array of filters or {@code null}
 	 * @see #registerServletFilter(ServletContext, Filter)
 	 */
@@ -159,9 +153,8 @@ protected Filter[] getServletFilters() {
 	 * {@code FORWARD}, {@code INCLUDE}, and conditionally {@code ASYNC} depending
 	 * on the return value of {@link #isAsyncSupported() asyncSupported}
 	 * </ul>
-	 * <p>If the above defaults are not suitable or insufficient, register
-	 * filters directly with the {@code ServletContext}.
-	 *
+	 * <p>If the above defaults are not suitable or insufficient, override this
+	 * method and register filters directly with the {@code ServletContext}.
 	 * @param servletContext the servlet context to register filters with
 	 * @param filter the filter to be registered
 	 * @return the filter registration
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractFlashMapManager.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractFlashMapManager.java
index 9fe88e8ef7..530bfa3287 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractFlashMapManager.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractFlashMapManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,12 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.MultiValueMap;
@@ -43,13 +43,14 @@
  */
 public abstract class AbstractFlashMapManager implements FlashMapManager {
 
+	private static final Object writeLock = new Object();
+
 	protected final Log logger = LogFactory.getLog(getClass());
 
 	private int flashMapTimeout = 180;
 
 	private UrlPathHelper urlPathHelper = new UrlPathHelper();
 
-	private static final Object writeLock = new Object();
 
 	/**
 	 * Set the amount of time in seconds after a {@link FlashMap} is saved
@@ -82,16 +83,16 @@ public UrlPathHelper getUrlPathHelper() {
 		return this.urlPathHelper;
 	}
 
-	public final FlashMap retrieveAndUpdate(HttpServletRequest request, HttpServletResponse response) {
 
+	public final FlashMap retrieveAndUpdate(HttpServletRequest request, HttpServletResponse response) {
 		List<FlashMap> maps = retrieveFlashMaps(request);
 		if (CollectionUtils.isEmpty(maps)) {
 			return null;
 		}
+
 		if (logger.isDebugEnabled()) {
 			logger.debug("Retrieved FlashMap(s): " + maps);
 		}
-
 		List<FlashMap> mapsToRemove = getExpiredFlashMaps(maps);
 
 		FlashMap match = getMatchingFlashMap(maps, request);
@@ -156,21 +157,20 @@ private FlashMap getMatchingFlashMap(List<FlashMap> allMaps, HttpServletRequest
 
 	/**
 	 * Whether the given FlashMap matches the current request.
-	 * The default implementation uses the target request path and query
-	 * parameters saved in the FlashMap.
+	 * Uses the expected request path and query parameters saved in the FlashMap.
 	 */
 	protected boolean isFlashMapForRequest(FlashMap flashMap, HttpServletRequest request) {
-		if (flashMap.getTargetRequestPath() != null) {
+		String expectedPath = flashMap.getTargetRequestPath();
+		if (expectedPath != null) {
 			String requestUri = this.urlPathHelper.getOriginatingRequestUri(request);
-			if (!requestUri.equals(flashMap.getTargetRequestPath())
-					&& !requestUri.equals(flashMap.getTargetRequestPath() + "/")) {
+			if (!requestUri.equals(expectedPath) && !requestUri.equals(expectedPath + "/")) {
 				return false;
 			}
 		}
 		MultiValueMap<String, String> targetParams = flashMap.getTargetRequestParams();
-		for (String paramName : targetParams.keySet()) {
-			for (String targetValue : targetParams.get(paramName)) {
-				if (!ObjectUtils.containsElement(request.getParameterValues(paramName), targetValue)) {
+		for (String expectedName : targetParams.keySet()) {
+			for (String expectedValue : targetParams.get(expectedName)) {
+				if (!ObjectUtils.containsElement(request.getParameterValues(expectedName), expectedValue)) {
 					return false;
 				}
 			}
@@ -185,18 +185,16 @@ public final void saveOutputFlashMap(FlashMap flashMap, HttpServletRequest reque
 
 		String path = decodeAndNormalizePath(flashMap.getTargetRequestPath(), request);
 		flashMap.setTargetRequestPath(path);
-
 		decodeParameters(flashMap.getTargetRequestParams(), request);
 
 		if (logger.isDebugEnabled()) {
 			logger.debug("Saving FlashMap=" + flashMap);
 		}
-
 		flashMap.startExpirationPeriod(this.flashMapTimeout);
 
 		synchronized (writeLock) {
 			List<FlashMap> allMaps = retrieveFlashMaps(request);
-			allMaps = (allMaps == null) ? new CopyOnWriteArrayList<FlashMap>() : allMaps;
+			allMaps = (allMaps != null ? allMaps : new CopyOnWriteArrayList<FlashMap>());
 			allMaps.add(flashMap);
 			updateFlashMaps(allMaps, request, response);
 		}
@@ -217,7 +215,9 @@ private String decodeAndNormalizePath(String path, HttpServletRequest request) {
 	private void decodeParameters(MultiValueMap<String, String> params, HttpServletRequest request) {
 		for (String name : new ArrayList<String>(params.keySet())) {
 			for (String value : new ArrayList<String>(params.remove(name))) {
-				params.add(name, this.urlPathHelper.decodeRequestString(request, value));
+				name = this.urlPathHelper.decodeRequestString(request, name);
+				value = this.urlPathHelper.decodeRequestString(request, value);
+				params.add(name, value);
 			}
 		}
 	}
@@ -228,7 +228,7 @@ private void decodeParameters(MultiValueMap<String, String> params, HttpServletR
 	 * @param request the current request
 	 * @param response the current response
 	 */
-	protected abstract void updateFlashMaps(List<FlashMap> flashMaps, HttpServletRequest request,
-			HttpServletResponse response);
+	protected abstract void updateFlashMaps(
+			List<FlashMap> flashMaps, HttpServletRequest request, HttpServletResponse response);
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java
index c5f9e6a3e3..4fd4058ef1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,13 +61,13 @@ public class BindStatus {
 
 	private Object value;
 
-	private Class valueType;
+	private Class<?> valueType;
 
 	private Object actualValue;
 
 	private PropertyEditor editor;
 
-	private List objectErrors;
+	private List<? extends ObjectError> objectErrors;
 
 	private String[] errorCodes;
 
@@ -90,7 +90,7 @@ public BindStatus(RequestContext requestContext, String path, boolean htmlEscape
 		this.htmlEscape = htmlEscape;
 
 		// determine name of the object and property
-		String beanName = null;
+		String beanName;
 		int dotPos = path.indexOf('.');
 		if (dotPos == -1) {
 			// property not set, only the object itself
@@ -124,6 +124,9 @@ else if (this.expression.endsWith("*")) {
 						this.actualValue = this.bindingResult.getRawFieldValue(this.expression);
 						this.editor = this.bindingResult.findEditor(this.expression, null);
 					}
+					else {
+						this.actualValue = this.value;
+					}
 				}
 			}
 			else {
@@ -143,8 +146,9 @@ else if (this.expression.endsWith("*")) {
 			}
 			if (this.expression != null && !"*".equals(this.expression) && !this.expression.endsWith("*")) {
 				BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(target);
-				this.valueType = bw.getPropertyType(this.expression);
 				this.value = bw.getPropertyValue(this.expression);
+				this.valueType = bw.getPropertyType(this.expression);
+				this.actualValue = this.value;
 			}
 			this.errorCodes = new String[0];
 			this.errorMessages = new String[0];
@@ -161,7 +165,7 @@ else if (this.expression.endsWith("*")) {
 	private void initErrorCodes() {
 		this.errorCodes = new String[this.objectErrors.size()];
 		for (int i = 0; i < this.objectErrors.size(); i++) {
-			ObjectError error = (ObjectError) this.objectErrors.get(i);
+			ObjectError error = this.objectErrors.get(i);
 			this.errorCodes[i] = error.getCode();
 		}
 	}
@@ -173,7 +177,7 @@ private void initErrorMessages() throws NoSuchMessageException {
 		if (this.errorMessages == null) {
 			this.errorMessages = new String[this.objectErrors.size()];
 			for (int i = 0; i < this.objectErrors.size(); i++) {
-				ObjectError error = (ObjectError) this.objectErrors.get(i);
+				ObjectError error = this.objectErrors.get(i);
 				this.errorMessages[i] = this.requestContext.getMessage(error, this.htmlEscape);
 			}
 		}
@@ -214,7 +218,7 @@ public Object getValue() {
 	 * '{@code getValue().getClass()}' since '{@code getValue()}' may
 	 * return '{@code null}'.
 	 */
-	public Class getValueType() {
+	public Class<?> getValueType() {
 		return this.valueType;
 	}
 
@@ -318,7 +322,7 @@ public PropertyEditor getEditor() {
 	 * @param valueClass the value class that an editor is needed for
 	 * @return the associated PropertyEditor, or {@code null} if none
 	 */
-	public PropertyEditor findEditor(Class valueClass) {
+	public PropertyEditor findEditor(Class<?> valueClass) {
 		return (this.bindingResult != null ? this.bindingResult.findEditor(this.expression, valueClass) : null);
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java
index f568f36213..dab8718382 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -141,6 +141,6 @@ public Locale getLocale() {
 			}
 			return RequestContextUtils.getLocale(this.request);
 		}
-	};
+	}
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
index cf33995355..f2edbfedc3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
@@ -20,14 +20,12 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.servlet.jsp.jstl.core.Config;
 
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceResolvable;
 import org.springframework.context.NoSuchMessageException;
@@ -90,6 +88,7 @@ public class RequestContext {
 	 */
 	private static final String REQUEST_DATA_VALUE_PROCESSOR_BEAN_NAME = "requestDataValueProcessor";
 
+
 	protected static final boolean jstlPresent = ClassUtils.isPresent("javax.servlet.jsp.jstl.core.Config",
 			RequestContext.class.getClassLoader());
 
@@ -113,6 +112,7 @@ public class RequestContext {
 
 	private Map<String, Errors> errorsMap;
 
+
 	/**
 	 * Create a new RequestContext for the given request, using the request attributes for Errors retrieval. <p>This
 	 * only works with InternalResourceViews, as Errors instances are part of the model and not normally exposed as
@@ -181,6 +181,7 @@ public RequestContext(HttpServletRequest request, HttpServletResponse response,
 	protected RequestContext() {
 	}
 
+
 	/**
 	 * Initialize this context with the given request, using the given model attributes for Errors retrieval.
 	 * <p>Delegates to {@code getFallbackLocale} and {@code getFallbackTheme} for determining the fallback
@@ -214,7 +215,8 @@ protected void initContext(HttpServletRequest request, HttpServletResponse respo
 		if (localeResolver != null) {
 			// Try LocaleResolver (we're within a DispatcherServlet request).
 			this.locale = localeResolver.resolveLocale(request);
-		} else {
+		}
+		else {
 			// No LocaleResolver available -> try fallback.
 			this.locale = getFallbackLocale();
 		}
@@ -225,13 +227,10 @@ protected void initContext(HttpServletRequest request, HttpServletResponse respo
 
 		this.urlPathHelper = new UrlPathHelper();
 
-		try {
+		if (this.webApplicationContext.containsBean(REQUEST_DATA_VALUE_PROCESSOR_BEAN_NAME)) {
 			this.requestDataValueProcessor = this.webApplicationContext.getBean(
 					REQUEST_DATA_VALUE_PROCESSOR_BEAN_NAME, RequestDataValueProcessor.class);
 		}
-		catch (NoSuchBeanDefinitionException ex) {
-			// Ignored
-		}
 	}
 
 	/**
@@ -269,6 +268,7 @@ protected Theme getFallbackTheme() {
 		return theme;
 	}
 
+
 	/**
 	 * Return the underlying HttpServletRequest. Only intended for cooperating classes in this package.
 	 */
@@ -702,7 +702,8 @@ public Errors getErrors(String name, boolean htmlEscape) {
 		if (htmlEscape && !(errors instanceof EscapedErrors)) {
 			errors = new EscapedErrors(errors);
 			put = true;
-		} else if (!htmlEscape && errors instanceof EscapedErrors) {
+		}
+		else if (!htmlEscape && errors instanceof EscapedErrors) {
 			errors = ((EscapedErrors) errors).getSource();
 			put = true;
 		}
@@ -720,7 +721,8 @@ public Errors getErrors(String name, boolean htmlEscape) {
 	protected Object getModelObject(String modelName) {
 		if (this.model != null) {
 			return this.model.get(modelName);
-		} else {
+		}
+		else {
 			return this.request.getAttribute(modelName);
 		}
 	}
@@ -746,9 +748,10 @@ public BindStatus getBindStatus(String path, boolean htmlEscape) throws IllegalS
 		return new BindStatus(this, path, htmlEscape);
 	}
 
+
 	/**
-	 * Inner class that isolates the JSTL dependency. Just called to resolve the fallback locale if the JSTL API is
-	 * present.
+	 * Inner class that isolates the JSTL dependency.
+	 * Just called to resolve the fallback locale if the JSTL API is present.
 	 */
 	private static class JstlLocaleResolver {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
index f992839046..e0b22a9c87 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
@@ -18,7 +18,6 @@
 
 import java.util.Locale;
 import java.util.Map;
-
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -41,6 +40,7 @@
  * Locale, ThemeResolver, Theme, and MultipartResolver.
  *
  * @author Juergen Hoeller
+ * @author Rossen Stoyanchev
  * @since 03.03.2003
  * @see RequestContext
  * @see org.springframework.web.servlet.DispatcherServlet
@@ -160,7 +160,7 @@ public static Theme getTheme(HttpServletRequest request) {
 	 * Return a read-only {@link Map} with "input" flash attributes saved on a
 	 * previous request.
 	 * @param request the current request
-	 * @return a read-only Map, or {@code null}
+	 * @return a read-only Map, or {@code null} if not found
 	 * @see FlashMap
 	 */
 	@SuppressWarnings("unchecked")
@@ -170,8 +170,8 @@ public static Theme getTheme(HttpServletRequest request) {
 
 	/**
 	 * Return the "output" FlashMap with attributes to save for a subsequent request.
-	 * @param request current request
-	 * @return a {@link FlashMap} instance, never {@code null}
+	 * @param request the current request
+	 * @return a {@link FlashMap} instance (never {@code null} within a DispatcherServlet request)
 	 * @see FlashMap
 	 */
 	public static FlashMap getOutputFlashMap(HttpServletRequest request) {
@@ -182,6 +182,7 @@ public static FlashMap getOutputFlashMap(HttpServletRequest request) {
 	 * Return the FlashMapManager instance to save flash attributes with
 	 * before a redirect.
 	 * @param request the current request
+	 * @return a {@link FlashMapManager} instance (never {@code null} within a DispatcherServlet request)
 	 */
 	public static FlashMapManager getFlashMapManager(HttpServletRequest request) {
 		return (FlashMapManager) request.getAttribute(DispatcherServlet.FLASH_MAP_MANAGER_ATTRIBUTE);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java
index 7ad0d49b78..05e95ffc30 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,9 @@ public class ServletUriComponentsBuilder extends UriComponentsBuilder {
 	protected ServletUriComponentsBuilder() {
 	}
 
+
+	// Factory methods based on a HttpServletRequest
+
 	/**
 	 * Prepare a builder from the host, port, scheme, and context path of
 	 * an HttpServletRequest.
@@ -60,9 +63,7 @@ public static ServletUriComponentsBuilder fromContextPath(HttpServletRequest req
 
 	/**
 	 * Prepare a builder from the host, port, scheme, context path, and
-	 * servlet mapping of an HttpServletRequest. The results may vary depending
-	 * on the type of servlet mapping used.
-	 *
+	 * servlet mapping of the given HttpServletRequest.
 	 * <p>If the servlet is mapped by name, e.g. {@code "/main/*"}, the path
 	 * will end with "/main". If the servlet is mapped otherwise, e.g.
 	 * {@code "/"} or {@code "*.do"}, the result will be the same as
@@ -94,14 +95,27 @@ public static ServletUriComponentsBuilder fromRequestUri(HttpServletRequest requ
 	public static ServletUriComponentsBuilder fromRequest(HttpServletRequest request) {
 		String scheme = request.getScheme();
 		int port = request.getServerPort();
+		String host = request.getServerName();
 
 		String header = request.getHeader("X-Forwarded-Host");
-		String host = StringUtils.hasText(header) ? header: request.getServerName();
+
+		if (StringUtils.hasText(header)) {
+			String[] hosts = StringUtils.commaDelimitedListToStringArray(header);
+			String hostToUse = hosts[0];
+			if (hostToUse.contains(":")) {
+				String[] hostAndPort = StringUtils.split(hostToUse, ":");
+				host  = hostAndPort[0];
+				port = Integer.parseInt(hostAndPort[1]);
+			}
+			else {
+				host = hostToUse;
+			}
+		}
 
 		ServletUriComponentsBuilder builder = new ServletUriComponentsBuilder();
 		builder.scheme(scheme);
 		builder.host(host);
-		if ((scheme.equals("http") && port != 80) || (scheme.equals("https") && port != 443)) {
+		if (("http".equals(scheme) && port != 80) || ("https".equals(scheme) && port != 443)) {
 			builder.port(port);
 		}
 		builder.path(request.getRequestURI());
@@ -109,6 +123,9 @@ public static ServletUriComponentsBuilder fromRequest(HttpServletRequest request
 		return builder;
 	}
 
+
+	// Alternative methods relying on RequestContextHolder to find the request
+
 	/**
 	 * Same as {@link #fromContextPath(HttpServletRequest)} except the
 	 * request is obtained through {@link RequestContextHolder}.
@@ -142,7 +159,7 @@ public static ServletUriComponentsBuilder fromCurrentRequest() {
 	}
 
 	/**
-	 * Obtain the request through {@link RequestContextHolder}.
+	 * Obtain current request through {@link RequestContextHolder}.
 	 */
 	protected static HttpServletRequest getCurrentRequest() {
 		RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/SessionFlashMapManager.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/SessionFlashMapManager.java
index 527f89d633..abd8829963 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/SessionFlashMapManager.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/SessionFlashMapManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.web.servlet.support;
 
 import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -30,10 +29,11 @@
  * @author Rossen Stoyanchev
  * @since 3.1.1
  */
-public class SessionFlashMapManager extends AbstractFlashMapManager{
+public class SessionFlashMapManager extends AbstractFlashMapManager {
 
 	private static final String FLASH_MAPS_SESSION_ATTRIBUTE = SessionFlashMapManager.class.getName() + ".FLASH_MAPS";
 
+
 	/**
 	 * Retrieve saved FlashMap instances from the HTTP Session.
 	 * <p>Does not cause an HTTP session to be created but may update it if a
@@ -43,7 +43,7 @@ public class SessionFlashMapManager extends AbstractFlashMapManager{
 	@SuppressWarnings("unchecked")
 	protected List<FlashMap> retrieveFlashMaps(HttpServletRequest request) {
 		HttpSession session = request.getSession(false);
-		return (session != null) ? (List<FlashMap>) session.getAttribute(FLASH_MAPS_SESSION_ATTRIBUTE) : null;
+		return (session != null ? (List<FlashMap>) session.getAttribute(FLASH_MAPS_SESSION_ATTRIBUTE) : null);
 	}
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
index ec1cf27cc3..087bcc0f85 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
 import org.springframework.web.HttpSessionRequiredException;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.context.support.WebApplicationObjectSupport;
-import org.springframework.web.servlet.mvc.LastModified;
 
 /**
  * Convenient superclass for any kind of web content generator,
@@ -121,7 +120,7 @@ public WebContentGenerator(String... supportedMethods) {
 	 * <p>Default is GET, HEAD and POST for simple form controller types;
 	 * unrestricted for general controllers and interceptors.
 	 */
-	public final void setSupportedMethods(String[] methods) {
+	public final void setSupportedMethods(String... methods) {
 		if (methods != null) {
 			this.supportedMethods = new HashSet<String>(Arrays.asList(methods));
 		}
@@ -204,14 +203,14 @@ public final boolean isUseCacheControlNoStore() {
 	 * programmatically do a lastModified calculation as described in
 	 * {@link WebRequest#checkNotModified(long)}. Default is "false",
 	 * effectively relying on whether the handler implements
-	 * {@link LastModified} or not.
+	 * {@link org.springframework.web.servlet.mvc.LastModified} or not.
 	 */
 	public void setAlwaysMustRevalidate(boolean mustRevalidate) {
 		this.alwaysMustRevalidate = mustRevalidate;
 	}
 
 	/**
-	 * Return whether 'must-revaliate' is added to every Cache-Control header.
+	 * Return whether 'must-revalidate' is added to every Cache-Control header.
 	 */
 	public boolean isAlwaysMustRevalidate() {
 		return alwaysMustRevalidate;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
index 1af5e3972f..e8173fdddd 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package org.springframework.web.servlet.tags.form;
 
+import java.io.UnsupportedEncodingException;
 import java.util.Map;
-
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
@@ -32,6 +32,7 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.support.RequestDataValueProcessor;
 import org.springframework.web.util.HtmlUtils;
+import org.springframework.web.util.UriUtils;
 
 /**
  * Databinding-aware JSP tag for rendering an HTML '{@code form}' whose
@@ -111,6 +112,8 @@ public class FormTag extends AbstractHtmlElementTag {
 
 	private String action;
 
+	private String servletRelativeAction;
+
 	private String method = DEFAULT_METHOD;
 
 	private String target;
@@ -196,6 +199,21 @@ protected String getAction() {
 		return this.action;
 	}
 
+	/**
+	 * Set the value of the '{@code action}' attribute.
+	 * <p>May be a runtime expression.
+	 */
+	public void setServletRelativeAction(String servletRelativeaction) {
+		this.servletRelativeAction = (servletRelativeaction != null ? servletRelativeaction : "");
+	}
+
+	/**
+	 * Get the value of the '{@code action}' attribute.
+	 */
+	protected String getServletRelativeAction() {
+		return this.servletRelativeAction;
+	}
+
 	/**
 	 * Set the value of the '{@code method}' attribute.
 	 * <p>May be a runtime expression.
@@ -335,8 +353,7 @@ protected int writeTagContent(TagWriter tagWriter) throws JspException {
 		tagWriter.startTag(FORM_TAG);
 		writeDefaultAttributes(tagWriter);
 		tagWriter.writeAttribute(ACTION_ATTRIBUTE, resolveAction());
-		writeOptionalAttribute(tagWriter, METHOD_ATTRIBUTE,
-				isMethodBrowserSupported(getMethod()) ? getMethod() : DEFAULT_METHOD);
+		writeOptionalAttribute(tagWriter, METHOD_ATTRIBUTE, getHttpMethod());
 		writeOptionalAttribute(tagWriter, TARGET_ATTRIBUTE, getTarget());
 		writeOptionalAttribute(tagWriter, ENCTYPE_ATTRIBUTE, getEnctype());
 		writeOptionalAttribute(tagWriter, ACCEPT_CHARSET_ATTRIBUTE, getAcceptCharset());
@@ -372,6 +389,10 @@ protected int writeTagContent(TagWriter tagWriter) throws JspException {
 		return EVAL_BODY_INCLUDE;
 	}
 
+	private String getHttpMethod() {
+		return (isMethodBrowserSupported(getMethod()) ? getMethod() : DEFAULT_METHOD);
+	}
+
 	private void assertHttpMethod(String method) {
 		for (HttpMethod httpMethod : HttpMethod.values()) {
 			if (httpMethod.name().equalsIgnoreCase(method)) {
@@ -403,24 +424,39 @@ protected String resolveModelAttribute() throws JspException {
 
 	/**
 	 * Resolve the value of the '{@code action}' attribute.
-	 * <p>If the user configured an '{@code action}' value then
-	 * the result of evaluating this value is used. Otherwise, the
-	 * {@link org.springframework.web.servlet.support.RequestContext#getRequestUri() originating URI}
-	 * is used.
+	 * <p>If the user configured an '{@code action}' value then the result of
+	 * evaluating this value is used. If the user configured an
+	 * '{@code servletRelativeAction}' value then the value is prepended
+	 * with the context and servlet paths, and the result is used. Otherwise, the
+	 * {@link org.springframework.web.servlet.support.RequestContext#getRequestUri()
+	 * originating URI} is used.
 	 * @return the value that is to be used for the '{@code action}' attribute
 	 */
 	protected String resolveAction() throws JspException {
 		String action = getAction();
+		String servletRelativeAction = getServletRelativeAction();
 		if (StringUtils.hasText(action)) {
-			String pathToServlet = getRequestContext().getPathToServlet();
-			if (action.startsWith("/") && !action.startsWith(getRequestContext().getContextPath())) {
-				action = pathToServlet + action;
-			}
 			action = getDisplayString(evaluate(ACTION_ATTRIBUTE, action));
 			return processAction(action);
 		}
+		else if (StringUtils.hasText(servletRelativeAction)) {
+			String pathToServlet = getRequestContext().getPathToServlet();
+			if (servletRelativeAction.startsWith("/") &&
+					!servletRelativeAction.startsWith(getRequestContext().getContextPath())) {
+				servletRelativeAction = pathToServlet + servletRelativeAction;
+			}
+			servletRelativeAction = getDisplayString(evaluate(ACTION_ATTRIBUTE, servletRelativeAction));
+			return processAction(servletRelativeAction);
+		}
 		else {
 			String requestUri = getRequestContext().getRequestUri();
+			String encoding = this.pageContext.getResponse().getCharacterEncoding();
+			try {
+				requestUri = UriUtils.encodePath(requestUri, encoding);
+			}
+			catch (UnsupportedEncodingException ex) {
+				// shouldn't happen - if it does, proceed with requestUri as-is
+			}
 			ServletResponse response = this.pageContext.getResponse();
 			if (response instanceof HttpServletResponse) {
 				requestUri = ((HttpServletResponse) response).encodeURL(requestUri);
@@ -446,7 +482,7 @@ protected String resolveAction() throws JspException {
 	private String processAction(String action) {
 		RequestDataValueProcessor processor = getRequestContext().getRequestDataValueProcessor();
 		ServletRequest request = this.pageContext.getRequest();
-		if ((processor != null) && (request instanceof HttpServletRequest)) {
+		if (processor != null && request instanceof HttpServletRequest) {
 			action = processor.processAction((HttpServletRequest) request, action);
 		}
 		return action;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java
index f8dd7f28e8..cf1e2e6c90 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,6 @@
  * Databinding-aware JSP tag for rendering an HTML '{@code label}' element
  * that defines text that is associated with a single form element.
  *
- * <p>The {@link #setFor(String) 'for'} attribute is required.
- *
  * <p>See the "formTags" showcase application that ships with the
  * full Spring distribution for an example of this class in action.
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java
index 0c57b8dd9b..2a6606cb31 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java
@@ -150,7 +150,8 @@ protected int writeTagContent(TagWriter tagWriter) throws JspException {
 		Object itemsObject = null;
 		if (items != null) {
 			itemsObject = (items instanceof String ? evaluate("items", items) : items);
-		} else {
+		}
+		else {
 			Class<?> selectTagBoundType = selectTag.getBindStatus().getValueType();
 			if (selectTagBoundType != null && selectTagBoundType.isEnum()) {
 				itemsObject = selectTagBoundType.getEnumConstants();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java
index 02b5b9b7a8..5400abe27e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,20 +35,21 @@ public class PasswordInputTag extends InputTag {
 
 	/**
 	 * Is the password value to be rendered?
-	 * @return {@code true} if the password value to be rendered.
+	 * @param showPassword {@code true} if the password value is to be rendered
 	 */
-	public boolean isShowPassword() {
-		return this.showPassword;
+	public void setShowPassword(boolean showPassword) {
+		this.showPassword = showPassword;
 	}
 
 	/**
 	 * Is the password value to be rendered?
-	 * @param showPassword {@code true} if the password value is to be rendered.
+	 * @return {@code true} if the password value to be rendered
 	 */
-	public void setShowPassword(boolean showPassword) {
-		this.showPassword = showPassword;
+	public boolean isShowPassword() {
+		return this.showPassword;
 	}
 
+
 	/**
 	 * Flags "type" as an illegal dynamic attribute.
 	 */
@@ -75,8 +76,10 @@ protected String getType() {
 	protected void writeValue(TagWriter tagWriter) throws JspException {
 		if (this.showPassword) {
 			super.writeValue(tagWriter);
-		} else {
+		}
+		else {
 			tagWriter.writeAttribute("value", processFieldValue(getName(), "", getType()));
 		}
 	}
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java
index 8446f9f2b1..9fcfcf509a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,10 +94,10 @@ else if (boundValue == null) {
 			selected = collectionCompare(CollectionUtils.arrayToList(boundValue), candidateValue, bindStatus);
 		}
 		else if (boundValue instanceof Collection) {
-			selected = collectionCompare((Collection) boundValue, candidateValue, bindStatus);
+			selected = collectionCompare((Collection<?>) boundValue, candidateValue, bindStatus);
 		}
 		else if (boundValue instanceof Map) {
-			selected = mapCompare((Map) boundValue, candidateValue, bindStatus);
+			selected = mapCompare((Map<?, ?>) boundValue, candidateValue, bindStatus);
 		}
 		if (!selected) {
 			selected = exhaustiveCompare(boundValue, candidateValue, bindStatus.getEditor(), null);
@@ -105,7 +105,7 @@ else if (boundValue instanceof Map) {
 		return selected;
 	}
 
-	private static boolean collectionCompare(Collection boundCollection, Object candidateValue, BindStatus bindStatus) {
+	private static boolean collectionCompare(Collection<?> boundCollection, Object candidateValue, BindStatus bindStatus) {
 		try {
 			if (boundCollection.contains(candidateValue)) {
 				return true;
@@ -117,7 +117,7 @@ private static boolean collectionCompare(Collection boundCollection, Object cand
 		return exhaustiveCollectionCompare(boundCollection, candidateValue, bindStatus);
 	}
 
-	private static boolean mapCompare(Map boundMap, Object candidateValue, BindStatus bindStatus) {
+	private static boolean mapCompare(Map<?, ?> boundMap, Object candidateValue, BindStatus bindStatus) {
 		try {
 			if (boundMap.containsKey(candidateValue)) {
 				return true;
@@ -130,7 +130,7 @@ private static boolean mapCompare(Map boundMap, Object candidateValue, BindStatu
 	}
 
 	private static boolean exhaustiveCollectionCompare(
-			Collection collection, Object candidateValue, BindStatus bindStatus) {
+			Collection<?> collection, Object candidateValue, BindStatus bindStatus) {
 
 		Map<PropertyEditor, Object> convertedValueCache = new HashMap<PropertyEditor, Object>(1);
 		PropertyEditor editor = null;
@@ -164,8 +164,8 @@ private static boolean exhaustiveCompare(Object boundValue, Object candidate,
 				return true;
 			}
 		}
-		else if (boundValue.getClass().isEnum()) {
-			Enum boundEnum = (Enum) boundValue;
+		else if (boundValue != null && boundValue.getClass().isEnum()) {
+			Enum<?> boundEnum = (Enum<?>) boundValue;
 			String enumCodeAsString = ObjectUtils.getDisplayString(boundEnum.name());
 			if (enumCodeAsString.equals(candidateDisplayString)) {
 				return true;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java
index 2666098734..96e42a4e9d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,13 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.ThemeResolver;
 import org.springframework.web.util.CookieGenerator;
 import org.springframework.web.util.WebUtils;
 
 /**
- * Implementation of ThemeResolver that uses a cookie sent back to the user
+ * {@link ThemeResolver} implementation that uses a cookie sent back to the user
  * in case of a custom setting, with a fallback to the default theme.
  * This is particularly useful for stateless applications without user sessions.
  *
@@ -78,28 +79,34 @@ public String getDefaultThemeName() {
 
 	public String resolveThemeName(HttpServletRequest request) {
 		// Check request for preparsed or preset theme.
-		String theme = (String) request.getAttribute(THEME_REQUEST_ATTRIBUTE_NAME);
-		if (theme != null) {
-			return theme;
+		String themeName = (String) request.getAttribute(THEME_REQUEST_ATTRIBUTE_NAME);
+		if (themeName != null) {
+			return themeName;
 		}
 
 		// Retrieve cookie value from request.
 		Cookie cookie = WebUtils.getCookie(request, getCookieName());
 		if (cookie != null) {
-			return cookie.getValue();
+			String value = cookie.getValue();
+			if (StringUtils.hasText(value)) {
+				themeName = value;
+			}
 		}
 
 		// Fall back to default theme.
-		return getDefaultThemeName();
+		if (themeName == null) {
+			themeName = getDefaultThemeName();
+		}
+		request.setAttribute(THEME_REQUEST_ATTRIBUTE_NAME, themeName);
+		return themeName;
 	}
 
 	public void setThemeName(HttpServletRequest request, HttpServletResponse response, String themeName) {
-		if (themeName != null) {
+		if (StringUtils.hasText(themeName)) {
 			// Set request attribute and add cookie.
 			request.setAttribute(THEME_REQUEST_ATTRIBUTE_NAME, themeName);
 			addCookie(response, themeName);
 		}
-
 		else {
 			// Set request attribute to fallback theme and remove cookie.
 			request.setAttribute(THEME_REQUEST_ATTRIBUTE_NAME, getDefaultThemeName());
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java
index 75aae57b61..87dcee9a33 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,9 @@
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * Implementation of ThemeResolver that simply uses a fixed theme.
- * The fixed name can be defined via the "defaultThemeName" property.
+ * {@link org.springframework.web.servlet.ThemeResolver} implementation
+ * that simply uses a fixed theme. The fixed name can be defined via
+ * the "defaultThemeName" property; out of the box, it is "theme".
  *
  * <p>Note: Does not support {@code setThemeName}, as the fixed theme
  * cannot be changed.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java
index 686f7a2708..e2e8d6570f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.util.StringUtils;
 import org.springframework.web.util.WebUtils;
 
 /**
- * Implementation of ThemeResolver that uses a theme attribute in the user's
- * session in case of a custom setting, with a fallback to the default theme.
- * This is most appropriate if the application needs user sessions anyway.
+ * {@link org.springframework.web.servlet.ThemeResolver} implementation that
+ * uses a theme attribute in the user's session in case of a custom setting,
+ * with a fallback to the default theme. This is most appropriate if the
+ * application needs user sessions anyway.
  *
  * <p>Custom controllers can override the user's theme by calling
  * {@code setThemeName}, e.g. responding to a theme change request.
@@ -46,14 +48,16 @@ public class SessionThemeResolver extends AbstractThemeResolver {
 	 */
 	public static final String THEME_SESSION_ATTRIBUTE_NAME = SessionThemeResolver.class.getName() + ".THEME";
 
+
 	public String resolveThemeName(HttpServletRequest request) {
-		String theme = (String) WebUtils.getSessionAttribute(request, THEME_SESSION_ATTRIBUTE_NAME);
-		// specific theme, or fallback to default?
-		return (theme != null ? theme : getDefaultThemeName());
+		String themeName = (String) WebUtils.getSessionAttribute(request, THEME_SESSION_ATTRIBUTE_NAME);
+		// A specific theme indicated, or do we need to fallback to the default?
+		return (themeName != null ? themeName : getDefaultThemeName());
 	}
 
 	public void setThemeName(HttpServletRequest request, HttpServletResponse response, String themeName) {
-		WebUtils.setSessionAttribute(request, THEME_SESSION_ATTRIBUTE_NAME, themeName);
+		WebUtils.setSessionAttribute(request, THEME_SESSION_ATTRIBUTE_NAME,
+				(StringUtils.hasText(themeName) ? themeName : null));
 	}
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java
index c3b389c09e..9dad679c87 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/ThemeChangeInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 
 /**
  * Interceptor that allows for changing the current theme on every request,
- * via a configurable request parameter.
+ * via a configurable request parameter (default parameter name: "theme").
  *
  * @author Juergen Hoeller
  * @since 20.06.2003
@@ -63,12 +63,12 @@ public String getParamName() {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws ServletException {
 
-		ThemeResolver themeResolver = RequestContextUtils.getThemeResolver(request);
-		if (themeResolver == null) {
-			throw new IllegalStateException("No ThemeResolver found: not in a DispatcherServlet request?");
-		}
 		String newTheme = request.getParameter(this.paramName);
 		if (newTheme != null) {
+			ThemeResolver themeResolver = RequestContextUtils.getThemeResolver(request);
+			if (themeResolver == null) {
+				throw new IllegalStateException("No ThemeResolver found: not in a DispatcherServlet request?");
+			}
 			themeResolver.setThemeName(request, response, newTheme);
 		}
 		// Proceed in any case.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateViewResolver.java
index 7a13309b67..3250cf35ea 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateViewResolver.java
@@ -44,7 +44,7 @@ public class AbstractTemplateViewResolver extends UrlBasedViewResolver {
 
 
 	@Override
-	protected Class requiredViewClass() {
+	protected Class<?> requiredViewClass() {
 		return AbstractTemplateView.class;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java
index 5ec4806647..67b7006c9c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,10 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
-
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -70,11 +69,12 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement
 	private String requestContextAttribute;
 
 	/** Map of static attributes, keyed by attribute name (String) */
-	private final Map<String, Object> staticAttributes = new HashMap<String, Object>();
+	private final Map<String, Object> staticAttributes = new LinkedHashMap<String, Object>();
 
 	/** Whether or not the view should add path variables in the model */
 	private boolean exposePathVariables = true;
 
+
 	/**
 	 * Set the view's name. Helpful for traceability.
 	 * <p>Framework code must call this when constructing views.
@@ -225,7 +225,7 @@ public Map<String, Object> getStaticAttributes() {
 	}
 
 	/**
-	 * Whether to add path variables in the model or not.
+	 * Specify whether to add path variables to the model or not.
 	 * <p>Path variables are commonly bound to URI template variables through the {@code @PathVariable}
 	 * annotation. They're are effectively URI template variables with type conversion applied to
 	 * them to derive typed Object values. Such values are frequently needed in views for
@@ -233,19 +233,20 @@ public Map<String, Object> getStaticAttributes() {
 	 * <p>Path variables added to the model override static attributes (see {@link #setAttributes(Properties)})
 	 * but not attributes already present in the model.
 	 * <p>By default this flag is set to {@code true}. Concrete view types can override this.
-	 * @param exposePathVariables {@code true} to expose path variables, and {@code false} otherwise.
+	 * @param exposePathVariables {@code true} to expose path variables, and {@code false} otherwise
 	 */
 	public void setExposePathVariables(boolean exposePathVariables) {
 		this.exposePathVariables = exposePathVariables;
 	}
 
 	/**
-	 * Returns the value of the flag indicating whether path variables should be added to the model or not.
+	 * Return whether to add path variables to the model or not.
 	 */
 	public boolean isExposePathVariables() {
-		return exposePathVariables;
+		return this.exposePathVariables;
 	}
 
+
 	/**
 	 * Prepares the view given the specified model, merging it with static
 	 * attributes and a RequestContext attribute, if necessary.
@@ -259,7 +260,6 @@ public void render(Map<String, ?> model, HttpServletRequest request, HttpServlet
 		}
 
 		Map<String, Object> mergedModel = createMergedOutputModel(model, request, response);
-
 		prepareResponse(request, response);
 		renderMergedOutputModel(mergedModel, request, response);
 	}
@@ -270,15 +270,17 @@ public void render(Map<String, ?> model, HttpServletRequest request, HttpServlet
 	 */
 	protected Map<String, Object> createMergedOutputModel(Map<String, ?> model, HttpServletRequest request,
 			HttpServletResponse response) {
+
 		@SuppressWarnings("unchecked")
-		Map<String, Object> pathVars = this.exposePathVariables ?
-			(Map<String, Object>) request.getAttribute(View.PATH_VARIABLES) : null;
+		Map<String, Object> pathVars = (this.exposePathVariables ?
+				(Map<String, Object>) request.getAttribute(View.PATH_VARIABLES) : null);
 
 		// Consolidate static and dynamic model attributes.
 		int size = this.staticAttributes.size();
-		size += (model != null) ? model.size() : 0;
-		size += (pathVars != null) ? pathVars.size() : 0;
-		Map<String, Object> mergedModel = new HashMap<String, Object>(size);
+		size += (model != null ? model.size() : 0);
+		size += (pathVars != null ? pathVars.size() : 0);
+
+		Map<String, Object> mergedModel = new LinkedHashMap<String, Object>(size);
 		mergedModel.putAll(this.staticAttributes);
 		if (pathVars != null) {
 			mergedModel.putAll(pathVars);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java
index a8ca84e664..330fa0dd81 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java
@@ -26,25 +26,24 @@
 import org.springframework.web.servlet.ViewResolver;
 
 /**
- * Simple implementation of ViewResolver that interprets a view name
- * as bean name in the current application context, i.e. in the XML
- * file of the executing DispatcherServlet.
+ * A simple implementation of {@link org.springframework.web.servlet.ViewResolver}
+ * that interprets a view name as a bean name in the current application context,
+ * i.e. typically in the XML file of the executing {@code DispatcherServlet}.
  *
- * <p>This resolver can be handy for small applications, keeping all
- * definitions ranging from controllers to views in the same place.
- * For normal applications, XmlViewResolver will be the better choice, as
- * it separates the XML view bean definitions into a dedicated views file.
- * View beans should virtually never have references to any other
- * application beans - such a separation will make this clear.
+ * <p>This resolver can be handy for small applications, keeping all definitions
+ * ranging from controllers to views in the same place. For larger applications,
+ * {@link XmlViewResolver} will be the better choice, as it separates the XML
+ * view bean definitions into a dedicated views file.
  *
- * <p>This ViewResolver does not support internationalization.
- * Conside ResourceBundleViewResolver if you need to apply different
- * view resources per locale.
+ * <p>Note: Neither this {@code ViewResolver} nor {@link XmlViewResolver} supports
+ * internationalization. Consider {@link ResourceBundleViewResolver} if you need
+ * to apply different view resources per locale.
  *
- * <p>Note: This ViewResolver implements the Ordered interface to allow for
- * flexible participation in ViewResolver chaining. For example, some special
- * views could be defined via this ViewResolver (giving it 0 as "order" value),
- * while all remaining views could be resolved by a UrlBasedViewResolver.
+ * <p>Note: This {@code ViewResolver} implements the {@link Ordered} interface
+ * in order to allow for flexible participation in {@code ViewResolver} chaining.
+ * For example, some special views could be defined via this {@code ViewResolver}
+ * (giving it 0 as "order" value), while all remaining views could be resolved by
+ * a {@link UrlBasedViewResolver}.
  *
  * @author Juergen Hoeller
  * @since 18.06.2003
@@ -62,14 +61,14 @@ public void setOrder(int order) {
 	}
 
 	public int getOrder() {
-		return order;
+		return this.order;
 	}
 
 
 	public View resolveViewName(String viewName, Locale locale) throws BeansException {
 		ApplicationContext context = getApplicationContext();
 		if (!context.containsBean(viewName)) {
-			// Allow for ViewResolver chaining.
+			// Allow for ViewResolver chaining...
 			return null;
 		}
 		return context.getBean(viewName, View.class);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
index f7b59c3f6c..f8d6df9501 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+
 import javax.activation.FileTypeMap;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -32,7 +33,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.OrderComparator;
@@ -304,7 +304,11 @@ public View resolveViewName(String viewName, Locale locale) throws Exception {
 	protected List<MediaType> getMediaTypes(HttpServletRequest request) {
 		try {
 			ServletWebRequest webRequest = new ServletWebRequest(request);
+
 			List<MediaType> acceptableMediaTypes = this.contentNegotiationManager.resolveMediaTypes(webRequest);
+			acceptableMediaTypes = acceptableMediaTypes.isEmpty() ?
+					Collections.singletonList(MediaType.ALL) : acceptableMediaTypes;
+
 			List<MediaType> producibleMediaTypes = getProducibleMediaTypes(request);
 			Set<MediaType> compatibleMediaTypes = new LinkedHashSet<MediaType>();
 			for (MediaType acceptable : acceptableMediaTypes) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
index 83c2bb55c2..7af40457fc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -156,7 +156,7 @@ public void setExposeContextBeansAsAttributes(boolean exposeContextBeansAsAttrib
 	 * the {@link #setExposeContextBeansAsAttributes "exposeContextBeansAsAttributes"}
 	 * flag on but do not list specific bean names for this property.
 	 */
-	public void setExposedContextBeanNames(String[] exposedContextBeanNames) {
+	public void setExposedContextBeanNames(String... exposedContextBeanNames) {
 		this.exposedContextBeanNames = new HashSet<String>(Arrays.asList(exposedContextBeanNames));
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java
index cd55f05377..e1866649a7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,22 +63,22 @@ public class InternalResourceViewResolver extends UrlBasedViewResolver {
 	 * is present.
 	 */
 	public InternalResourceViewResolver() {
-		Class viewClass = requiredViewClass();
+		Class<?> viewClass = requiredViewClass();
 		if (viewClass.equals(InternalResourceView.class) && jstlPresent) {
 			viewClass = JstlView.class;
 		}
 		setViewClass(viewClass);
 	}
 
+
 	/**
 	 * This resolver requires {@link InternalResourceView}.
 	 */
 	@Override
-	protected Class requiredViewClass() {
+	protected Class<?> requiredViewClass() {
 		return InternalResourceView.class;
 	}
 
-
 	/**
 	 * Specify whether to always include the view rather than forward to it.
 	 * <p>Default is "false". Switch this flag on to enforce the use of a
@@ -86,7 +86,7 @@ protected Class requiredViewClass() {
 	 * @see InternalResourceView#setAlwaysInclude
 	 */
 	public void setAlwaysInclude(boolean alwaysInclude) {
-		this.alwaysInclude = Boolean.valueOf(alwaysInclude);
+		this.alwaysInclude = alwaysInclude;
 	}
 
 	/**
@@ -108,7 +108,7 @@ public void setExposeContextBeansAsAttributes(boolean exposeContextBeansAsAttrib
 	 * attributes.
 	 * @see InternalResourceView#setExposedContextBeanNames
 	 */
-	public void setExposedContextBeanNames(String[] exposedContextBeanNames) {
+	public void setExposedContextBeanNames(String... exposedContextBeanNames) {
 		this.exposedContextBeanNames = exposedContextBeanNames;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
index 0f96d4832a..83451c11f7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.http.HttpStatus;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -250,15 +249,15 @@ protected boolean isContextRequired() {
 		return false;
 	}
 
+
 	/**
 	 * Convert model to request parameters and redirect to the given URL.
 	 * @see #appendQueryProperties
 	 * @see #sendRedirect
 	 */
 	@Override
-	protected void renderMergedOutputModel(
-			Map<String, Object> model, HttpServletRequest request, HttpServletResponse response)
-			throws IOException {
+	protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request,
+			HttpServletResponse response) throws IOException {
 
 		String targetUrl = createTargetUrl(model, request);
 		targetUrl = updateTargetUrl(targetUrl, model, request, response);
@@ -268,11 +267,13 @@ protected void renderMergedOutputModel(
 			UriComponents uriComponents = UriComponentsBuilder.fromUriString(targetUrl).build();
 			flashMap.setTargetRequestPath(uriComponents.getPath());
 			flashMap.addTargetRequestParams(uriComponents.getQueryParams());
+			FlashMapManager flashMapManager = RequestContextUtils.getFlashMapManager(request);
+			if (flashMapManager == null) {
+				throw new IllegalStateException("FlashMapManager not found despite output FlashMap having been set");
+			}
+			flashMapManager.saveOutputFlashMap(flashMap, request, response);
 		}
 
-		FlashMapManager flashMapManager = RequestContextUtils.getFlashMapManager(request);
-		flashMapManager.saveOutputFlashMap(flashMap, request, response);
-
 		sendRedirect(request, response, targetUrl, this.http10Compatible);
 	}
 
@@ -304,7 +305,6 @@ protected final String createTargetUrl(Map<String, Object> model, HttpServletReq
 			Map<String, String> variables = getCurrentRequestUriVariables(request);
 			targetUrl = replaceUriTemplateVariables(targetUrl.toString(), model, variables, enc);
 		}
-
 		if (this.exposeModelAttributes) {
 			appendQueryProperties(targetUrl, model, enc);
 		}
@@ -327,15 +327,17 @@ protected StringBuilder replaceUriTemplateVariables(
 			throws UnsupportedEncodingException {
 
 		StringBuilder result = new StringBuilder();
-		Matcher m = URI_TEMPLATE_VARIABLE_PATTERN.matcher(targetUrl);
+		Matcher matcher = URI_TEMPLATE_VARIABLE_PATTERN.matcher(targetUrl);
 		int endLastMatch = 0;
-		while (m.find()) {
-			String name = m.group(1);
-			Object value = model.containsKey(name) ? model.remove(name) : currentUriVariables.get(name);
-			Assert.notNull(value, "Model has no value for '" + name + "'");
-			result.append(targetUrl.substring(endLastMatch, m.start()));
+		while (matcher.find()) {
+			String name = matcher.group(1);
+			Object value = (model.containsKey(name) ? model.remove(name) : currentUriVariables.get(name));
+			if (value == null) {
+				throw new IllegalArgumentException("Model has no value for key '" + name + "'");
+			}
+			result.append(targetUrl.substring(endLastMatch, matcher.start()));
 			result.append(UriUtils.encodePathSegment(value.toString(), encodingScheme));
-			endLastMatch = m.end();
+			endLastMatch = matcher.end();
 		}
 		result.append(targetUrl.substring(endLastMatch, targetUrl.length()));
 		return result;
@@ -344,7 +346,7 @@ protected StringBuilder replaceUriTemplateVariables(
 	@SuppressWarnings("unchecked")
 	private Map<String, String> getCurrentRequestUriVariables(HttpServletRequest request) {
 		Map<String, String> uriVars =
-			(Map<String, String>) request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
+				(Map<String, String>) request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
 		return (uriVars != null) ? uriVars : Collections.<String, String> emptyMap();
 	}
 
@@ -441,7 +443,6 @@ protected boolean isEligibleProperty(String key, Object value) {
 		if (isEligibleValue(value)) {
 			return true;
 		}
-
 		if (value.getClass().isArray()) {
 			int length = Array.getLength(value);
 			if (length == 0) {
@@ -455,7 +456,6 @@ protected boolean isEligibleProperty(String key, Object value) {
 			}
 			return true;
 		}
-
 		if (value instanceof Collection) {
 			Collection coll = (Collection) value;
 			if (coll.isEmpty()) {
@@ -468,7 +468,6 @@ protected boolean isEligibleProperty(String key, Object value) {
 			}
 			return true;
 		}
-
 		return false;
 	}
 
@@ -504,7 +503,7 @@ protected String urlEncode(String input, String encodingScheme) throws Unsupport
 	 * @return the updated URL or the same as URL as the one passed in
 	 */
 	protected String updateTargetUrl(String targetUrl, Map<String, Object> model,
-								  HttpServletRequest request, HttpServletResponse response) {
+			HttpServletRequest request, HttpServletResponse response) {
 
 		RequestContext requestContext = null;
 		if (getWebApplicationContext() != null) {
@@ -516,14 +515,12 @@ protected String updateTargetUrl(String targetUrl, Map<String, Object> model,
 				requestContext = new RequestContext(request, response, wac.getServletContext(), model);
 			}
 		}
-
 		if (requestContext != null) {
 			RequestDataValueProcessor processor = requestContext.getRequestDataValueProcessor();
 			if (processor != null) {
 				targetUrl = processor.processUrl(request, targetUrl);
 			}
 		}
-
 		return targetUrl;
 	}
 
@@ -535,12 +532,10 @@ protected String updateTargetUrl(String targetUrl, Map<String, Object> model,
 	 * @param http10Compatible whether to stay compatible with HTTP 1.0 clients
 	 * @throws IOException if thrown by response methods
 	 */
-	protected void sendRedirect(
-			HttpServletRequest request, HttpServletResponse response, String targetUrl, boolean http10Compatible)
-			throws IOException {
+	protected void sendRedirect(HttpServletRequest request, HttpServletResponse response,
+			String targetUrl, boolean http10Compatible) throws IOException {
 
 		String encodedRedirectURL = response.encodeRedirectURL(targetUrl);
-
 		if (http10Compatible) {
 			if (this.statusCode != null) {
 				response.setStatus(this.statusCode.value());
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java
index 77c3a67e03..c9d71bcb8f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,24 +36,22 @@
 import org.springframework.web.servlet.View;
 
 /**
- * {@link org.springframework.web.servlet.ViewResolver} implementation
- * that uses bean definitions in a {@link ResourceBundle}, specified by
- * the bundle basename.
+ * A {@link org.springframework.web.servlet.ViewResolver} implementation that uses
+ * bean definitions in a {@link ResourceBundle}, specified by the bundle basename.
  *
- * <p>The bundle is typically defined in a properties file, located in
- * the class path. The default bundle basename is "views".
+ * <p>The bundle is typically defined in a properties file, located in the classpath.
+ * The default bundle basename is "views".
  *
- * <p>This {@code ViewResolver} supports localized view definitions,
- * using the default support of {@link java.util.PropertyResourceBundle}.
- * For example, the basename "views" will be resolved as class path resources
- * "views_de_AT.properties", "views_de.properties", "views.properties" -
- * for a given Locale "de_AT".
+ * <p>This {@code ViewResolver} supports localized view definitions, using the
+ * default support of {@link java.util.PropertyResourceBundle}. For example, the
+ * basename "views" will be resolved as class path resources "views_de_AT.properties",
+ * "views_de.properties", "views.properties" - for a given Locale "de_AT".
  *
- * <p>Note: this {@code ViewResolver} implements the {@link Ordered}
- * interface to allow for flexible participation in {@code ViewResolver}
- * chaining. For example, some special views could be defined via this
- * {@code ViewResolver} (giving it 0 as "order" value), while all
- * remaining views could be resolved by a {@link UrlBasedViewResolver}.
+ * <p>Note: This {@code ViewResolver} implements the {@link Ordered} interface
+ * in order to allow for flexible participation in {@code ViewResolver} chaining.
+ * For example, some special views could be defined via this {@code ViewResolver}
+ * (giving it 0 as "order" value), while all remaining views could be resolved by
+ * a {@link UrlBasedViewResolver}.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -109,7 +107,7 @@ public int getOrder() {
 	 * @see java.util.ResourceBundle#getBundle(String)
 	 */
 	public void setBasename(String basename) {
-		setBasenames(new String[] {basename});
+		setBasenames(basename);
 	}
 
 	/**
@@ -129,7 +127,7 @@ public void setBasename(String basename) {
 	 * @see #setBasename
 	 * @see java.util.ResourceBundle#getBundle(String)
 	 */
-	public void setBasenames(String[] basenames) {
+	public void setBasenames(String... basenames) {
 		this.basenames = basenames;
 	}
 
@@ -172,7 +170,7 @@ public void setDefaultParentView(String defaultParentView) {
 	 * <p>Allows for pre-initialization of common Locales, eagerly checking
 	 * the view configuration for those Locales.
 	 */
-	public void setLocalesToInitialize(Locale[] localesToInitialize) {
+	public void setLocalesToInitialize(Locale... localesToInitialize) {
 		this.localesToInitialize = localesToInitialize;
 	}
 
@@ -196,7 +194,7 @@ protected View loadView(String viewName, Locale locale) throws Exception {
 			return factory.getBean(viewName, View.class);
 		}
 		catch (NoSuchBeanDefinitionException ex) {
-			// to allow for ViewResolver chaining
+			// Allow for ViewResolver chaining...
 			return null;
 		}
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
index 56a3a3effb..06a728bd28 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,14 +100,12 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements
 	public static final String FORWARD_URL_PREFIX = "forward:";
 
 
-	private Class viewClass;
+	private Class<?> viewClass;
 
 	private String prefix = "";
 
 	private String suffix = "";
 
-	private String[] viewNames = null;
-
 	private String contentType;
 
 	private boolean redirectContextRelative = true;
@@ -116,20 +114,23 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements
 
 	private String requestContextAttribute;
 
-	private int order = Integer.MAX_VALUE;
-
 	/** Map of static attributes, keyed by attribute name (String) */
 	private final Map<String, Object> staticAttributes = new HashMap<String, Object>();
 
 	private Boolean exposePathVariables;
 
+	private String[] viewNames;
+
+	private int order = Integer.MAX_VALUE;
+
+
 	/**
 	 * Set the view class that should be used to create views.
 	 * @param viewClass class that is assignable to the required view class
 	 * (by default, AbstractUrlBasedView)
 	 * @see AbstractUrlBasedView
 	 */
-	public void setViewClass(Class viewClass) {
+	public void setViewClass(Class<?> viewClass) {
 		if (viewClass == null || !requiredViewClass().isAssignableFrom(viewClass)) {
 			throw new IllegalArgumentException(
 					"Given view class [" + (viewClass != null ? viewClass.getName() : null) +
@@ -141,7 +142,7 @@ public void setViewClass(Class viewClass) {
 	/**
 	 * Return the view class to be used to create views.
 	 */
-	protected Class getViewClass() {
+	protected Class<?> getViewClass() {
 		return this.viewClass;
 	}
 
@@ -150,7 +151,7 @@ protected Class getViewClass() {
 	 * This implementation returns AbstractUrlBasedView.
 	 * @see AbstractUrlBasedView
 	 */
-	protected Class requiredViewClass() {
+	protected Class<?> requiredViewClass() {
 		return AbstractUrlBasedView.class;
 	}
 
@@ -303,6 +304,29 @@ public Map<String, Object> getAttributesMap() {
 		return this.staticAttributes;
 	}
 
+	/**
+	 * Specify whether views resolved by this resolver should add path variables to the model or not.
+	 * <p>>The default setting is to let each View decide (see {@link AbstractView#setExposePathVariables}.
+	 * However, you can use this property to override that.
+	 * @param exposePathVariables
+	 * <ul>
+	 * <li>{@code true} - all Views resolved by this resolver will expose path variables
+	 * <li>{@code false} - no Views resolved by this resolver will expose path variables
+	 * <li>{@code null} - individual Views can decide for themselves (this is used by the default)
+	 * <ul>
+	 * @see AbstractView#setExposePathVariables
+	 */
+	public void setExposePathVariables(Boolean exposePathVariables) {
+		this.exposePathVariables = exposePathVariables;
+	}
+
+	/**
+	 * Return whether views resolved by this resolver should add path variables to the model or not.
+	 */
+	protected Boolean getExposePathVariables() {
+		return this.exposePathVariables;
+	}
+
 	/**
 	 * Set the view names (or name patterns) that can be handled by this
 	 * {@link org.springframework.web.servlet.ViewResolver}. View names can contain
@@ -310,7 +334,7 @@ public Map<String, Object> getAttributesMap() {
 	 * view name 'myReport'.
 	 * @see #canHandle
 	 */
-	public void setViewNames(String[] viewNames) {
+	public void setViewNames(String... viewNames) {
 		this.viewNames = viewNames;
 	}
 
@@ -338,22 +362,6 @@ public int getOrder() {
 		return this.order;
 	}
 
-	/**
-	 * Whether views resolved by this resolver should add path variables the model or not.
-	 * The default setting is to allow each View decide (see {@link AbstractView#setExposePathVariables(boolean)}.
-	 * However, you can use this property to override that.
-	 * @param exposePathVariables
-	 * 	<ul>
-	 * 		<li>{@code true} - all Views resolved by this resolver will expose path variables
-	 * 		<li>{@code false} - no Views resolved by this resolver will expose path variables
-	 * 		<li>{@code null} - individual Views can decide for themselves (this is used by the default)
-	 * 	<ul>
-	 * 	@see AbstractView#setExposePathVariables(boolean)
-	 */
-	public void setExposePathVariables(Boolean exposePathVariables) {
-		this.exposePathVariables = exposePathVariables;
-	}
-
 	@Override
 	protected void initApplicationContext() {
 		super.initApplicationContext();
@@ -362,6 +370,7 @@ protected void initApplicationContext() {
 		}
 	}
 
+
 	/**
 	 * This implementation returns just the view name,
 	 * as this ViewResolver doesn't support localized resolution.
@@ -459,15 +468,20 @@ private View applyLifecycleMethods(String viewName, AbstractView view) {
 	protected AbstractUrlBasedView buildView(String viewName) throws Exception {
 		AbstractUrlBasedView view = (AbstractUrlBasedView) BeanUtils.instantiateClass(getViewClass());
 		view.setUrl(getPrefix() + viewName + getSuffix());
+
 		String contentType = getContentType();
 		if (contentType != null) {
 			view.setContentType(contentType);
 		}
+
 		view.setRequestContextAttribute(getRequestContextAttribute());
 		view.setAttributesMap(getAttributesMap());
-		if (this.exposePathVariables != null) {
+
+		Boolean exposePathVariables = getExposePathVariables();
+		if (exposePathVariables != null) {
 			view.setExposePathVariables(exposePathVariables);
 		}
+
 		return view;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java
index 59b45a8a80..890486d62b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java
@@ -32,18 +32,20 @@
 import org.springframework.web.servlet.View;
 
 /**
- * Implementation of ViewResolver that uses bean definitions in an
- * XML file, specified by resource location. The file will typically
- * be located in the WEB-INF directory; default is "/WEB-INF/views.xml".
+ * A {@link org.springframework.web.servlet.ViewResolver} implementation that uses
+ * bean definitions in a dedicated XML file for view definitions, specified by
+ * resource location. The file will typically be located in the WEB-INF directory;
+ * the default is "/WEB-INF/views.xml".
  *
- * <p>This ViewResolver does not support internationalization.
- * Consider ResourceBundleViewResolver if you need to apply
- * different view resources per locale.
+ * <p>This {@code ViewResolver} does not support internationalization at the level
+ * of its definition resources. Consider {@link ResourceBundleViewResolver} if you
+ * need to apply different view resources per locale.
  *
- * <p>Note: This ViewResolver implements the Ordered interface to allow for
- * flexible participation in ViewResolver chaining. For example, some special
- * views could be defined via this ViewResolver (giving it 0 as "order" value),
- * while all remaining views could be resolved by a UrlBasedViewResolver.
+ * <p>Note: This {@code ViewResolver} implements the {@link Ordered} interface
+ * in order to allow for flexible participation in {@code ViewResolver} chaining.
+ * For example, some special views could be defined via this {@code ViewResolver}
+ * (giving it 0 as "order" value), while all remaining views could be resolved by
+ * a {@link UrlBasedViewResolver}.
  *
  * @author Juergen Hoeller
  * @since 18.06.2003
@@ -70,7 +72,7 @@ public void setOrder(int order) {
 	}
 
 	public int getOrder() {
-		return order;
+		return this.order;
 	}
 
 	/**
@@ -109,7 +111,7 @@ protected View loadView(String viewName, Locale locale) throws BeansException {
 			return factory.getBean(viewName, View.class);
 		}
 		catch (NoSuchBeanDefinitionException ex) {
-			// to allow for ViewResolver chaining
+			// Allow for ViewResolver chaining...
 			return null;
 		}
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
index 9bfb9c5300..8ccb502bb6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@
  * </ul>
  *
  * <p>For working with the workbook in the subclass, see
- * <a href="http://jakarta.apache.org/poi/index.html">Jakarta's POI site</a>
+ * <a href="http://poi.apache.org">Apache's POI site</a>
  *
  * <p>As an example, you can try this snippet:
  *
@@ -194,7 +194,7 @@ protected abstract void buildExcelDocument(
 	 * <p>Creates the row and the cell if they still doesn't already exist.
 	 * Thus, the column can be passed as an int, the method making the needed downcasts.
 	 * @param sheet a sheet object. The first sheet is usually obtained by workbook.getSheetAt(0)
-	 * @param row thr row number
+	 * @param row the row number
 	 * @param col the column number
 	 * @return the HSSFCell
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java
index 2ce37aeea3..41c8ddac00 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.io.OutputStream;
 import java.util.Locale;
 import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -34,9 +33,9 @@
 /**
  * Convenient superclass for Excel document views.
  *
- * <p>This class uses the <i>JExcelAPI</i> instead of <i>POI</i>. More
- * information on <i>JExcelAPI</i> can be found on their <a
- * href="http://www.andykhan.com/jexcelapi/" target="_blank">website</a>.
+ * <p>This class uses the <i>JExcelAPI</i> instead of <i>POI</i>.
+ * More information on <i>JExcelAPI</i> can be found on their
+ * <a href="http://www.andykhan.com/jexcelapi/" target="_blank">website</a>.
  *
  * <p>Properties:
  * <ul>
@@ -58,11 +57,11 @@
  *
  * <pre class="code">
  * protected void buildExcelDocument(
- *      Map&lt;String, Object&gt; model, WritableWorkbook workbook,
- * 		HttpServletRequest request, HttpServletResponse response) {
+ *     Map&lt;String, Object&gt; model, WritableWorkbook workbook,
+ *     HttpServletRequest request, HttpServletResponse response) {
  *
  * 	 if (workbook.getNumberOfSheets() == 0) {
- * 	     workbook.createSheet(&quot;Spring&quot;, 0);
+ * 	   workbook.createSheet(&quot;Spring&quot;, 0);
  *   }
  *
  * 	 WritableSheet sheet = workbook.getSheet(&quot;Spring&quot;);
@@ -70,7 +69,7 @@
  * 	 sheet.addCell(label);
  * }</pre>
  *
- * The use of this view is close to the AbstractExcelView class,
+ * The use of this view is close to the {@link AbstractExcelView} class,
  * just using the JExcel API instead of the Apache POI API.
  *
  * @author Bram Smeets
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
index acfa709977..9c7e39f1f7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.sun.syndication.feed.WireFeed;
 import com.sun.syndication.feed.atom.Entry;
 import com.sun.syndication.feed.atom.Feed;
 
@@ -31,17 +30,15 @@
  *
  * <p>Application-specific view classes will extend this class.
  * The view will be held in the subclass itself, not in a template.
- *
- * <p>Main entry points are the {@link #buildFeedMetadata(Map, WireFeed, HttpServletRequest)} and
- * {@link #buildFeedEntries(Map, HttpServletRequest, HttpServletResponse)}.
+ * Main entry points are the {@link #buildFeedMetadata} and {@link #buildFeedEntries}.
  *
  * <p>Thanks to Jettro Coenradie and Sergio Bossa for the original feed view prototype!
  *
  * @author Arjen Poutsma
  * @author Juergen Hoeller
  * @since 3.0
- * @see #buildFeedMetadata(Map, WireFeed, HttpServletRequest)
- * @see #buildFeedEntries(Map, HttpServletRequest, HttpServletResponse)
+ * @see #buildFeedMetadata
+ * @see #buildFeedEntries
  * @see <a href="http://www.atomenabled.org/developers/syndication/">Atom Syndication Format</a>
  */
 public abstract class AbstractAtomFeedView extends AbstractFeedView<Feed> {
@@ -56,7 +53,7 @@ public AbstractAtomFeedView() {
 	}
 
 	/**
-	 * Sets the Rome feed type to use.
+	 * Set the Rome feed type to use.
 	 * <p>Defaults to Atom 1.0.
 	 * @see Feed#setFeedType(String)
 	 * @see #DEFAULT_FEED_TYPE
@@ -96,7 +93,7 @@ protected final void buildFeedEntries(Map<String, Object> model, Feed feed,
 	 * @param request in case we need locale etc. Shouldn't look at attributes.
 	 * @param response in case we need to set cookies. Shouldn't write to it.
 	 * @return the feed entries to be added to the feed
-	 * @throws Exception any exception that occured during document building
+	 * @throws Exception any exception that occurred during document building
 	 * @see Entry
 	 */
 	protected abstract List<Entry> buildFeedEntries(
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
index 04d24b5662..3516c98322 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.sun.syndication.feed.WireFeed;
 import com.sun.syndication.feed.rss.Channel;
 import com.sun.syndication.feed.rss.Item;
 
@@ -31,17 +30,15 @@
  *
  * <p>Application-specific view classes will extend this class.
  * The view will be held in the subclass itself, not in a template.
- *
- * <p>Main entry points are the {@link #buildFeedMetadata(Map, WireFeed , HttpServletRequest)}
- * and {@link #buildFeedItems(Map, HttpServletRequest, HttpServletResponse)}.
+ * Main entry points are the {@link #buildFeedMetadata} and {@link #buildFeedItems}.
  *
  * <p>Thanks to Jettro Coenradie and Sergio Bossa for the original feed view prototype!
  *
  * @author Arjen Poutsma
  * @author Juergen Hoeller
  * @since 3.0
- * @see #buildFeedMetadata(Map, WireFeed , HttpServletRequest)
- * @see #buildFeedItems(Map, HttpServletRequest, HttpServletResponse)
+ * @see #buildFeedMetadata
+ * @see #buildFeedItems
  */
 public abstract class AbstractRssFeedView extends AbstractFeedView<Channel> {
 
@@ -79,7 +76,7 @@ protected final void buildFeedEntries(Map<String, Object> model, Channel channel
 	 * @param request  in case we need locale etc. Shouldn't look at attributes.
 	 * @param response in case we need to set cookies. Shouldn't write to it.
 	 * @return the feed items to be added to the feed
-	 * @throws Exception any exception that occured during document building
+	 * @throws Exception any exception that occurred during document building
 	 * @see Item
 	 */
 	protected abstract List<Item> buildFeedItems(
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/package-info.java
index 099a6bbe9b..ed22ecbaf4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/package-info.java
@@ -1,8 +1,8 @@
 
 /**
  *
- * Support classes for feed generation, providing View implementations for Atom and RSS
+ * Support classes for feed generation, providing View implementations for Atom and RSS.
+ * Based on the <a href="https://rome.dev.java.net/">ROME tools</a> project.
  *
  */
 package org.springframework.web.servlet.view.feed;
-
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java
index a6129a5ded..c774ccf086 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewResolver.java
@@ -48,7 +48,7 @@ public FreeMarkerViewResolver() {
 	 * Requires {@link FreeMarkerView}.
 	 */
 	@Override
-	protected Class requiredViewClass() {
+	protected Class<?> requiredViewClass() {
 		return FreeMarkerView.class;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java
index 93c62e5159..f1b3db51c4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -215,7 +215,7 @@ public void setSubReportUrls(Properties subReports) {
 	 * <p>The name specified in the list should correspond to an attribute in the
 	 * model Map, and to a sub-report data source parameter in your report file.
 	 * If you pass in {@code JRDataSource} objects as model attributes,
-	 * specifing this list of keys is not required.
+	 * specifying this list of keys is not required.
 	 * <p>If you specify a list of sub-report data keys, it is required to also
 	 * specify a {@code reportDataKey} for the main report, to avoid confusion
 	 * between the data source objects for the various reports involved.
@@ -226,7 +226,7 @@ public void setSubReportUrls(Properties subReports) {
 	 * @see net.sf.jasperreports.engine.data.JRBeanCollectionDataSource
 	 * @see net.sf.jasperreports.engine.data.JRBeanArrayDataSource
 	 */
-	public void setSubReportDataKeys(String[] subReportDataKeys) {
+	public void setSubReportDataKeys(String... subReportDataKeys) {
 		this.subReportDataKeys = subReportDataKeys;
 	}
 
@@ -312,7 +312,7 @@ protected final void initApplicationContext() throws ApplicationContextException
 						"'reportDataKey' for main report is required when specifying a value for 'subReportDataKeys'");
 			}
 			this.subReports = new HashMap<String, JasperReport>(this.subReportUrls.size());
-			for (Enumeration urls = this.subReportUrls.propertyNames(); urls.hasMoreElements();) {
+			for (Enumeration<?> urls = this.subReportUrls.propertyNames(); urls.hasMoreElements();) {
 				String key = (String) urls.nextElement();
 				String path = this.subReportUrls.getProperty(key);
 				Resource resource = getApplicationContext().getResource(path);
@@ -383,7 +383,7 @@ else if ("false".equals(str)) {
 			else if (str.length() > 0 && Character.isDigit(str.charAt(0))) {
 				// Looks like a number... let's try.
 				try {
-					return new Integer(str);
+					return Integer.valueOf(str);
 				}
 				catch (NumberFormatException ex) {
 					// OK, then let's keep it as a String value.
@@ -432,7 +432,7 @@ protected JRExporterParameter convertToExporterParameter(String fqFieldName) {
 		String fieldName = fqFieldName.substring(index + 1);
 
 		try {
-			Class cls = ClassUtils.forName(className, getApplicationContext().getClassLoader());
+			Class<?> cls = ClassUtils.forName(className, getApplicationContext().getClassLoader());
 			Field field = cls.getField(fieldName);
 
 			if (JRExporterParameter.class.isAssignableFrom(field.getType())) {
@@ -534,7 +534,7 @@ else if (filename.endsWith(".jrxml")) {
 	 * {@link #renderReport} method that should be implemented by the subclass.
 	 * @param model the model map, as passed in for view rendering. Must contain
 	 * a report data value that can be converted to a {@code JRDataSource},
-	 * acccording to the rules of the {@link #fillReport} method.
+	 * according to the rules of the {@link #fillReport} method.
 	 */
 	@Override
 	protected void renderMergedOutputModel(
@@ -637,7 +637,7 @@ protected JasperPrint fillReport(Map<String, Object> model) throws Exception {
 			}
 		}
 		else {
-			Collection values = model.values();
+			Collection<?> values = model.values();
 			jrDataSource = CollectionUtils.findValueOfType(values, JRDataSource.class);
 			if (jrDataSource == null) {
 				JRDataSourceProvider provider = CollectionUtils.findValueOfType(values, JRDataSourceProvider.class);
@@ -705,7 +705,7 @@ private JasperPrint doFillReport(JasperReport report, Map<String, Object> model,
 	 */
 	private void populateHeaders(HttpServletResponse response) {
 		// Apply the headers to the response.
-		for (Enumeration en = this.headers.propertyNames(); en.hasMoreElements();) {
+		for (Enumeration<?> en = this.headers.propertyNames(); en.hasMoreElements();) {
 			String key = (String) en.nextElement();
 			response.addHeader(key, this.headers.getProperty(key));
 		}
@@ -795,8 +795,8 @@ protected JRDataSource createReport(JRDataSourceProvider provider) {
 	 * <p>Default value types are: {@code java.util.Collection} and {@code Object} array.
 	 * @return the value types in prioritized order
 	 */
-	protected Class[] getReportDataTypes() {
-		return new Class[] {Collection.class, Object[].class};
+	protected Class<?>[] getReportDataTypes() {
+		return new Class<?>[] {Collection.class, Object[].class};
 	}
 
 
@@ -813,12 +813,12 @@ protected void postProcessReport(JasperPrint populatedReport, Map<String, Object
 
 	/**
 	 * Subclasses should implement this method to perform the actual rendering process.
-	 * <p>Note that the content type has not been set yet: Implementors should build
+	 * <p>Note that the content type has not been set yet: Implementers should build
 	 * a content type String and set it via {@code response.setContentType}.
 	 * If necessary, this can include a charset clause for a specific encoding.
 	 * The latter will only be necessary for textual output onto a Writer, and only
 	 * in case of the encoding being specified in the JasperReports exporter parameters.
-	 * <p><b>WARNING:</b> Implementors should not use {@code response.setCharacterEncoding}
+	 * <p><b>WARNING:</b> Implementers should not use {@code response.setCharacterEncoding}
 	 * unless they are willing to depend on Servlet API 2.4 or higher. Prefer a
 	 * concatenated content type String with a charset clause instead.
 	 * @param populatedReport the populated {@code JasperPrint} to render
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java
index 00bb4439fb..2ae6bf8a92 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,26 +27,26 @@
 import org.springframework.util.CollectionUtils;
 
 /**
- * Jasper Reports view class that allows for the actual rendering format to be
- * specified at runtime using a parameter contained in the model.
+ * JasperReports view class that allows for the actual rendering format
+ * to be specified at runtime using a parameter contained in the model.
  *
  * <p>This view works on the concept of a format key and a mapping key.
- * The format key is used to pass the mapping key from your
- * {@code Controller} to Spring through as part of the model and the
- * mapping key is used to map a logical format to an actual JasperReports
- * view class. For example you might add the following code to your
- * {@code Controller}:
+ * The format key is used to pass the mapping key from your {@code Controller}
+ * to Spring through as part of the model and the mapping key is used to map
+ * a logical format to an actual JasperReports view class.
  *
- * <pre>
+ * <p>For example, you might add the following code to your {@code Controller}:
+ *
+ * <pre class="code">
  * Map<String, Object> model = new HashMap<String, Object>();
  * model.put("format", "pdf");</pre>
  *
- * Here {@code format} is the format key and {@code pdf} is
- * the mapping key. When rendering a report, this class looks for a
- * model parameter under the format key, which by default is
- * {@code format}. It then uses the value of this parameter to lookup
- * the actual {@code View} class to use. The default mappings for this
- * lookup are:
+ * Here {@code format} is the format key and {@code pdf} is the mapping key.
+ * When rendering a report, this class looks for a model parameter under the
+ * format key, which by default is {@code format}. It then uses the value of
+ * this parameter to lookup the actual {@code View} class to use.
+ *
+ * <p>The default mappings for the format lookup are:
  *
  * <p><ul>
  * <li>{@code csv} - {@code JasperReportsCsvView}</li>
@@ -55,8 +55,8 @@
  * <li>{@code xls} - {@code JasperReportsXlsView}</li>
  * </ul>
  *
- * <p>The format key can be changed using the {@code formatKey}
- * property and the mapping key to view class mappings can be changed using the
+ * <p>The format key can be changed using the {@code formatKey} property.
+ * The applicable key-to-view-class mappings can be configured using the
  * {@code formatMappings} property.
  *
  * @author Rob Harrop
@@ -102,6 +102,7 @@ public JasperReportsMultiFormatView() {
 		this.formatMappings.put("xls", JasperReportsXlsView.class);
 	}
 
+
 	/**
 	 * Set the key of the model parameter that holds the format discriminator.
 	 * Default is "format".
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java
index f646898b93..c55192c557 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public class JasperReportsViewResolver extends UrlBasedViewResolver {
 	 * Requires the view class to be a subclass of {@link AbstractJasperReportsView}.
 	 */
 	@Override
-	protected Class requiredViewClass() {
+	protected Class<?> requiredViewClass() {
 		return AbstractJasperReportsView.class;
 	}
 
@@ -75,7 +75,7 @@ public void setSubReportUrls(Properties subReportUrls) {
 	 * Set the {@code subReportDataKeys} the view class should use.
 	 * @see AbstractJasperReportsView#setSubReportDataKeys
 	 */
-	public void setSubReportDataKeys(String[] subReportDataKeys) {
+	public void setSubReportDataKeys(String... subReportDataKeys) {
 		this.subReportDataKeys = subReportDataKeys;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
index 29c670a138..be7300e5a5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@ public class MappingJackson2JsonView extends AbstractView {
 
 	private JsonEncoding encoding = JsonEncoding.UTF8;
 
-	private boolean prefixJson = false;
+	private String jsonPrefix;
 
 	private Boolean prettyPrint;
 
@@ -123,6 +123,15 @@ public final JsonEncoding getEncoding() {
 		return this.encoding;
 	}
 
+	/**
+	 * Specify a custom prefix to use for this view's JSON output.
+	 * Default is none.
+	 * @see #setPrefixJson
+	 */
+	public void setJsonPrefix(String jsonPrefix) {
+		this.jsonPrefix = jsonPrefix;
+	}
+
 	/**
 	 * Indicates whether the JSON output by this view should be prefixed with <tt>"{} && "</tt>.
 	 * Default is {@code false}.
@@ -130,15 +139,16 @@ public final JsonEncoding getEncoding() {
 	 * The prefix renders the string syntactically invalid as a script so that it cannot be hijacked.
 	 * This prefix does not affect the evaluation of JSON, but if JSON validation is performed
 	 * on the string, the prefix would need to be ignored.
+	 * @see #setJsonPrefix
 	 */
 	public void setPrefixJson(boolean prefixJson) {
-		this.prefixJson = prefixJson;
+		this.jsonPrefix = (prefixJson ? "{} && " : null);
 	}
 
 	/**
 	 * Whether to use the default pretty printer when writing JSON.
 	 * This is a shortcut for setting up an {@code ObjectMapper} as follows:
-	 * <pre>
+	 * <pre class="code">
 	 * ObjectMapper mapper = new ObjectMapper();
 	 * mapper.configure(SerializationFeature.INDENT_OUTPUT, true);
 	 * </pre>
@@ -200,7 +210,7 @@ public final Set<String> getRenderedAttributes() {
 	/**
 	 * Set whether to serialize models containing a single attribute as a map or whether to
 	 * extract the single value from the model and serialize it directly.
-	 * <p>The effect of setting this flag is similar to using {@code MappingJacksonHttpMessageConverter}
+	 * <p>The effect of setting this flag is similar to using {@code MappingJackson2HttpMessageConverter}
 	 * with an {@code @ResponseBody} request-handling method.
 	 * <p>Default is {@code false}.
 	 */
@@ -244,7 +254,7 @@ protected void renderMergedOutputModel(Map<String, Object> model, HttpServletReq
 
 		OutputStream stream = (this.updateContentLength ? createTemporaryOutputStream() : response.getOutputStream());
 		Object value = filterModel(model);
-		writeContent(stream, value, this.prefixJson);
+		writeContent(stream, value, this.jsonPrefix);
 		if (this.updateContentLength) {
 			writeToResponse(response, (ByteArrayOutputStream) stream);
 		}
@@ -273,11 +283,11 @@ protected Object filterModel(Map<String, Object> model) {
 	 * Write the actual JSON content to the stream.
 	 * @param stream the output stream to use
 	 * @param value the value to be rendered, as returned from {@link #filterModel}
-	 * @param prefixJson whether the JSON output by this view should be prefixed
-	 * with <tt>"{} && "</tt> (as indicated through {@link #setPrefixJson})
+	 * @param jsonPrefix the prefix for this view's JSON output
+	 * (as indicated through {@link #setJsonPrefix}/{@link #setPrefixJson})
 	 * @throws IOException if writing failed
 	 */
-	protected void writeContent(OutputStream stream, Object value, boolean prefixJson) throws IOException {
+	protected void writeContent(OutputStream stream, Object value, String jsonPrefix) throws IOException {
 		JsonGenerator generator = this.objectMapper.getJsonFactory().createJsonGenerator(stream, this.encoding);
 
 		// A workaround for JsonGenerators not applying serialization features
@@ -286,8 +296,8 @@ protected void writeContent(OutputStream stream, Object value, boolean prefixJso
 			generator.useDefaultPrettyPrinter();
 		}
 
-		if (prefixJson) {
-			generator.writeRaw("{} && ");
+		if (jsonPrefix != null) {
+			generator.writeRaw(jsonPrefix);
 		}
 		this.objectMapper.writeValue(generator, value);
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
index ef0ad59d99..aabf81a69e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java
@@ -39,7 +39,7 @@
 
 /**
  * Spring MVC {@link View} that renders JSON content by serializing the model for the current request
- * using <a href="http://jackson.codehaus.org/">Jackson's</a> {@link ObjectMapper}.
+ * using <a href="http://jackson.codehaus.org/">Jackson 1.x's</a> {@link ObjectMapper}.
  *
  * <p>By default, the entire contents of the model map (with the exception of framework-specific classes)
  * will be encoded as JSON. If the model contains only one key, you can have it extracted encoded as JSON
@@ -65,7 +65,7 @@ public class MappingJacksonJsonView extends AbstractView {
 
 	private JsonEncoding encoding = JsonEncoding.UTF8;
 
-	private boolean prefixJson = false;
+	private String jsonPrefix;
 
 	private Boolean prettyPrint;
 
@@ -123,6 +123,15 @@ public final JsonEncoding getEncoding() {
 		return this.encoding;
 	}
 
+	/**
+	 * Specify a custom prefix to use for this view's JSON output.
+	 * Default is none.
+	 * @see #setPrefixJson
+	 */
+	public void setJsonPrefix(String jsonPrefix) {
+		this.jsonPrefix = jsonPrefix;
+	}
+
 	/**
 	 * Indicates whether the JSON output by this view should be prefixed with <tt>"{} && "</tt>.
 	 * Default is {@code false}.
@@ -130,15 +139,16 @@ public final JsonEncoding getEncoding() {
 	 * The prefix renders the string syntactically invalid as a script so that it cannot be hijacked.
 	 * This prefix does not affect the evaluation of JSON, but if JSON validation is performed
 	 * on the string, the prefix would need to be ignored.
+	 * @see #setJsonPrefix
 	 */
 	public void setPrefixJson(boolean prefixJson) {
-		this.prefixJson = prefixJson;
+		this.jsonPrefix = (prefixJson ? "{} && " : null);
 	}
 
 	/**
 	 * Whether to use the default pretty printer when writing JSON.
 	 * This is a shortcut for setting up an {@code ObjectMapper} as follows:
-	 * <pre>
+	 * <pre class="code">
 	 * ObjectMapper mapper = new ObjectMapper();
 	 * mapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
 	 * </pre>
@@ -244,7 +254,7 @@ protected void renderMergedOutputModel(Map<String, Object> model, HttpServletReq
 
 		OutputStream stream = (this.updateContentLength ? createTemporaryOutputStream() : response.getOutputStream());
 		Object value = filterModel(model);
-		writeContent(stream, value, this.prefixJson);
+		writeContent(stream, value, this.jsonPrefix);
 		if (this.updateContentLength) {
 			writeToResponse(response, (ByteArrayOutputStream) stream);
 		}
@@ -273,11 +283,11 @@ protected Object filterModel(Map<String, Object> model) {
 	 * Write the actual JSON content to the stream.
 	 * @param stream the output stream to use
 	 * @param value the value to be rendered, as returned from {@link #filterModel}
-	 * @param prefixJson whether the JSON output by this view should be prefixed
-	 * with <tt>"{} && "</tt> (as indicated through {@link #setPrefixJson})
+	 * @param jsonPrefix the prefix for this view's JSON output
+	 * (as indicated through {@link #setJsonPrefix}/{@link #setPrefixJson})
 	 * @throws IOException if writing failed
 	 */
-	protected void writeContent(OutputStream stream, Object value, boolean prefixJson) throws IOException {
+	protected void writeContent(OutputStream stream, Object value, String jsonPrefix) throws IOException {
 		JsonGenerator generator = this.objectMapper.getJsonFactory().createJsonGenerator(stream, this.encoding);
 
 		// A workaround for JsonGenerators not applying serialization features
@@ -286,8 +296,8 @@ protected void writeContent(OutputStream stream, Object value, boolean prefixJso
 			generator.useDefaultPrettyPrinter();
 		}
 
-		if (prefixJson) {
-			generator.writeRaw("{} && ");
+		if (jsonPrefix != null) {
+			generator.writeRaw(jsonPrefix);
 		}
 		this.objectMapper.writeValue(generator, value);
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java
index da6383a734..3162cc9cd8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.Enumeration;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import javax.servlet.ServletContext;
@@ -32,6 +32,8 @@
 
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.support.ServletContextResourcePatternResolver;
 
 /**
@@ -47,6 +49,7 @@ public class SpringTilesApplicationContextFactory extends AbstractTilesApplicati
 
 	private Map<String, String> params;
 
+
 	public void init(Map<String, String> params) {
 		this.params = params;
 	}
@@ -87,20 +90,19 @@ public Map<String, String> getInitParams() {
 
 		@Override
 		public URL getResource(String path) throws IOException {
-			URL retValue = null;
 			Set<URL> urlSet = getResources(path);
-			if (urlSet != null && !urlSet.isEmpty()) {
-				retValue = urlSet.iterator().next();
+			if (!CollectionUtils.isEmpty(urlSet)) {
+				return urlSet.iterator().next();
 			}
-			return retValue;
+			return null;
 		}
 
 		@Override
 		public Set<URL> getResources(String path) throws IOException {
 			Set<URL> urlSet = null;
 			Resource[] resources = this.resolver.getResources(path);
-			if (resources != null && resources.length > 0) {
-				urlSet = new HashSet<URL>();
+			if (!ObjectUtils.isEmpty(resources)) {
+				urlSet = new LinkedHashSet<URL>(resources.length);
 				for (Resource resource : resources) {
 					urlSet.add(resource.getURL());
 				}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
index 050aad09cf..a4f4f57b67 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import javax.servlet.ServletContext;
 import javax.servlet.jsp.JspFactory;
 
@@ -200,7 +201,7 @@ public void setCompleteAutoload(boolean completeAutoload) {
 						"org.apache.tiles.extras.complete.CompleteAutoloadTilesInitializer");
 				this.tilesInitializer = (TilesInitializer) clazz.newInstance();
 			}
-			catch (Exception ex) {
+			catch (Throwable ex) {
 				throw new IllegalStateException("Tiles-Extras 2.2 not available", ex);
 			}
 		}
@@ -214,7 +215,7 @@ public void setCompleteAutoload(boolean completeAutoload) {
 	 * Set the Tiles definitions, i.e. the list of files containing the definitions.
 	 * Default is "/WEB-INF/tiles.xml".
 	 */
-	public void setDefinitions(String[] definitions) {
+	public void setDefinitions(String... definitions) {
 		this.definitions = definitions;
 		if (definitions != null) {
 			String defs = StringUtils.arrayToCommaDelimitedString(definitions);
@@ -420,7 +421,10 @@ protected List<URL> getSourceURLs(TilesApplicationContext applicationContext,
 				try {
 					List<URL> result = new LinkedList<URL>();
 					for (String definition : definitions) {
-						result.addAll(applicationContext.getResources(definition));
+						Set<URL> resources = applicationContext.getResources(definition);
+						if (resources != null) {
+							result.addAll(resources);
+						}
 					}
 					return result;
 				}
@@ -439,7 +443,7 @@ protected BaseLocaleUrlDefinitionDAO instantiateLocaleDefinitionDao(TilesApplica
 			BaseLocaleUrlDefinitionDAO dao = super.instantiateLocaleDefinitionDao(
 					applicationContext, contextFactory, resolver);
 			if (checkRefresh && dao instanceof CachingLocaleUrlDefinitionDAO) {
-				((CachingLocaleUrlDefinitionDAO) dao).setCheckRefresh(checkRefresh);
+				((CachingLocaleUrlDefinitionDAO) dao).setCheckRefresh(true);
 			}
 			return dao;
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java
index 593776d68a..f559d4de95 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java
@@ -47,7 +47,7 @@ public TilesViewResolver() {
 	 * Requires {@link TilesView}.
 	 */
 	@Override
-	protected Class requiredViewClass() {
+	protected Class<?> requiredViewClass() {
 		return TilesView.class;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java
index 873421473e..02124e0da1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java
@@ -46,7 +46,7 @@ public class VelocityLayoutViewResolver extends VelocityViewResolver {
 	 * @see VelocityLayoutView
 	 */
 	@Override
-	protected Class requiredViewClass() {
+	protected Class<?> requiredViewClass() {
 		return VelocityLayoutView.class;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java
index 11ce8c62d8..d1c903cc1d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java
@@ -58,7 +58,7 @@ public VelocityViewResolver() {
 	 * Requires {@link VelocityView}.
 	 */
 	@Override
-	protected Class requiredViewClass() {
+	protected Class<?> requiredViewClass() {
 		return VelocityView.class;
 	}
 
@@ -88,7 +88,7 @@ public void setNumberToolAttribute(String numberToolAttribute) {
 	 * to automatically load a Velocity Tools toolbox definition file and expose
 	 * all defined tools in the specified scopes. If no config location is
 	 * specified, no toolbox will be loaded and exposed.
-	 * <p>The specfied location string needs to refer to a ServletContext
+	 * <p>The specified location string needs to refer to a ServletContext
 	 * resource, as expected by ServletToolboxManager which is part of
 	 * the view package of Velocity Tools.
 	 * <p><b>Note:</b> Specifying a toolbox config location will lead to
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm
index 7126ab3cd9..9c1af58841 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm
@@ -107,7 +107,7 @@
  *
  * @param path the name of the field to bind to
  * @param attributes any additional attributes for the element (such as class
- *    or CSS styles or size
+ *    or CSS styles or size)
  *
  *#
 #macro( springFormInput $path $attributes )
@@ -124,7 +124,7 @@
  *
  * @param path the name of the field to bind to
  * @param attributes any additional attributes for the element (such as class
- *    or CSS styles or size
+ *    or CSS styles or size)
  *
  *#
 #macro( springFormPasswordInput $path $attributes )
@@ -140,7 +140,7 @@
  *
  * @param path the name of the field to bind to
  * @param attributes any additional attributes for the element (such as class
- *    or CSS styles or size
+ *    or CSS styles or size)
  *
  *#
 #macro( springFormHiddenInput $path $attributes )
@@ -156,7 +156,7 @@
  *
  * @param path the name of the field to bind to
  * @param attributes any additional attributes for the element (such as class
- *    or CSS styles or size
+ *    or CSS styles or size)
  *
  *#
 #macro( springFormTextarea $path $attributes )
@@ -178,16 +178,14 @@
  * @param path the name of the field to bind to
  * @param options a map (value=label) of all the available options
  * @param attributes any additional attributes for the element (such as class
- *    or CSS styles or size
+ *    or CSS styles or size)
 *#
 #macro( springFormSingleSelect $path $options $attributes )
     #springBind($path)
     <select id="${status.expression}" name="${status.expression}" ${attributes}>
         #foreach($option in $options.keySet())
             <option value="${option}"
-            #if("$!status.value" == "$option")
-                selected="selected"
-            #end>
+            #if("$!status.value" == "$option") selected="selected" #end>
             ${options.get($option)}</option>
         #end
     </select>
@@ -202,17 +200,15 @@
  * @param path the name of the field to bind to
  * @param options a map (value=label) of all the available options
  * @param attributes any additional attributes for the element (such as class
- *    or CSS styles or size
+ *    or CSS styles or size)
 *#
 #macro( springFormMultiSelect $path $options $attributes )
     #springBind($path)
     <select multiple="multiple" id="${status.expression}" name="${status.expression}" ${attributes}>
         #foreach($option in $options.keySet())
             <option value="${option}"
-            #foreach($item in $status.value)
-                #if($item == $option)
-                    selected="selected"
-                #end
+            #foreach($item in $status.actualValue)
+                #if($item == $option) selected="selected" #end
             #end
             >${options.get($option)}</option>
         #end
@@ -229,15 +225,13 @@
  * @param separator the html tag or other character list that should be used to
  *    separate each option.  Typically '&nbsp;' or '<br>'
  * @param attributes any additional attributes for the element (such as class
- *    or CSS styles or size
+ *    or CSS styles or size)
 *#
 #macro( springFormRadioButtons $path $options $separator $attributes )
     #springBind($path)
     #foreach($option in $options.keySet())
         <input type="radio" name="${status.expression}" value="${option}"
-        #if("$!status.value" == "$option")
-            checked="checked"
-        #end
+        #if("$!status.value" == "$option") checked="checked" #end
         ${attributes}
         #springCloseTag()
         ${options.get($option)} ${separator}
@@ -252,15 +246,15 @@
  * @param path the name of the field to bind to
  * @param options a map (value=label) of all the available options
  * @param separator the html tag or other character list that should be used to
- *    separate each option.  Typically '&nbsp;' or '<br>'
+ *    separate each option. Typically '&nbsp;' or '<br>'.
  * @param attributes any additional attributes for the element (such as class
- *    or CSS styles or size
+ *    or CSS styles or size)
 *#
 #macro( springFormCheckboxes $path $options $separator $attributes )
     #springBind($path)
     #foreach($option in $options.keySet())
         <input type="checkbox" name="${status.expression}" value="${option}" 
-        #foreach($item in $status.value) 
+        #foreach($item in $status.actualValue)
             #if($item == $option) checked="checked" #end 
         #end
         ${attributes} #springCloseTag()
@@ -276,7 +270,7 @@
  *
  * @param path the name of the field to bind to
  * @param attributes any additional attributes for the element (such as class
- *    or CSS styles or size
+ *    or CSS styles or size)
 *#
 #macro( springFormCheckbox $path $attributes )
     #springBind($path)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java
index c08daa0a85..64c81b52a4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,28 +18,28 @@
 
 import java.io.ByteArrayOutputStream;
 import java.util.Map;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.stream.StreamResult;
 
-import org.springframework.beans.BeansException;
 import org.springframework.oxm.Marshaller;
 import org.springframework.util.Assert;
-import org.springframework.util.FileCopyUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.view.AbstractView;
 
 /**
- * Spring-MVC {@link View} that allows for response context to be rendered as the result of marshalling by a {@link
- * Marshaller}.
+ * Spring-MVC {@link View} that allows for response context to be rendered as the result
+ * of marshalling by a {@link Marshaller}.
  *
- * <p>The Object to be marshalled is supplied as a parameter in the model and then {@linkplain
- * #locateToBeMarshalled(Map) detected} during response rendering. Users can either specify a specific entry in the
- * model via the {@link #setModelKey(String) sourceKey} property or have Spring locate the Source object.
+ * <p>The Object to be marshalled is supplied as a parameter in the model and then
+ * {@linkplain #locateToBeMarshalled(Map) detected} during response rendering. Users can
+ * either specify a specific entry in the model via the {@link #setModelKey(String) sourceKey}
+ * property or have Spring locate the Source object.
  *
  * @author Arjen Poutsma
+ * @author Juergen Hoeller
  * @since 3.0
  */
 public class MarshallingView extends AbstractView {
@@ -49,13 +49,15 @@ public class MarshallingView extends AbstractView {
 	 */
 	public static final String DEFAULT_CONTENT_TYPE = "application/xml";
 
+
 	private Marshaller marshaller;
 
 	private String modelKey;
 
+
 	/**
-	 * Constructs a new {@code MarshallingView} with no {@link Marshaller} set. The marshaller must be set after
-	 * construction by invoking {@link #setMarshaller(Marshaller)}.
+	 * Constructs a new {@code MarshallingView} with no {@link Marshaller} set.
+	 * The marshaller must be set after construction by invoking {@link #setMarshaller}.
 	 */
 	public MarshallingView() {
 		setContentType(DEFAULT_CONTENT_TYPE);
@@ -66,24 +68,22 @@ public MarshallingView() {
 	 * Constructs a new {@code MarshallingView} with the given {@link Marshaller} set.
 	 */
 	public MarshallingView(Marshaller marshaller) {
-		Assert.notNull(marshaller, "'marshaller' must not be null");
-		setContentType(DEFAULT_CONTENT_TYPE);
+		this();
+		Assert.notNull(marshaller, "Marshaller must not be null");
 		this.marshaller = marshaller;
-		setExposePathVariables(false);
 	}
 
+
 	/**
 	 * Sets the {@link Marshaller} to be used by this view.
 	 */
 	public void setMarshaller(Marshaller marshaller) {
-		Assert.notNull(marshaller, "'marshaller' must not be null");
 		this.marshaller = marshaller;
 	}
 
 	/**
-	 * Set the name of the model key that represents the object to be marshalled. If not specified, the model map will be
-	 * searched for a supported value type.
-	 *
+	 * Set the name of the model key that represents the object to be marshalled.
+	 * If not specified, the model map will be searched for a supported value type.
 	 * @see Marshaller#supports(Class)
 	 */
 	public void setModelKey(String modelKey) {
@@ -91,55 +91,57 @@ public void setModelKey(String modelKey) {
 	}
 
 	@Override
-	protected void initApplicationContext() throws BeansException {
-		Assert.notNull(marshaller, "Property 'marshaller' is required");
+	protected void initApplicationContext() {
+		Assert.notNull(this.marshaller, "Property 'marshaller' is required");
 	}
 
+
 	@Override
-	protected void renderMergedOutputModel(Map<String, Object> model,
-										   HttpServletRequest request,
-										   HttpServletResponse response) throws Exception {
+	protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request,
+			HttpServletResponse response) throws Exception {
+
 		Object toBeMarshalled = locateToBeMarshalled(model);
 		if (toBeMarshalled == null) {
 			throw new ServletException("Unable to locate object to be marshalled in model: " + model);
 		}
-		ByteArrayOutputStream bos = new ByteArrayOutputStream(2048);
-		marshaller.marshal(toBeMarshalled, new StreamResult(bos));
+		ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
+		this.marshaller.marshal(toBeMarshalled, new StreamResult(baos));
 
 		setResponseContentType(request, response);
-		response.setContentLength(bos.size());
-
-		FileCopyUtils.copy(bos.toByteArray(), response.getOutputStream());
+		response.setContentLength(baos.size());
+		baos.writeTo(response.getOutputStream());
 	}
 
 	/**
-	 * Locates the object to be marshalled. The default implementation first attempts to look under the configured
-	 * {@linkplain #setModelKey(String) model key}, if any, before attempting to locate an object of {@linkplain
-	 * Marshaller#supports(Class) supported type}.
-	 *
+	 * Locate the object to be marshalled.
+	 * <p>The default implementation first attempts to look under the configured
+	 * {@linkplain #setModelKey(String) model key}, if any, before attempting to
+	 * locate an object of {@linkplain Marshaller#supports(Class) supported type}.
 	 * @param model the model Map
 	 * @return the Object to be marshalled (or {@code null} if none found)
-	 * @throws ServletException if the model object specified by the {@linkplain #setModelKey(String) model key} is not
-	 *                          supported by the marshaller
+	 * @throws ServletException if the model object specified by the
+	 * {@linkplain #setModelKey(String) model key} is not supported by the marshaller
 	 * @see #setModelKey(String)
 	 */
 	protected Object locateToBeMarshalled(Map<String, Object> model) throws ServletException {
 		if (this.modelKey != null) {
-			Object o = model.get(this.modelKey);
-			if (o == null) {
-				throw new ServletException("Model contains no object with key [" + modelKey + "]");
+			Object obj = model.get(this.modelKey);
+			if (obj == null) {
+				throw new ServletException("Model contains no object with key [" + this.modelKey + "]");
 			}
-			if (!this.marshaller.supports(o.getClass())) {
-				throw new ServletException("Model object [" + o + "] retrieved via key [" + modelKey +
-						"] is not supported by the Marshaller");
+			if (!this.marshaller.supports(obj.getClass())) {
+				throw new ServletException("Model object [" + obj + "] retrieved via key [" +
+						this.modelKey + "] is not supported by the Marshaller");
 			}
-			return o;
+			return obj;
 		}
-		for (Object o : model.values()) {
-			if (o != null && this.marshaller.supports(o.getClass())) {
-				return o;
+		for (Object obj : model.values()) {
+			if (obj != null && (model.size() == 1 || !(obj instanceof BindingResult)) &&
+					this.marshaller.supports(obj.getClass())) {
+				return obj;
 			}
 		}
 		return null;
 	}
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java
index 8ba15e391c..fda12ff096 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.web.servlet.view.xslt;
 
 import java.util.Properties;
-
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.URIResolver;
 
@@ -49,10 +48,15 @@ public class XsltViewResolver extends UrlBasedViewResolver {
 
 
 	public XsltViewResolver() {
-		setViewClass(XsltView.class);
+		setViewClass(requiredViewClass());
 	}
 
 
+	@Override
+	protected Class<?> requiredViewClass() {
+		return XsltView.class;
+	}
+
 	/**
 	 * Set the name of the model attribute that represents the XSLT Source.
 	 * If not specified, the model map will be searched for a matching value type.
@@ -117,11 +121,6 @@ public void setCacheTemplates(boolean cacheTemplates) {
 	}
 
 
-	@Override
-	protected Class requiredViewClass() {
-		return XsltView.class;
-	}
-
 	@Override
 	protected AbstractUrlBasedView buildView(String viewName) throws Exception {
 		XsltView view = (XsltView) super.buildView(viewName);
diff --git a/spring-webmvc/src/main/resources/META-INF/spring-form.tld b/spring-webmvc/src/main/resources/META-INF/spring-form.tld
index 1520a68604..e5ad6eb0be 100644
--- a/spring-webmvc/src/main/resources/META-INF/spring-form.tld
+++ b/spring-webmvc/src/main/resources/META-INF/spring-form.tld
@@ -142,6 +142,12 @@
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
+		<attribute>
+			<description>HTML Required Attribute</description>
+			<name>servletRelativeAction</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
 		<attribute>
 			<description>HTML Optional Attribute</description>
 			<name>method</name>
@@ -1272,7 +1278,7 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
-			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' (without the quotes) will disable the HTML element.</description>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' will disable the HTML element.</description>
 			<name>disabled</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -1442,7 +1448,7 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
-			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' (without the quotes) will disable the HTML element.</description>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' will disable the HTML element.</description>
 			<name>disabled</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -1630,7 +1636,7 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
-			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' (without the quotes) will disable the HTML element.</description>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' will disable the HTML element.</description>
 			<name>disabled</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -1800,7 +1806,7 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
-			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' (without the quotes) will disable the HTML element.</description>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' will disable the HTML element.</description>
 			<name>disabled</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -1988,7 +1994,7 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
-			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' (without the quotes) will disable the HTML element.</description>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' will disable the HTML element.</description>
 			<name>disabled</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -2096,7 +2102,7 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
-			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' (without the quotes) will make the HTML element readonly.</description>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' will make the HTML element readonly.</description>
 			<name>readonly</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -2400,7 +2406,7 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
-			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' (without the quotes) will disable the HTML element.</description>
+			<description>HTML Optional Attribute. Setting the value of this attribute to 'true' will disable the HTML element.</description>
 			<name>disabled</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
diff --git a/spring-webmvc/src/main/resources/META-INF/spring.handlers b/spring-webmvc/src/main/resources/META-INF/spring.handlers
index b92dfeebba..565c2c2c76 100644
--- a/spring-webmvc/src/main/resources/META-INF/spring.handlers
+++ b/spring-webmvc/src/main/resources/META-INF/spring.handlers
@@ -1 +1 @@
-http\://www.springframework.org/schema/mvc=org.springframework.web.servlet.config.MvcNamespaceHandler
\ No newline at end of file
+http\://www.springframework.org/schema/mvc=org.springframework.web.servlet.config.MvcNamespaceHandler
diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd
index 627d289ccd..2fab173ab6 100644
--- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd
+++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd
@@ -6,22 +6,77 @@
 	targetNamespace="http://www.springframework.org/schema/mvc"
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.2.xsd" />
-	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.2.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.2.xsd"/>
 
 	<xsd:element name="annotation-driven">
 		<xsd:annotation>
 			<xsd:documentation source="java:org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"><![CDATA[
 	Configures the annotation-driven Spring MVC Controller programming model.
-	Note that, with Spring 3.0, this tag works in Servlet MVC only!
+	Note that this tag works in Web MVC only, not in Portlet MVC!
 
-	See org.springframework.web.servlet.config.annotation.EnableWebMvc Javadoc for
-	information on code-based alternatives to enabling annotation-driven Spring MVC
-	support.
+	See org.springframework.web.servlet.config.annotation.EnableWebMvc javadoc for details
+	on code-based alternatives to enabling annotation-driven Spring MVC support.
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:all minOccurs="0">
+				<xsd:element name="path-matching" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+	Configures the path matching part of the Spring MVC Controller programming model.
+	Like annotation-driven, code-based alternatives are also documented in EnableWebMvc javadoc.
+						]]></xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:attribute name="suffix-pattern" type="xsd:boolean">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	Whether to use suffix pattern match (".*") when matching patterns to requests. If enabled
+	a method mapped to "/users" also matches to "/users.*".
+	The default value is true.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:attribute>
+						<xsd:attribute name="trailing-slash" type="xsd:boolean">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	Whether to match to URLs irrespective of the presence of a trailing slash.
+	If enabled a method mapped to "/users" also matches to "/users/".
+	The default value is true.
+										]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:attribute>
+						<xsd:attribute name="registered-suffixes-only" type="xsd:boolean">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	Whether suffix pattern matching should work only against path extensions
+	explicitly registered when you configure content negotiation.
+	This is generally recommended to reduce ambiguity and to
+	avoid issues such as when a "." appears in the path for other reasons.
+	The default value is false.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:attribute>
+						<xsd:attribute name="path-helper" type="xsd:string">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	The bean name of the UrlPathHelper to use for resolution of lookup paths.
+	Use this to override the default UrlPathHelper with a custom subclass, or to share common UrlPathHelper settings across
+	multiple HandlerMappings and MethodNameResolvers.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:attribute>
+						<xsd:attribute name="path-matcher" type="xsd:string">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	The bean name of the PathMatcher implementation to use for matching URL paths against registered URL patterns.
+	Default is AntPathMatcher.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:attribute>
+					</xsd:complexType>
+				</xsd:element>
 				<xsd:element name="message-converters" minOccurs="0">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
@@ -37,14 +92,14 @@
 								<xsd:element ref="beans:bean">
 									<xsd:annotation>
 										<xsd:documentation><![CDATA[
-		An HttpMessageConverter bean definition.
+	An HttpMessageConverter bean definition.
 										]]></xsd:documentation>
 									</xsd:annotation>
 								</xsd:element>
 								<xsd:element ref="beans:ref">
 									<xsd:annotation>
 										<xsd:documentation><![CDATA[
-		A reference to an HttpMessageConverter bean.
+	A reference to an HttpMessageConverter bean.
 										]]></xsd:documentation>
 									</xsd:annotation>
 								</xsd:element>
@@ -63,8 +118,8 @@
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 	Configures HandlerMethodArgumentResolver types to support custom controller method argument types.
-    Using this option does not override the built-in support for resolving handler method arguments.
-    To customize the built-in support for argument resolution configure RequestMappingHandlerAdapter directly.
+	Using this option does not override the built-in support for resolving handler method arguments.
+	To customize the built-in support for argument resolution configure RequestMappingHandlerAdapter directly.
 						]]></xsd:documentation>
 					</xsd:annotation>
 					<xsd:complexType>
@@ -78,13 +133,13 @@
 							</xsd:element>
 						</xsd:sequence>
 					</xsd:complexType>
-				</xsd:element>			
+				</xsd:element>
 				<xsd:element name="return-value-handlers" minOccurs="0">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 	Configures HandlerMethodReturnValueHandler types to support custom controller method return value handling.
-    Using this option does not override the built-in support for handling return values.
-    To customize the built-in support for handling return values configure RequestMappingHandlerAdapter directly.
+	Using this option does not override the built-in support for handling return values.
+	To customize the built-in support for handling return values configure RequestMappingHandlerAdapter directly.
 						]]></xsd:documentation>
 					</xsd:annotation>
 					<xsd:complexType>
@@ -98,7 +153,7 @@
 							</xsd:element>
 						</xsd:sequence>
 					</xsd:complexType>
-				</xsd:element>			
+				</xsd:element>
 				<xsd:element name="async-support" minOccurs="0">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
@@ -151,7 +206,7 @@
 								<xsd:documentation source="java:org.springframework.core.task.AsyncTaskExecutor"><![CDATA[
 	The bean name of a default AsyncTaskExecutor to use when a controller method returns a {@link Callable}.
 	Controller methods can override this default on a per-request basis by returning an AsyncTask.
-	By default a SimpleAsyncTaskExecutor is used which does not re-use threads and is not recommended for production.
+	By default, a SimpleAsyncTaskExecutor is used which does not re-use threads and is not recommended for production.
 								]]></xsd:documentation>
 								<xsd:appinfo>
 									<tool:annotation kind="ref">
@@ -231,11 +286,22 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
+			<xsd:attribute name="enableMatrixVariables" type="xsd:boolean">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Matrix variables can appear in any path segment, each matrix variable separated with a ";" (semicolon).
+	For example "/cars;color=red;year=2012". By default, they're removed from the URL. If this property
+	is set to true, matrix variables are not removed from the URL, and the request mapping pattern
+	must use URI variable in path segments where matrix variables are expected. For example "/{cars}".
+	Matrix variables can then be injected into a controller method with @MatrixVariable.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
 			<xsd:attribute name="ignoreDefaultModelOnRedirect" type="xsd:boolean">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	By default the content of the "default" model is used both during rendering and redirect scenarios. 
-	Alternatively a controller method can declare a RedirectAttributes argument and use it to provide attributes for a redirect. 
+	By default, the content of the "default" model is used both during rendering and redirect scenarios.
+	Alternatively a controller method can declare a RedirectAttributes argument and use it to provide attributes for a redirect.
 	Setting this flag to true ensures the "default" model is never used in a redirect scenario even if a RedirectAttributes argument is not declared.
 	Setting it to false means the "default" model may be used in a redirect if the controller method doesn't declare a RedirectAttributes argument.
 	The default setting is false but new applications should consider setting it to true.
@@ -407,16 +473,16 @@
 
 	<xsd:element name="view-controller">
 		<xsd:annotation>
-			<xsd:documentation
-				source="java:org.springframework.web.servlet.mvc.ParameterizableViewController"><![CDATA[
-	Defines a simple Controller that selects a view to render the response.
+			<xsd:documentation source="java:org.springframework.web.servlet.mvc.ParameterizableViewController"><![CDATA[
+	Map a simple (logic-less) view controller to a specific URL path (or pattern)
+	in order to render a response with a pre-configured status code and view.
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:attribute name="path" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	The URL path the view is mapped to.
+	The URL path (or pattern) the controller is mapped to.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
index 15a7e36fea..b8e8630a5d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
@@ -16,30 +16,17 @@
 
 package org.springframework.web.context;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
-
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
 import org.junit.Test;
+
 import org.springframework.beans.BeansException;
-import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.tests.sample.beans.LifecycleBean;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextException;
@@ -50,11 +37,17 @@
 import org.springframework.core.env.PropertySource;
 import org.springframework.mock.web.test.MockServletConfig;
 import org.springframework.mock.web.test.MockServletContext;
+import org.springframework.tests.sample.beans.LifecycleBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.StringUtils;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.context.support.XmlWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.SimpleWebApplicationContext;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Tests for {@link ContextLoader} and {@link ContextLoaderListener}.
  *
@@ -70,14 +63,14 @@ public final class ContextLoaderTests {
 	public void testContextLoaderListenerWithDefaultContext() {
 		MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
-				"/org/springframework/web/context/WEB-INF/applicationContext.xml "
-						+ "/org/springframework/web/context/WEB-INF/context-addition.xml");
+				"/org/springframework/web/context/WEB-INF/applicationContext.xml " +
+				"/org/springframework/web/context/WEB-INF/context-addition.xml");
 		ServletContextListener listener = new ContextLoaderListener();
 		ServletContextEvent event = new ServletContextEvent(sc);
 		listener.contextInitialized(event);
 		WebApplicationContext context = (WebApplicationContext) sc.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
 		assertTrue("Correct WebApplicationContext exposed in ServletContext", context instanceof XmlWebApplicationContext);
-		assertTrue(ContextLoader.getCurrentWebApplicationContext() instanceof XmlWebApplicationContext);
+		assertTrue(WebApplicationContextUtils.getRequiredWebApplicationContext(sc) instanceof XmlWebApplicationContext);
 		LifecycleBean lb = (LifecycleBean) context.getBean("lifecycle");
 		assertTrue("Has father", context.containsBean("father"));
 		assertTrue("Has rod", context.containsBean("rod"));
@@ -88,7 +81,7 @@ public void testContextLoaderListenerWithDefaultContext() {
 		listener.contextDestroyed(event);
 		assertTrue("Destroyed", lb.isDestroyed());
 		assertNull(sc.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE));
-		assertNull(ContextLoader.getCurrentWebApplicationContext());
+		assertNull(WebApplicationContextUtils.getWebApplicationContext(sc));
 	}
 
 	/**
@@ -104,12 +97,12 @@ public void testContextLoaderListenerWithCustomizedContextLoader() {
 		final MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
 				"/org/springframework/web/context/WEB-INF/applicationContext.xml");
-		final ServletContextListener listener = new ContextLoaderListener() {
+		ServletContextListener listener = new ContextLoaderListener() {
 			@Override
-			protected void customizeContext(ServletContext servletContext, ConfigurableWebApplicationContext applicationContext) {
-				assertNotNull("The ServletContext should not be null.", servletContext);
-				assertEquals("Verifying that we received the expected ServletContext.", sc, servletContext);
-				assertFalse("The ApplicationContext should not yet have been refreshed.", applicationContext.isActive());
+			protected void customizeContext(ServletContext sc, ConfigurableWebApplicationContext wac) {
+				assertNotNull("The ServletContext should not be null.", sc);
+				assertEquals("Verifying that we received the expected ServletContext.", sc, sc);
+				assertFalse("The ApplicationContext should not yet have been refreshed.", wac.isActive());
 				buffer.append(expectedContents);
 			}
 		};
@@ -118,16 +111,45 @@ protected void customizeContext(ServletContext servletContext, ConfigurableWebAp
 	}
 
 	@Test
-	public void testContextLoaderListenerWithRegisteredContextInitializer() {
+	public void testContextLoaderListenerWithLocalContextInitializers() {
 		MockServletContext sc = new MockServletContext("");
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
 				"org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml");
-		sc.addInitParameter(ContextLoader.CONTEXT_INITIALIZER_CLASSES_PARAM,
-				StringUtils.arrayToCommaDelimitedString(
-						new Object[]{TestContextInitializer.class.getName(), TestWebContextInitializer.class.getName()}));
+		sc.addInitParameter(ContextLoader.CONTEXT_INITIALIZER_CLASSES_PARAM, StringUtils.arrayToCommaDelimitedString(
+				new Object[] {TestContextInitializer.class.getName(), TestWebContextInitializer.class.getName()}));
 		ContextLoaderListener listener = new ContextLoaderListener();
 		listener.contextInitialized(new ServletContextEvent(sc));
-		WebApplicationContext wac = ContextLoaderListener.getCurrentWebApplicationContext();
+		WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
+		TestBean testBean = wac.getBean(TestBean.class);
+		assertThat(testBean.getName(), equalTo("testName"));
+		assertThat(wac.getServletContext().getAttribute("initialized"), notNullValue());
+	}
+
+	@Test
+	public void testContextLoaderListenerWithGlobalContextInitializers() {
+		MockServletContext sc = new MockServletContext("");
+		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
+				"org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml");
+		sc.addInitParameter(ContextLoader.GLOBAL_INITIALIZER_CLASSES_PARAM, StringUtils.arrayToCommaDelimitedString(
+				new Object[] {TestContextInitializer.class.getName(), TestWebContextInitializer.class.getName()}));
+		ContextLoaderListener listener = new ContextLoaderListener();
+		listener.contextInitialized(new ServletContextEvent(sc));
+		WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
+		TestBean testBean = wac.getBean(TestBean.class);
+		assertThat(testBean.getName(), equalTo("testName"));
+		assertThat(wac.getServletContext().getAttribute("initialized"), notNullValue());
+	}
+
+	@Test
+	public void testContextLoaderListenerWithMixedContextInitializers() {
+		MockServletContext sc = new MockServletContext("");
+		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
+				"org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml");
+		sc.addInitParameter(ContextLoader.CONTEXT_INITIALIZER_CLASSES_PARAM, TestContextInitializer.class.getName());
+		sc.addInitParameter(ContextLoader.GLOBAL_INITIALIZER_CLASSES_PARAM, TestWebContextInitializer.class.getName());
+		ContextLoaderListener listener = new ContextLoaderListener();
+		listener.contextInitialized(new ServletContextEvent(sc));
+		WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
 		TestBean testBean = wac.getBean(TestBean.class);
 		assertThat(testBean.getName(), equalTo("testName"));
 		assertThat(wac.getServletContext().getAttribute("initialized"), notNullValue());
@@ -136,7 +158,7 @@ public void testContextLoaderListenerWithRegisteredContextInitializer() {
 	@Test
 	public void testRegisteredContextInitializerCanAccessServletContextParamsViaEnvironment() {
 		MockServletContext sc = new MockServletContext("");
-		// config file doesn't matter.  just a placeholder
+		// config file doesn't matter - just a placeholder
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
 				"/org/springframework/web/context/WEB-INF/empty-context.xml");
 
@@ -153,12 +175,13 @@ public void testContextLoaderListenerWithUnkownContextInitializer() {
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
 				"/org/springframework/web/context/WEB-INF/empty-context.xml");
 		sc.addInitParameter(ContextLoader.CONTEXT_INITIALIZER_CLASSES_PARAM,
-				StringUtils.arrayToCommaDelimitedString(new Object[]{UnknownContextInitializer.class.getName()}));
+				StringUtils.arrayToCommaDelimitedString(new Object[] {UnknownContextInitializer.class.getName()}));
 		ContextLoaderListener listener = new ContextLoaderListener();
 		try {
 			listener.contextInitialized(new ServletContextEvent(sc));
 			fail("expected exception");
-		} catch (IllegalArgumentException ex) {
+		}
+		catch (IllegalArgumentException ex) {
 			assertTrue(ex.getMessage().contains("not assignable"));
 		}
 	}
@@ -321,7 +344,9 @@ public void refresh() throws BeansException {
 		}
 	}
 
+
 	private static class TestContextInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
 		@Override
 		public void initialize(ConfigurableApplicationContext applicationContext) {
 			ConfigurableEnvironment environment = applicationContext.getEnvironment();
@@ -334,7 +359,9 @@ public Object getProperty(String key) {
 		}
 	}
 
+
 	private static class TestWebContextInitializer implements ApplicationContextInitializer<ConfigurableWebApplicationContext> {
+
 		@Override
 		public void initialize(ConfigurableWebApplicationContext applicationContext) {
 			ServletContext ctx = applicationContext.getServletContext(); // type-safe access to servlet-specific methods
@@ -342,7 +369,9 @@ public void initialize(ConfigurableWebApplicationContext applicationContext) {
 		}
 	}
 
+
 	private static class EnvApplicationContextInitializer implements ApplicationContextInitializer<ConfigurableWebApplicationContext> {
+
 		@Override
 		public void initialize(ConfigurableWebApplicationContext applicationContext) {
 			// test that ApplicationContextInitializers can access ServletContext properties
@@ -352,11 +381,15 @@ public void initialize(ConfigurableWebApplicationContext applicationContext) {
 		}
 	}
 
+
 	private static interface UnknownApplicationContext extends ConfigurableApplicationContext {
+
 		void unheardOf();
 	}
 
+
 	private static class UnknownContextInitializer implements ApplicationContextInitializer<UnknownApplicationContext> {
+
 		@Override
 		public void initialize(UnknownApplicationContext applicationContext) {
 			applicationContext.unheardOf();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
index 4dce1e9fac..3d1d0b203e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
@@ -96,18 +96,11 @@ public void testEnvironmentMerge() {
 	 * @see org.springframework.context.AbstractApplicationContextTests#testEvents()
 	 */
 	@Override
-	public void testEvents() throws Exception {
-		TestListener listener = (TestListener) this.applicationContext.getBean("testListener");
-		listener.zeroCounter();
-		TestListener parentListener = (TestListener) this.applicationContext.getParent().getBean("parentListener");
-		parentListener.zeroCounter();
-
-		parentListener.zeroCounter();
-		assertTrue("0 events before publication", listener.getEventCount() == 0);
-		assertTrue("0 parent events before publication", parentListener.getEventCount() == 0);
-		this.applicationContext.publishEvent(new MyEvent(this));
-		assertTrue("1 events after publication, not " + listener.getEventCount(), listener.getEventCount() == 1);
-		assertTrue("1 parent events after publication", parentListener.getEventCount() == 1);
+	protected void doTestEvents(TestListener listener, TestListener parentListener,
+			MyEvent event) {
+		TestListener listenerBean = (TestListener) this.applicationContext.getBean("testListener");
+		TestListener parentListenerBean = (TestListener) this.applicationContext.getParent().getBean("parentListener");
+		super.doTestEvents(listenerBean, parentListenerBean, event);
 	}
 
 	@Override
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
index b5b4f0206f..e0d72b959a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,6 +66,7 @@
 import org.springframework.web.servlet.theme.ThemeChangeInterceptor;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 import org.springframework.web.servlet.view.ResourceBundleViewResolver;
+import org.springframework.web.util.WebUtils;
 
 /**
  * @author Juergen Hoeller
@@ -405,7 +406,7 @@ public void doSomething(HttpServletRequest request) throws ServletException, Ill
 			if (!(wac instanceof ComplexWebApplicationContext)) {
 				throw new ServletException("Incorrect WebApplicationContext");
 			}
-			if (!(request instanceof MultipartHttpServletRequest)) {
+			if (WebUtils.getNativeRequest(request, MultipartHttpServletRequest.class) == null) {
 				throw new ServletException("Not in a MultipartHttpServletRequest");
 			}
 			if (!(RequestContextUtils.getLocaleResolver(request) instanceof SessionLocaleResolver)) {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
index d5ed530e58..297cffa97c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,18 +18,19 @@
 
 import java.io.IOException;
 import java.util.Locale;
-
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
 
 import junit.framework.TestCase;
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValue;
+import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -40,7 +41,9 @@
 import org.springframework.mock.web.test.MockServletContext;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.web.bind.EscapedErrors;
+import org.springframework.web.context.ConfigurableWebApplicationContext;
 import org.springframework.web.context.ConfigurableWebEnvironment;
+import org.springframework.web.context.ContextLoader;
 import org.springframework.web.context.ServletConfigAwareBean;
 import org.springframework.web.context.ServletContextAwareBean;
 import org.springframework.web.context.WebApplicationContext;
@@ -303,6 +306,22 @@ public void testExistingMultipartRequest() throws Exception {
 		MultipartHttpServletRequest multipartRequest = multipartResolver.resolveMultipart(request);
 		complexDispatcherServlet.service(multipartRequest, response);
 		multipartResolver.cleanupMultipart(multipartRequest);
+		assertNull(request.getAttribute(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE));
+		assertNotNull(request.getAttribute("cleanedUp"));
+	}
+
+	public void testExistingMultipartRequestButWrapped() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest(getServletContext(), "GET", "/locale.do;abc=def");
+		request.addPreferredLocale(Locale.CANADA);
+		request.addUserRole("role1");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		ComplexWebApplicationContext.MockMultipartResolver multipartResolver =
+				(ComplexWebApplicationContext.MockMultipartResolver) complexDispatcherServlet.getWebApplicationContext()
+						.getBean("multipartResolver");
+		MultipartHttpServletRequest multipartRequest = multipartResolver.resolveMultipart(request);
+		complexDispatcherServlet.service(new HttpServletRequestWrapper(multipartRequest), response);
+		multipartResolver.cleanupMultipart(multipartRequest);
+		assertNull(request.getAttribute(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE));
 		assertNotNull(request.getAttribute("cleanedUp"));
 	}
 
@@ -865,6 +884,46 @@ public void testAllowedOptionsIncludesPatchMethod() throws Exception {
 		assertThat(response.getHeader("Allow"), equalTo("GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH"));
 	}
 
+	public void testContextInitializers() throws Exception {
+		DispatcherServlet servlet = new DispatcherServlet();
+		servlet.setContextClass(SimpleWebApplicationContext.class);
+		servlet.setContextInitializers(new TestWebContextInitializer(), new OtherWebContextInitializer());
+		servlet.init(servletConfig);
+		assertEquals("true", servletConfig.getServletContext().getAttribute("initialized"));
+		assertEquals("true", servletConfig.getServletContext().getAttribute("otherInitialized"));
+	}
+
+	public void testContextInitializerClasses() throws Exception {
+		DispatcherServlet servlet = new DispatcherServlet();
+		servlet.setContextClass(SimpleWebApplicationContext.class);
+		servlet.setContextInitializerClasses(
+				TestWebContextInitializer.class.getName() + "," + OtherWebContextInitializer.class.getName());
+		servlet.init(servletConfig);
+		assertEquals("true", servletConfig.getServletContext().getAttribute("initialized"));
+		assertEquals("true", servletConfig.getServletContext().getAttribute("otherInitialized"));
+	}
+
+	public void testGlobalInitializerClasses() throws Exception {
+		DispatcherServlet servlet = new DispatcherServlet();
+		servlet.setContextClass(SimpleWebApplicationContext.class);
+		servletConfig.getServletContext().setInitParameter(ContextLoader.GLOBAL_INITIALIZER_CLASSES_PARAM,
+				TestWebContextInitializer.class.getName() + "," + OtherWebContextInitializer.class.getName());
+		servlet.init(servletConfig);
+		assertEquals("true", servletConfig.getServletContext().getAttribute("initialized"));
+		assertEquals("true", servletConfig.getServletContext().getAttribute("otherInitialized"));
+	}
+
+	public void testMixedInitializerClasses() throws Exception {
+		DispatcherServlet servlet = new DispatcherServlet();
+		servlet.setContextClass(SimpleWebApplicationContext.class);
+		servletConfig.getServletContext().setInitParameter(ContextLoader.GLOBAL_INITIALIZER_CLASSES_PARAM,
+				TestWebContextInitializer.class.getName());
+		servlet.setContextInitializerClasses(OtherWebContextInitializer.class.getName());
+		servlet.init(servletConfig);
+		assertEquals("true", servletConfig.getServletContext().getAttribute("initialized"));
+		assertEquals("true", servletConfig.getServletContext().getAttribute("otherInitialized"));
+	}
+
 
 	public static class ControllerFromParent implements Controller {
 
@@ -874,4 +933,22 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons
 		}
 	}
 
+
+	private static class TestWebContextInitializer implements ApplicationContextInitializer<ConfigurableWebApplicationContext> {
+
+		@Override
+		public void initialize(ConfigurableWebApplicationContext applicationContext) {
+			applicationContext.getServletContext().setAttribute("initialized", "true");
+		}
+	}
+
+
+	private static class OtherWebContextInitializer implements ApplicationContextInitializer<ConfigurableWebApplicationContext> {
+
+		@Override
+		public void initialize(ConfigurableWebApplicationContext applicationContext) {
+			applicationContext.getServletContext().setAttribute("otherInitialized", "true");
+		}
+	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/HandlerExecutionChainTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/HandlerExecutionChainTests.java
index a4f9572dc1..b2aac29ac9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/HandlerExecutionChainTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/HandlerExecutionChainTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 
@@ -45,6 +46,7 @@ public class HandlerExecutionChainTests {
 
 	private AsyncHandlerInterceptor interceptor3;
 
+
 	@Before
 	public void setup() {
 		this.request = new MockHttpServletRequest();
@@ -59,9 +61,12 @@ public void setup() {
 
 		this.chain.addInterceptor(this.interceptor1);
 		this.chain.addInterceptor(this.interceptor2);
+		assertEquals(2, this.chain.getInterceptors().length);
 		this.chain.addInterceptor(this.interceptor3);
+		assertEquals(3, this.chain.getInterceptors().length);
 	}
 
+
 	@Test
 	public void successScenario() throws Exception {
 		ModelAndView mav = new ModelAndView();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java
index 3f72adf22e..a0e597f3f6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,14 @@
 package org.springframework.web.servlet.config;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
+import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.DirectFieldAccessor;
@@ -30,6 +33,7 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.ResourceHttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.util.AntPathMatcher;
 import org.springframework.validation.MessageCodesResolver;
 import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
 import org.springframework.web.bind.support.WebArgumentResolver;
@@ -42,7 +46,9 @@
 import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 import org.springframework.web.servlet.mvc.method.annotation.ServletWebArgumentResolverAdapter;
+import org.springframework.web.util.UrlPathHelper;
 
 /**
  * Test fixture for the configuration in mvc-config-annotation-driven.xml.
@@ -70,6 +76,21 @@ public void testMessageCodesResolver() {
 		assertEquals(false, new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect"));
 	}
 
+	@Test
+	public void testPathMatchingConfiguration() {
+		loadBeanDefinitions("mvc-config-path-matching.xml");
+		RequestMappingHandlerMapping hm = this.appContext.getBean(RequestMappingHandlerMapping.class);
+		assertNotNull(hm);
+		assertTrue(hm.useSuffixPatternMatch());
+		assertFalse(hm.useTrailingSlashMatch());
+		assertTrue(hm.useRegisteredSuffixPatternMatch());
+		assertThat(hm.getUrlPathHelper(), Matchers.instanceOf(TestPathHelper.class));
+		assertThat(hm.getPathMatcher(), Matchers.instanceOf(TestPathMatcher.class));
+		List<String> fileExtensions = hm.getContentNegotiationManager().getAllFileExtensions();
+		assertThat(fileExtensions, Matchers.contains("xml"));
+		assertThat(fileExtensions, Matchers.hasSize(1));
+	}
+
 	@Test
 	public void testMessageConverters() {
 		loadBeanDefinitions("mvc-config-message-converters.xml");
@@ -198,3 +219,7 @@ public String[] resolveMessageCodes(String errorCode, String objectName, String
 	}
 
 }
+
+class TestPathMatcher extends AntPathMatcher { }
+
+class TestPathHelper extends UrlPathHelper { }
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
index 8ff997204f..a3d14b94bc 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +16,16 @@
 
 package org.springframework.web.servlet.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+
 import javax.servlet.RequestDispatcher;
 import javax.validation.constraints.NotNull;
 
@@ -53,6 +49,7 @@
 import org.springframework.mock.web.test.MockServletContext;
 import org.springframework.scheduling.concurrent.ConcurrentTaskExecutor;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.PathMatcher;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
@@ -85,6 +82,9 @@
 import org.springframework.web.servlet.resource.DefaultServletHttpRequestHandler;
 import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
 import org.springframework.web.servlet.theme.ThemeChangeInterceptor;
+import org.springframework.web.util.UrlPathHelper;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Keith Donald
@@ -93,6 +93,10 @@
  */
 public class MvcNamespaceTests {
 
+	private static final String VIEWCONTROLLER_BEAN_NAME =
+			"org.springframework.web.servlet.config.viewControllerHandlerMapping";
+
+
 	private GenericWebApplicationContext appContext;
 
 	private TestController handler;
@@ -117,6 +121,7 @@ public void testDefaultConfig() throws Exception {
 		RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class);
 		assertNotNull(mapping);
 		assertEquals(0, mapping.getOrder());
+		assertTrue(mapping.getUrlPathHelper().shouldRemoveSemicolonContent());
 		mapping.setDefaultHandler(handlerMethod);
 
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo.json");
@@ -182,6 +187,10 @@ public void testCustomConversionService() throws Exception {
 	public void testCustomValidator() throws Exception {
 		loadBeanDefinitions("mvc-config-custom-validator.xml", 12);
 
+		RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class);
+		assertNotNull(mapping);
+		assertFalse(mapping.getUrlPathHelper().shouldRemoveSemicolonContent());
+
 		RequestMappingHandlerAdapter adapter = appContext.getBean(RequestMappingHandlerAdapter.class);
 		assertNotNull(adapter);
 		assertEquals(true, new DirectFieldAccessor(adapter).getPropertyValue("ignoreDefaultModelOnRedirect"));
@@ -233,7 +242,7 @@ public void testInterceptors() throws Exception {
 
 	@Test
 	public void testResources() throws Exception {
-		loadBeanDefinitions("mvc-config-resources.xml", 5);
+		loadBeanDefinitions("mvc-config-resources.xml", 7);
 
 		HttpRequestHandlerAdapter adapter = appContext.getBean(HttpRequestHandlerAdapter.class);
 		assertNotNull(adapter);
@@ -266,7 +275,7 @@ public void testResources() throws Exception {
 
 	@Test
 	public void testResourcesWithOptionalAttributes() throws Exception {
-		loadBeanDefinitions("mvc-config-resources-optional-attrs.xml", 5);
+		loadBeanDefinitions("mvc-config-resources-optional-attrs.xml", 7);
 
 		SimpleUrlHandlerMapping mapping = appContext.getBean(SimpleUrlHandlerMapping.class);
 		assertNotNull(mapping);
@@ -348,7 +357,7 @@ public void testBeanDecoration() throws Exception {
 
 	@Test
 	public void testViewControllers() throws Exception {
-		loadBeanDefinitions("mvc-config-view-controllers.xml", 15);
+		loadBeanDefinitions("mvc-config-view-controllers.xml", 17);
 
 		RequestMappingHandlerMapping mapping = appContext.getBean(RequestMappingHandlerMapping.class);
 		assertNotNull(mapping);
@@ -408,7 +417,7 @@ public void testViewControllers() throws Exception {
 	/** WebSphere gives trailing servlet path slashes by default!! */
 	@Test
 	public void testViewControllersOnWebSphere() throws Exception {
-		loadBeanDefinitions("mvc-config-view-controllers.xml", 15);
+		loadBeanDefinitions("mvc-config-view-controllers.xml", 17);
 
 		SimpleUrlHandlerMapping mapping2 = appContext.getBean(SimpleUrlHandlerMapping.class);
 		SimpleControllerHandlerAdapter adapter = appContext.getBean(SimpleControllerHandlerAdapter.class);
@@ -452,7 +461,7 @@ public void testViewControllersOnWebSphere() throws Exception {
 
 	@Test
 	public void testViewControllersDefaultConfig() {
-		loadBeanDefinitions("mvc-config-view-controllers-minimal.xml", 4);
+		loadBeanDefinitions("mvc-config-view-controllers-minimal.xml", 6);
 
 		BeanNameUrlHandlerMapping beanNameMapping = appContext.getBean(BeanNameUrlHandlerMapping.class);
 		assertNotNull(beanNameMapping);
@@ -491,6 +500,27 @@ public void testAsyncSupportOptions() throws Exception {
 		assertEquals(1, deferredResultInterceptors.length);
 	}
 
+	@Test
+	public void testPathMatchingHandlerMappings() throws Exception {
+		loadBeanDefinitions("mvc-config-path-matching-mappings.xml", 19);
+
+		RequestMappingHandlerMapping requestMapping = appContext.getBean(RequestMappingHandlerMapping.class);
+		assertNotNull(requestMapping);
+		assertEquals(TestPathHelper.class, requestMapping.getUrlPathHelper().getClass());
+		assertEquals(TestPathMatcher.class, requestMapping.getPathMatcher().getClass());
+
+		SimpleUrlHandlerMapping viewController = appContext.getBean(VIEWCONTROLLER_BEAN_NAME, SimpleUrlHandlerMapping.class);
+		assertNotNull(viewController);
+		assertEquals(TestPathHelper.class, viewController.getUrlPathHelper().getClass());
+		assertEquals(TestPathMatcher.class, viewController.getPathMatcher().getClass());
+
+		for (SimpleUrlHandlerMapping handlerMapping : appContext.getBeansOfType(SimpleUrlHandlerMapping.class).values()) {
+			assertNotNull(handlerMapping);
+			assertEquals(TestPathHelper.class, handlerMapping.getUrlPathHelper().getClass());
+			assertEquals(TestPathMatcher.class, handlerMapping.getPathMatcher().getClass());
+		}
+	}
+
 
 	private void loadBeanDefinitions(String fileName, int expectedBeanCount) {
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(appContext);
@@ -563,4 +593,45 @@ public static class TestCallableProcessingInterceptor extends CallableProcessing
 
 	public static class TestDeferredResultProcessingInterceptor extends DeferredResultProcessingInterceptorAdapter { }
 
+	public static class TestPathMatcher implements PathMatcher {
+
+		@Override
+		public boolean isPattern(String path) {
+			return false;
+		}
+
+		@Override
+		public boolean match(String pattern, String path) {
+			return path.matches(pattern);
+		}
+
+		@Override
+		public boolean matchStart(String pattern, String path) {
+			return false;
+		}
+
+		@Override
+		public String extractPathWithinPattern(String pattern, String path) {
+			return null;
+		}
+
+		@Override
+		public Map<String, String> extractUriTemplateVariables(String pattern, String path) {
+			return null;
+		}
+
+		@Override
+		public Comparator<String> getPatternComparator(String path) {
+			return null;
+		}
+
+		@Override
+		public String combine(String pattern1, String pattern2) {
+			return null;
+		}
+	}
+
+	public static class TestPathHelper extends UrlPathHelper {
+	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
index 392cb9b979..5819c93cb6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.web.servlet.config.annotation;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.junit.Before;
@@ -26,10 +26,12 @@
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+
 import org.springframework.core.convert.ConversionService;
 import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.util.PathMatcher;
 import org.springframework.validation.DefaultMessageCodesResolver;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
@@ -40,7 +42,9 @@
 import org.springframework.web.servlet.mvc.annotation.ResponseStatusExceptionResolver;
 import org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
+import org.springframework.web.util.UrlPathHelper;
 
 import static org.junit.Assert.*;
 import static org.mockito.BDDMockito.*;
@@ -85,10 +89,10 @@ public void setUp() {
 		delegatingConfig = new DelegatingWebMvcConfiguration();
 	}
 
+
 	@Test
 	public void requestMappingHandlerAdapter() throws Exception {
-
-		delegatingConfig.setConfigurers(Arrays.asList(webMvcConfigurer));
+		delegatingConfig.setConfigurers(Collections.singletonList(webMvcConfigurer));
 		RequestMappingHandlerAdapter adapter = delegatingConfig.requestMappingHandlerAdapter();
 
 		ConfigurableWebBindingInitializer initializer = (ConfigurableWebBindingInitializer) adapter.getWebBindingInitializer();
@@ -129,7 +133,7 @@ public void configureMessageConverters(List<HttpMessageConverter<?>> converters)
 	public void getCustomValidator() {
 		given(webMvcConfigurer.getValidator()).willReturn(new LocalValidatorFactoryBean());
 
-		delegatingConfig.setConfigurers(Arrays.asList(webMvcConfigurer));
+		delegatingConfig.setConfigurers(Collections.singletonList(webMvcConfigurer));
 		delegatingConfig.mvcValidator();
 
 		verify(webMvcConfigurer).getValidator();
@@ -139,7 +143,7 @@ public void getCustomValidator() {
 	public void getCustomMessageCodesResolver() {
 		given(webMvcConfigurer.getMessageCodesResolver()).willReturn(new DefaultMessageCodesResolver());
 
-		delegatingConfig.setConfigurers(Arrays.asList(webMvcConfigurer));
+		delegatingConfig.setConfigurers(Collections.singletonList(webMvcConfigurer));
 		delegatingConfig.getMessageCodesResolver();
 
 		verify(webMvcConfigurer).getMessageCodesResolver();
@@ -147,8 +151,7 @@ public void getCustomMessageCodesResolver() {
 
 	@Test
 	public void handlerExceptionResolver() throws Exception {
-
-		delegatingConfig.setConfigurers(Arrays.asList(webMvcConfigurer));
+		delegatingConfig.setConfigurers(Collections.singletonList(webMvcConfigurer));
 		delegatingConfig.handlerExceptionResolver();
 
 		verify(webMvcConfigurer).configureMessageConverters(converters.capture());
@@ -174,8 +177,39 @@ public void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> ex
 		delegatingConfig.setConfigurers(configurers);
 
 		HandlerExceptionResolverComposite composite =
-			(HandlerExceptionResolverComposite) delegatingConfig.handlerExceptionResolver();
+				(HandlerExceptionResolverComposite) delegatingConfig.handlerExceptionResolver();
 		assertEquals("Only one custom converter is expected", 1, composite.getExceptionResolvers().size());
 	}
 
+	@Test
+	public void configurePathMatch() throws Exception {
+		final PathMatcher pathMatcher = mock(PathMatcher.class);
+		final UrlPathHelper pathHelper = mock(UrlPathHelper.class);
+
+		List<WebMvcConfigurer> configurers = new ArrayList<WebMvcConfigurer>();
+		configurers.add(new WebMvcConfigurerAdapter() {
+			@Override
+			public void configurePathMatch(PathMatchConfigurer configurer) {
+				configurer.setUseRegisteredSuffixPatternMatch(true)
+						.setUseTrailingSlashMatch(false)
+						.setUrlPathHelper(pathHelper)
+						.setPathMatcher(pathMatcher);
+			}
+		});
+		delegatingConfig.setConfigurers(configurers);
+
+		RequestMappingHandlerMapping handlerMapping = delegatingConfig.requestMappingHandlerMapping();
+		assertNotNull(handlerMapping);
+		assertEquals("PathMatchConfigurer should configure RegisteredSuffixPatternMatch",
+				true, handlerMapping.useRegisteredSuffixPatternMatch());
+		assertEquals("PathMatchConfigurer should configure SuffixPatternMatch",
+				true, handlerMapping.useSuffixPatternMatch());
+		assertEquals("PathMatchConfigurer should configure TrailingSlashMatch",
+				false, handlerMapping.useTrailingSlashMatch());
+		assertEquals("PathMatchConfigurer should configure UrlPathHelper",
+				pathHelper, handlerMapping.getUrlPathHelper());
+		assertEquals("PathMatchConfigurer should configure PathMatcher",
+				pathMatcher, handlerMapping.getPathMatcher());
+	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
index 40f10ea7e6..e5ea4a1706 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@
 import org.springframework.mock.web.test.MockServletContext;
 import org.springframework.scheduling.concurrent.ConcurrentTaskExecutor;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.AntPathMatcher;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.DefaultMessageCodesResolver;
 import org.springframework.validation.Errors;
@@ -62,6 +63,7 @@
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.util.UrlPathHelper;
 
 /**
  * A test fixture with a sub-class of {@link WebMvcConfigurationSupport} that
@@ -92,6 +94,10 @@ public void handlerMappings() throws Exception {
 		RequestMappingHandlerMapping rmHandlerMapping = webConfig.requestMappingHandlerMapping();
 		rmHandlerMapping.setApplicationContext(webAppContext);
 		rmHandlerMapping.afterPropertiesSet();
+
+		assertEquals(TestPathHelper.class, rmHandlerMapping.getUrlPathHelper().getClass());
+		assertEquals(TestPathMatcher.class, rmHandlerMapping.getPathMatcher().getClass());
+
 		HandlerExecutionChain chain = rmHandlerMapping.getHandler(new MockHttpServletRequest("GET", "/"));
 		assertNotNull(chain.getInterceptors());
 		assertEquals(2, chain.getInterceptors().length);
@@ -102,6 +108,8 @@ public void handlerMappings() throws Exception {
 		handlerMapping.setApplicationContext(webAppContext);
 		assertNotNull(handlerMapping);
 		assertEquals(1, handlerMapping.getOrder());
+		assertEquals(TestPathHelper.class, handlerMapping.getUrlPathHelper().getClass());
+		assertEquals(TestPathMatcher.class, handlerMapping.getPathMatcher().getClass());
 		HandlerExecutionChain handler = handlerMapping.getHandler(new MockHttpServletRequest("GET", "/path"));
 		assertNotNull(handler.getHandler());
 
@@ -109,6 +117,8 @@ public void handlerMappings() throws Exception {
 		handlerMapping.setApplicationContext(webAppContext);
 		assertNotNull(handlerMapping);
 		assertEquals(Integer.MAX_VALUE-1, handlerMapping.getOrder());
+		assertEquals(TestPathHelper.class, handlerMapping.getUrlPathHelper().getClass());
+		assertEquals(TestPathMatcher.class, handlerMapping.getPathMatcher().getClass());
 		handler = handlerMapping.getHandler(new MockHttpServletRequest("GET", "/resources/foo.gif"));
 		assertNotNull(handler.getHandler());
 
@@ -280,6 +290,12 @@ public void addInterceptors(InterceptorRegistry registry) {
 			registry.addInterceptor(new LocaleChangeInterceptor());
 		}
 
+		@Override
+		public void configurePathMatch(PathMatchConfigurer configurer) {
+			configurer.setPathMatcher(new TestPathMatcher());
+			configurer.setUrlPathHelper(new TestPathHelper());
+		}
+
 		@SuppressWarnings("serial")
 		@Override
 		public MessageCodesResolver getMessageCodesResolver() {
@@ -308,4 +324,8 @@ public void configureDefaultServletHandling(DefaultServletHandlerConfigurer conf
 
 	}
 
+	private class TestPathHelper extends UrlPathHelper {}
+
+	private class TestPathMatcher extends AntPathMatcher {}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
index 68c4460b58..bf02c6318f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,16 +27,23 @@
 
 import org.junit.Before;
 import org.junit.Test;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockServletContext;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.util.PathMatcher;
 import org.springframework.validation.Validator;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.context.support.StaticWebApplicationContext;
 import org.springframework.web.servlet.HandlerExceptionResolver;
 import org.springframework.web.servlet.HandlerExecutionChain;
@@ -49,6 +56,7 @@
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
+import org.springframework.web.util.UrlPathHelper;
 
 /**
  * A test fixture with an {@link WebMvcConfigurationSupport} instance.
@@ -163,6 +171,32 @@ public void handlerExceptionResolver() throws Exception {
 		assertNotNull(eher.getApplicationContext());
 	}
 
+	@Test
+	public void defaultPathMatchConfiguration() throws Exception {
+		AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
+		context.setServletContext(new MockServletContext());
+		context.register(WebConfig.class);
+		context.refresh();
+
+		UrlPathHelper urlPathHelper = context.getBean(UrlPathHelper.class);
+		PathMatcher pathMatcher = context.getBean(PathMatcher.class);
+
+		assertNotNull(urlPathHelper);
+		assertNotNull(pathMatcher);
+		assertEquals(AntPathMatcher.class, pathMatcher.getClass());
+	}
+
+
+	@EnableWebMvc
+	@Configuration
+	@SuppressWarnings("unused")
+	static class WebConfig {
+
+		@Bean
+		public TestController testController() {
+			return new TestController();
+		}
+	}
 
 	@Controller
 	private static class TestController {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
index b673752ecf..a931bab954 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -249,7 +249,7 @@ public void twoMappingsOneShortOneLongThrowOddException() {
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, oddException);
-		assertEquals("error", mav.getViewName());
+		assertEquals("another-error", mav.getViewName());
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
index 72f6639713..749d6314aa 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
@@ -16,10 +16,6 @@
 
 package org.springframework.web.servlet.mvc.condition;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
 import java.util.Arrays;
 import java.util.List;
 
@@ -27,7 +23,8 @@
 
 import org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
-import org.springframework.web.util.UrlPathHelper;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Rossen Stoyanchev
@@ -186,16 +183,6 @@ public void matchPatternContainsExtension() {
 		assertNull(match);
 	}
 
-	@Test
-	public void matchIgnorePathParams() {
-		UrlPathHelper pathHelper = new UrlPathHelper();
-		pathHelper.setRemoveSemicolonContent(false);
-		PatternsRequestCondition condition = new PatternsRequestCondition(new String[] {"/foo/bar"}, pathHelper, null, true, true);
-		PatternsRequestCondition match = condition.getMatchingCondition(new MockHttpServletRequest("GET", "/foo;q=1/bar;s=1"));
-
-		assertNotNull(match);
-	}
-
 	@Test
 	public void compareEqualPatterns() {
 		PatternsRequestCondition c1 = new PatternsRequestCondition("/foo*");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
index 099197c07d..748698643b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
@@ -16,13 +16,6 @@
 
 package org.springframework.web.servlet.mvc.method;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
-
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collections;
@@ -61,6 +54,8 @@
 import org.springframework.web.servlet.mvc.condition.RequestMethodsRequestCondition;
 import org.springframework.web.util.UrlPathHelper;
 
+import static org.junit.Assert.*;
+
 /**
  * Test fixture with {@link RequestMappingInfoHandlerMapping}.
  *
@@ -90,6 +85,7 @@ public void setUp() throws Exception {
 
 		this.handlerMapping = new TestRequestMappingInfoHandlerMapping();
 		this.handlerMapping.registerHandler(testController);
+		this.handlerMapping.setRemoveSemicolonContent(false);
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
index 676e44729d..8f179995a3 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,12 @@
 
 package org.springframework.web.servlet.mvc.method;
 
-import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
 import org.junit.Test;
+
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.mvc.condition.ConsumesRequestCondition;
@@ -37,6 +31,9 @@
 import org.springframework.web.servlet.mvc.condition.ProducesRequestCondition;
 import org.springframework.web.servlet.mvc.condition.RequestMethodsRequestCondition;
 
+import static java.util.Arrays.*;
+import static org.junit.Assert.*;
+
 /**
  * Test fixture for {@link RequestMappingInfo} tests.
  *
@@ -212,7 +209,6 @@ public int compare(RequestMappingInfo info, RequestMappingInfo otherInfo) {
 
 	@Test
 	public void equals() {
-
 		RequestMappingInfo info1 = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"),
 				new RequestMethodsRequestCondition(RequestMethod.GET),
@@ -244,7 +240,7 @@ public void equals() {
 				new ParamsRequestCondition("customFoo=customBar"));
 
 		assertFalse(info1.equals(info2));
-		assertTrue(info1.hashCode() != info2.hashCode());
+		assertNotEquals(info1.hashCode(), info2.hashCode());
 
 		info2 = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"),
@@ -256,7 +252,7 @@ public void equals() {
 				new ParamsRequestCondition("customFoo=customBar"));
 
 		assertFalse(info1.equals(info2));
-		assertTrue(info1.hashCode() != info2.hashCode());
+		assertNotEquals(info1.hashCode(), info2.hashCode());
 
 		info2 = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"),
@@ -268,7 +264,7 @@ public void equals() {
 				new ParamsRequestCondition("customFoo=customBar"));
 
 		assertFalse(info1.equals(info2));
-		assertTrue(info1.hashCode() != info2.hashCode());
+		assertNotEquals(info1.hashCode(), info2.hashCode());
 
 		info2 = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"),
@@ -280,7 +276,7 @@ public void equals() {
 				new ParamsRequestCondition("customFoo=customBar"));
 
 		assertFalse(info1.equals(info2));
-		assertTrue(info1.hashCode() != info2.hashCode());
+		assertNotEquals(info1.hashCode(), info2.hashCode());
 
 		info2 = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"),
@@ -292,7 +288,7 @@ public void equals() {
 				new ParamsRequestCondition("customFoo=customBar"));
 
 		assertFalse(info1.equals(info2));
-		assertTrue(info1.hashCode() != info2.hashCode());
+		assertNotEquals(info1.hashCode(), info2.hashCode());
 
 		info2 = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"),
@@ -304,7 +300,7 @@ public void equals() {
 				new ParamsRequestCondition("customFoo=customBar"));
 
 		assertFalse(info1.equals(info2));
-		assertTrue(info1.hashCode() != info2.hashCode());
+		assertNotEquals(info1.hashCode(), info2.hashCode());
 
 		info2 = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"),
@@ -316,7 +312,7 @@ public void equals() {
 				new ParamsRequestCondition("customFoo=NOOOOOO"));
 
 		assertFalse(info1.equals(info2));
-		assertTrue(info1.hashCode() != info2.hashCode());
+		assertNotEquals(info1.hashCode(), info2.hashCode());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java
index 4929b4b728..8a80a11434 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,11 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 import java.lang.reflect.Method;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.core.MethodParameter;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.ui.ModelMap;
@@ -35,6 +30,8 @@
 import org.springframework.web.servlet.mvc.support.RedirectAttributesModelMap;
 import org.springframework.web.servlet.view.RedirectView;
 
+import static org.junit.Assert.*;
+
 /**
  * Test fixture with {@link ModelAndViewMethodReturnValueHandler}.
  *
@@ -50,6 +47,7 @@ public class ModelAndViewMethodReturnValueHandlerTests {
 
 	private MethodParameter returnParamModelAndView;
 
+
 	@Before
 	public void setUp() throws Exception {
 		this.handler = new ModelAndViewMethodReturnValueHandler();
@@ -58,6 +56,7 @@ public void setUp() throws Exception {
 		this.returnParamModelAndView = getReturnValueParam("modelAndView");
 	}
 
+
 	@Test
 	public void supportsReturnType() throws Exception {
 		assertTrue(handler.supportsReturnType(returnParamModelAndView));
@@ -131,16 +130,33 @@ public void handleRedirectAttributesWithoutRedirect() throws Exception {
 		assertNotSame("RedirectAttributes should not be used if controller doesn't redirect", redirectAttributes, model);
 	}
 
+	@Test  // SPR-14045
+	public void handleRedirectWithIgnoreDefaultModel() throws Exception {
+		mavContainer.setIgnoreDefaultModelOnRedirect(true);
+
+		RedirectView redirectView = new RedirectView();
+		ModelAndView mav = new ModelAndView(redirectView, "name", "value");
+		handler.handleReturnValue(mav, returnParamModelAndView, mavContainer, webRequest);
+
+		ModelMap model = mavContainer.getModel();
+		assertSame(redirectView, mavContainer.getView());
+		assertEquals(1, model.size());
+		assertEquals("value", model.get("name"));
+	}
+
 
 	private MethodParameter getReturnValueParam(String methodName) throws Exception {
 		Method method = getClass().getDeclaredMethod(methodName);
 		return new MethodParameter(method, -1);
 	}
 
+
+	@SuppressWarnings("unused")
 	ModelAndView modelAndView() {
 		return null;
 	}
 
+	@SuppressWarnings("unused")
 	String viewName() {
 		return null;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java
index 2e4c7fb7fb..2c7bb6e5f4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,13 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.ui.Model;
@@ -41,6 +39,8 @@
 import org.springframework.web.servlet.FlashMap;
 import org.springframework.web.servlet.ModelAndView;
 
+import static org.junit.Assert.*;
+
 /**
  * Unit tests for {@link RequestMappingHandlerAdapter}.
  *
@@ -66,6 +66,7 @@ public class RequestMappingHandlerAdapterTests {
 
 	private StaticWebApplicationContext webAppContext;
 
+
 	@BeforeClass
 	public static void setupOnce() {
 		RequestMappingHandlerAdapter adapter = new RequestMappingHandlerAdapter();
@@ -86,23 +87,24 @@ public void setup() throws Exception {
 		this.response = new MockHttpServletResponse();
 	}
 
+
 	@Test
 	public void cacheControlWithoutSessionAttributes() throws Exception {
 		HandlerMethod handlerMethod = handlerMethod(new SimpleController(), "handle");
-		this.handlerAdapter.afterPropertiesSet();
 		this.handlerAdapter.setCacheSeconds(100);
-		this.handlerAdapter.handle(this.request, this.response, handlerMethod);
+		this.handlerAdapter.afterPropertiesSet();
 
-		assertTrue(response.getHeader("Cache-Control").toString().contains("max-age"));
+		this.handlerAdapter.handle(this.request, this.response, handlerMethod);
+		assertTrue(response.getHeader("Cache-Control").contains("max-age"));
 	}
 
 	@Test
 	public void cacheControlWithSessionAttributes() throws Exception {
 		SessionAttributeController handler = new SessionAttributeController();
-		this.handlerAdapter.afterPropertiesSet();
 		this.handlerAdapter.setCacheSeconds(100);
-		this.handlerAdapter.handle(this.request, this.response, handlerMethod(handler, "handle"));
+		this.handlerAdapter.afterPropertiesSet();
 
+		this.handlerAdapter.handle(this.request, this.response, handlerMethod(handler, "handle"));
 		assertEquals("no-cache", this.response.getHeader("Cache-Control"));
 	}
 
@@ -181,7 +183,8 @@ public void modelAttributeAdvice() throws Exception {
 		this.handlerAdapter.afterPropertiesSet();
 		ModelAndView mav = this.handlerAdapter.handle(this.request, this.response, handlerMethod);
 
-		assertEquals("globalAttrValue", mav.getModel().get("globalAttr"));
+		assertEquals("lAttr1", mav.getModel().get("attr1"));
+		assertEquals("gAttr2", mav.getModel().get("attr2"));
 	}
 
 
@@ -200,11 +203,17 @@ private void assertMethodProcessorCount(int resolverCount, int initBinderResolve
 	@SuppressWarnings("unused")
 	private static class SimpleController {
 
+		@ModelAttribute
+		public void addAttributes(Model model) {
+			model.addAttribute("attr1", "lAttr1");
+		}
+
 		public String handle() {
 			return null;
 		}
 	}
 
+
 	@SessionAttributes("attr1")
 	private static class SessionAttributeController {
 
@@ -213,6 +222,7 @@ public void handle() {
 		}
 	}
 
+
 	@SuppressWarnings("unused")
 	private static class RedirectAttributeController {
 
@@ -222,13 +232,15 @@ public String handle(Model model) {
 		}
 	}
 
+
 	@ControllerAdvice
 	private static class ModelAttributeAdvice {
 
 		@ModelAttribute
 		public void addAttributes(Model model) {
-			model.addAttribute("globalAttr", "globalAttrValue");
+			model.addAttribute("attr1", "gAttr1");
+			model.addAttribute("attr2", "gAttr2");
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
index 63fce21fa7..c56d7632d0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.web.servlet.mvc.method.annotation;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+package org.springframework.web.servlet.mvc.method.annotation;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -29,6 +25,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.StringValueResolver;
@@ -38,6 +35,8 @@
 import org.springframework.web.context.support.StaticWebApplicationContext;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 
+import static org.junit.Assert.*;
+
 /**
  * Tests for {@link RequestMappingHandlerMapping}.
  *
@@ -47,14 +46,16 @@ public class RequestMappingHandlerMappingTests {
 
 	private RequestMappingHandlerMapping handlerMapping;
 
+
 	@Before
 	public void setup() {
 		this.handlerMapping = new RequestMappingHandlerMapping();
 		this.handlerMapping.setApplicationContext(new StaticWebApplicationContext());
 	}
 
+
 	@Test
-	public void useRegsiteredSuffixPatternMatch() {
+	public void useRegisteredSuffixPatternMatch() {
 		assertTrue(this.handlerMapping.useSuffixPatternMatch());
 		assertFalse(this.handlerMapping.useRegisteredSuffixPatternMatch());
 
@@ -72,8 +73,7 @@ public void useRegsiteredSuffixPatternMatch() {
 	}
 
 	@Test
-	public void useRegsiteredSuffixPatternMatchInitialization() {
-
+	public void useRegisteredSuffixPatternMatchInitialization() {
 		Map<String, MediaType> fileExtensions = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
 		PathExtensionContentNegotiationStrategy strategy = new PathExtensionContentNegotiationStrategy(fileExtensions);
 		ContentNegotiationManager manager = new ContentNegotiationManager(strategy);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java
index 5eb6d49f42..a4abfb0107 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java
@@ -187,6 +187,12 @@ public void resolveArgumentNoContentType() throws Exception {
 		}
 	}
 
+	@Test(expected = HttpMediaTypeNotSupportedException.class)
+	public void resolveArgumentInvalidContentType() throws Exception {
+		this.servletRequest.setContentType("bad");
+		processor.resolveArgument(paramRequestBodyString, mavContainer, webRequest, null);
+	}
+
 	@Test
 	public void resolveArgumentNotRequiredNoContent() throws Exception {
 		servletRequest.setContent(null);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java
index 5c69b6f424..28a3bcbd35 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,15 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
@@ -37,6 +36,7 @@
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.util.MultiValueMap;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
+import org.springframework.web.accept.ContentNegotiationManagerFactoryBean;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.support.WebDataBinderFactory;
@@ -44,10 +44,13 @@
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.method.support.ModelAndViewContainer;
+import org.springframework.web.util.WebUtils;
+
+import static org.junit.Assert.*;
 
 /**
- * Test fixture for a {@link RequestResponseBodyMethodProcessor} with actual delegation
- * to HttpMessageConverter instances.
+ * Test fixture for a {@link RequestResponseBodyMethodProcessor} with
+ * actual delegation to {@link HttpMessageConverter} instances.
  *
  * <p>Also see {@link RequestResponseBodyMethodProcessorMockTests}.
  *
@@ -74,9 +77,7 @@ public class RequestResponseBodyMethodProcessorTests {
 
 	@Before
 	public void setUp() throws Exception {
-
-		Method method = getClass().getMethod("handle",
-				List.class, SimpleBean.class, MultiValueMap.class, String.class);
+		Method method = getClass().getMethod("handle", List.class, SimpleBean.class, MultiValueMap.class, String.class);
 
 		paramGenericList = new MethodParameter(method, 0);
 		paramSimpleBean = new MethodParameter(method, 1);
@@ -165,11 +166,8 @@ public void resolveArgumentClassString() throws Exception {
 		assertEquals("foobarbaz", result);
 	}
 
-	// SPR-9964
-
-	@Test
+	@Test  // SPR-9964
 	public void resolveArgumentTypeVariable() throws Exception {
-
 		Method method = MySimpleParameterizedController.class.getMethod("handleDto", Identifiable.class);
 		HandlerMethod handlerMethod = new HandlerMethod(new MySimpleParameterizedController(), method);
 		MethodParameter methodParam = handlerMethod.getMethodParameters()[0];
@@ -188,9 +186,7 @@ public void resolveArgumentTypeVariable() throws Exception {
 		assertEquals("Jad", result.getName());
 	}
 
-	// SPR-9160
-
-	@Test
+	@Test  // SPR-9160
 	public void handleReturnValueSortByQuality() throws Exception {
 		this.servletRequest.addHeader("Accept", "text/plain; q=0.5, application/json");
 
@@ -231,6 +227,57 @@ public void handleReturnValueStringAcceptCharset() throws Exception {
 		assertEquals("text/plain;charset=UTF-8", servletResponse.getHeader("Content-Type"));
 	}
 
+	@Test
+	public void addContentDispositionHeader() throws Exception {
+
+		ContentNegotiationManagerFactoryBean factory = new ContentNegotiationManagerFactoryBean();
+		factory.addMediaType("pdf", new MediaType("application", "pdf"));
+		factory.afterPropertiesSet();
+
+		RequestResponseBodyMethodProcessor processor = new RequestResponseBodyMethodProcessor(
+				Collections.<HttpMessageConverter<?>>singletonList(new StringHttpMessageConverter()),
+				factory.getObject());
+
+		assertContentDisposition(processor, false, "/hello.json", "whitelisted extension");
+		assertContentDisposition(processor, false, "/hello.pdf", "registered extension");
+		assertContentDisposition(processor, true, "/hello.dataless", "uknown extension");
+
+		// path parameters
+		assertContentDisposition(processor, false, "/hello.json;a=b", "path param shouldn't cause issue");
+		assertContentDisposition(processor, true, "/hello.json;a=b;setup.dataless", "uknown ext in path params");
+		assertContentDisposition(processor, true, "/hello.dataless;a=b;setup.json", "uknown ext in filename");
+		assertContentDisposition(processor, false, "/hello.json;a=b;setup.json", "whitelisted extensions");
+
+		// encoded dot
+		assertContentDisposition(processor, true, "/hello%2Edataless;a=b;setup.json", "encoded dot in filename");
+		assertContentDisposition(processor, true, "/hello.json;a=b;setup%2Edataless", "encoded dot in path params");
+		assertContentDisposition(processor, true, "/hello.dataless%3Bsetup.bat", "encoded dot in path params");
+
+		this.servletRequest.setAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE, "/hello.bat");
+		assertContentDisposition(processor, true, "/bonjour", "forwarded URL");
+		this.servletRequest.removeAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE);
+	}
+
+	private void assertContentDisposition(RequestResponseBodyMethodProcessor processor,
+			boolean expectContentDisposition, String requestURI, String comment) throws Exception {
+
+		this.servletRequest.setRequestURI(requestURI);
+		processor.handleReturnValue("body", this.returnTypeString, this.mavContainer, this.webRequest);
+
+		String header = servletResponse.getHeader("Content-Disposition");
+		if (expectContentDisposition) {
+			assertEquals("Expected 'Content-Disposition' header. Use case: '" + comment + "'",
+					"inline;filename=f.txt", header);
+		}
+		else {
+			assertNull("Did not expect 'Content-Disposition' header. Use case: '" + comment + "'", header);
+		}
+
+		this.servletRequest = new MockHttpServletRequest();
+		this.servletResponse = new MockHttpServletResponse();
+		this.webRequest = new ServletWebRequest(servletRequest, servletResponse);
+	}
+
 
 	public String handle(
 			@RequestBody List<SimpleBean> list,
@@ -241,22 +288,31 @@ public String handle(
 		return null;
 	}
 
+
 	private static abstract class MyParameterizedController<DTO extends Identifiable> {
+
 		@SuppressWarnings("unused")
 		public void handleDto(@RequestBody DTO dto) {}
 	}
 
-	private static class MySimpleParameterizedController extends MyParameterizedController<SimpleBean> { }
+
+	private static class MySimpleParameterizedController extends MyParameterizedController<SimpleBean> {
+	}
+
 
 	private interface Identifiable extends Serializable {
+
 		public Long getId();
+
 		public void setId(Long id);
 	}
 
+
 	@SuppressWarnings({ "serial" })
 	private static class SimpleBean implements Identifiable {
 
 		private Long id;
+
 		private String name;
 
 		@Override
@@ -278,7 +334,9 @@ public void setName(String name) {
 		}
 	}
 
+
 	private final class ValidatingBinderFactory implements WebDataBinderFactory {
+
 		@Override
 		public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception {
 			LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
index 6c5c7327e0..2d95428973 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
@@ -34,6 +34,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
 import java.security.Principal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -111,6 +114,8 @@
 import org.springframework.validation.Errors;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
+import org.springframework.web.accept.ContentNegotiationManager;
+import org.springframework.web.accept.ContentNegotiationManagerFactoryBean;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -142,6 +147,15 @@
 import org.springframework.web.servlet.support.RequestContextUtils;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 /**
  * The origin of this test class is {@link ServletAnnotationControllerHandlerMethodTests}.
  *
@@ -1569,6 +1583,110 @@ public void initialize(GenericWebApplicationContext context) {
 		assertEquals("count:3", response.getContentAsString());
 	}
 
+	@Test
+	public void responseBodyAsHtml() throws Exception {
+		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
+			public void initialize(GenericWebApplicationContext wac) {
+				ContentNegotiationManagerFactoryBean factoryBean = new ContentNegotiationManagerFactoryBean();
+				factoryBean.afterPropertiesSet();
+				RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
+				adapterDef.getPropertyValues().add("contentNegotiationManager", factoryBean.getObject());
+				wac.registerBeanDefinition("handlerAdapter", adapterDef);
+			}
+		}, TextRestController.class);
+
+		byte[] content = "alert('boo')".getBytes(Charset.forName("ISO-8859-1"));
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/a1.html");
+		request.setContent(content);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		getServlet().service(request, response);
+
+		assertEquals(200, response.getStatus());
+		assertEquals("text/html", response.getContentType());
+		assertEquals("inline;filename=f.txt", response.getHeader("Content-Disposition"));
+		assertArrayEquals(content, response.getContentAsByteArray());
+	}
+
+	@Test
+	public void responseBodyAsHtmlWithSuffixPresent() throws Exception {
+		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
+			public void initialize(GenericWebApplicationContext wac) {
+				ContentNegotiationManagerFactoryBean factoryBean = new ContentNegotiationManagerFactoryBean();
+				factoryBean.afterPropertiesSet();
+				RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
+				adapterDef.getPropertyValues().add("contentNegotiationManager", factoryBean.getObject());
+				wac.registerBeanDefinition("handlerAdapter", adapterDef);
+			}
+		}, TextRestController.class);
+
+		byte[] content = "alert('boo')".getBytes(Charset.forName("ISO-8859-1"));
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/a2.html");
+		request.setContent(content);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		getServlet().service(request, response);
+
+		assertEquals(200, response.getStatus());
+		assertEquals("text/html", response.getContentType());
+		assertNull(response.getHeader("Content-Disposition"));
+		assertArrayEquals(content, response.getContentAsByteArray());
+	}
+
+	@Test
+	public void responseBodyAsHtmlWithProducesCondition() throws Exception {
+		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
+			public void initialize(GenericWebApplicationContext wac) {
+				ContentNegotiationManagerFactoryBean factoryBean = new ContentNegotiationManagerFactoryBean();
+				factoryBean.afterPropertiesSet();
+				RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
+				adapterDef.getPropertyValues().add("contentNegotiationManager", factoryBean.getObject());
+				wac.registerBeanDefinition("handlerAdapter", adapterDef);
+			}
+		}, TextRestController.class);
+
+		byte[] content = "alert('boo')".getBytes(Charset.forName("ISO-8859-1"));
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/a3.html");
+		request.setContent(content);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		getServlet().service(request, response);
+
+		assertEquals(200, response.getStatus());
+		assertEquals("text/html", response.getContentType());
+		assertNull(response.getHeader("Content-Disposition"));
+		assertArrayEquals(content, response.getContentAsByteArray());
+	}
+
+	@Test
+	public void responseBodyAsTextWithCssExtension() throws Exception {
+		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
+			public void initialize(GenericWebApplicationContext wac) {
+				ContentNegotiationManagerFactoryBean factoryBean = new ContentNegotiationManagerFactoryBean();
+				factoryBean.afterPropertiesSet();
+				RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
+				adapterDef.getPropertyValues().add("contentNegotiationManager", factoryBean.getObject());
+				wac.registerBeanDefinition("handlerAdapter", adapterDef);
+			}
+		}, TextRestController.class);
+
+		byte[] content = "body".getBytes(Charset.forName("ISO-8859-1"));
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/a4.css");
+		request.setContent(content);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		getServlet().service(request, response);
+
+		assertEquals(200, response.getStatus());
+		assertNull(response.getHeader("Content-Disposition"));
+		assertArrayEquals(content, response.getContentAsByteArray());
+	}
+
+
 	/*
 	 * Controllers
 	 */
@@ -2979,7 +3097,37 @@ public void message(int param, Writer writer) throws IOException {
 		}
 	}
 
-// Test cases deleted from the original SevletAnnotationControllerTests:
+	@Controller
+	public static class TextRestController {
+
+		@RequestMapping(value = "/a1", method = RequestMethod.GET)
+		@ResponseBody
+		public String a1(@RequestBody String body) {
+			return body;
+		}
+
+		@RequestMapping(value = "/a2.html", method = RequestMethod.GET)
+		@ResponseBody
+		public String a2(@RequestBody String body) {
+			return body;
+		}
+
+		@RequestMapping(value = "/a3", method = RequestMethod.GET, produces = "text/html")
+		@ResponseBody
+		public String a3(@RequestBody String body) throws IOException {
+			return body;
+		}
+
+		@RequestMapping(value = "/a4.css", method = RequestMethod.GET)
+		@ResponseBody
+		public String a4(@RequestBody String body) {
+			return body;
+		}
+	}
+
+
+
+// Test cases deleted from the original ServletAnnotationControllerTests:
 
 //	@Ignore("Controller interface => no method-level @RequestMapping annotation")
 //	public void standardHandleMethod() throws Exception {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
index 3a4db8644b..df27a76ebc 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.mock.web.test.MockServletContext;
@@ -125,27 +126,86 @@ public void getResourceFromSubDirectoryOfAlternatePath() throws Exception {
 	}
 
 	@Test
-	public void getResourceViaDirectoryTraversal() throws Exception {
+	public void invalidPath() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("GET");
-
-		request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "../testsecret/secret.txt");
 		MockHttpServletResponse response = new MockHttpServletResponse();
-		handler.handleRequest(request, response);
-		assertEquals(404, response.getStatus());
 
-		request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "test/../../testsecret/secret.txt");
+		Resource location = new ClassPathResource("test/", getClass());
+		this.handler.setLocations(Arrays.asList(location));
+
+		testInvalidPath(location, "../testsecret/secret.txt", request, response);
+		testInvalidPath(location, "test/../../testsecret/secret.txt", request, response);
+		testInvalidPath(location, ":/../../testsecret/secret.txt", request, response);
+
+		location = new UrlResource(getClass().getResource("./test/"));
+		this.handler.setLocations(Arrays.asList(location));
+		Resource secretResource = new UrlResource(getClass().getResource("testsecret/secret.txt"));
+		String secretPath = secretResource.getURL().getPath();
+
+		testInvalidPath(location, "file:" + secretPath, request, response);
+		testInvalidPath(location, "/file:" + secretPath, request, response);
+		testInvalidPath(location, "url:" + secretPath, request, response);
+		testInvalidPath(location, "/url:" + secretPath, request, response);
+		testInvalidPath(location, "/" + secretPath, request, response);
+		testInvalidPath(location, "////../.." + secretPath, request, response);
+		testInvalidPath(location, "/%2E%2E/testsecret/secret.txt", request, response);
+		testInvalidPath(location, "/%2e%2e/testsecret/secret.txt", request, response);
+		testInvalidPath(location, " " + secretPath, request, response);
+		testInvalidPath(location, "/  " + secretPath, request, response);
+		testInvalidPath(location, "url:" + secretPath, request, response);
+	}
+
+	private void testInvalidPath(Resource location, String requestPath,
+			MockHttpServletRequest request, MockHttpServletResponse response) throws Exception {
+
+		request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, requestPath);
 		response = new MockHttpServletResponse();
-		handler.handleRequest(request, response);
+		this.handler.handleRequest(request, response);
+		if (!location.createRelative(requestPath).exists() && !requestPath.contains(":")) {
+			fail(requestPath + " doesn't actually exist as a relative path");
+		}
 		assertEquals(404, response.getStatus());
+	}
 
-		handler.setLocations(Arrays.<Resource>asList(new ClassPathResource("testsecret/", getClass())));
-		request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "secret.txt");
+	@Test
+	public void ignoreInvalidEscapeSequence() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setMethod("GET");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/%foo%/bar.txt");
 		response = new MockHttpServletResponse();
-		handler.handleRequest(request, response);
-		assertEquals(200, response.getStatus());
-		assertEquals("text/plain", response.getContentType());
-		assertEquals("big secret", response.getContentAsString());
+		this.handler.handleRequest(request, response);
+		assertEquals(404, response.getStatus());
+	}
+
+	@Test
+	public void processPath() throws Exception {
+		assertSame("/foo/bar", this.handler.processPath("/foo/bar"));
+		assertSame("foo/bar", this.handler.processPath("foo/bar"));
+
+		// leading whitespace control characters (00-1F)
+		assertEquals("/foo/bar", this.handler.processPath("  /foo/bar"));
+		assertEquals("/foo/bar", this.handler.processPath((char) 1 + "/foo/bar"));
+		assertEquals("/foo/bar", this.handler.processPath((char) 31 + "/foo/bar"));
+		assertEquals("foo/bar", this.handler.processPath("  foo/bar"));
+		assertEquals("foo/bar", this.handler.processPath((char) 31 + "foo/bar"));
+
+		// leading control character 0x7F (DEL)
+		assertEquals("/foo/bar", this.handler.processPath((char) 127 + "/foo/bar"));
+		assertEquals("/foo/bar", this.handler.processPath((char) 127 + "/foo/bar"));
+
+		// leading control and '/' characters
+		assertEquals("/foo/bar", this.handler.processPath("  /  foo/bar"));
+		assertEquals("/foo/bar", this.handler.processPath("  /  /  foo/bar"));
+		assertEquals("/foo/bar", this.handler.processPath("  // /// ////  foo/bar"));
+		assertEquals("/foo/bar", this.handler.processPath((char) 1 + " / " + (char) 127 + " // foo/bar"));
+
+		// root or empty path
+		assertEquals("", this.handler.processPath("   "));
+		assertEquals("/", this.handler.processPath("/"));
+		assertEquals("/", this.handler.processPath("///"));
+		assertEquals("/", this.handler.processPath("/ /   / "));
 	}
 
 	@Test
@@ -192,7 +252,7 @@ public void missingResourcePath() throws Exception {
 		assertEquals(404, response.getStatus());
 	}
 
-	@Test(expected=IllegalStateException.class)
+	@Test(expected = IllegalStateException.class)
 	public void noPathWithinHandlerMappingAttribute() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("GET");
@@ -200,7 +260,7 @@ public void noPathWithinHandlerMappingAttribute() throws Exception {
 		handler.handleRequest(request, response);
 	}
 
-	@Test(expected=HttpRequestMethodNotSupportedException.class)
+	@Test(expected = HttpRequestMethodNotSupportedException.class)
 	public void unsupportedHttpMethod() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/foo.css");
@@ -219,9 +279,20 @@ public void resourceNotFound() throws Exception {
 		assertEquals(404, response.getStatus());
 	}
 
-	@Test(expected=IllegalArgumentException.class)
-	public void locationsNotSet() throws Exception {
-		new ResourceHttpRequestHandler().afterPropertiesSet();
+
+	// SPR-12747
+	@Test
+	public void getResourceWithResourceLocation() throws Exception {
+		List<Resource> resourcePaths = new ArrayList<Resource>();
+		resourcePaths.add(new ClassPathResource("test/foo.css", getClass()));
+		this.handler.setLocations(resourcePaths);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/foo.css");
+		request.setMethod("GET");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		handler.handleRequest(request, response);
+		assertEquals("text/css", response.getContentType());
+		assertEquals(17, response.getContentLength());
 	}
 
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java
index f19be0235a..610175b909 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AnnotationConfigDispatcherServletInitializerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,33 +16,34 @@
 
 package org.springframework.web.servlet.support;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Collections;
 import java.util.EnumSet;
+import java.util.EventListener;
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
 import javax.servlet.FilterRegistration.Dynamic;
 import javax.servlet.Servlet;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRegistration;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.mock.web.test.MockServletConfig;
 import org.springframework.mock.web.test.MockServletContext;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.DispatcherServlet;
 
+import static org.junit.Assert.*;
+
 /**
  * Test case for {@link AbstractAnnotationConfigDispatcherServletInitializer}.
  *
@@ -89,11 +90,11 @@ public void register() throws ServletException {
 		assertNotNull(servlets.get(SERVLET_NAME));
 
 		DispatcherServlet servlet = (DispatcherServlet) servlets.get(SERVLET_NAME);
-		WebApplicationContext dispatcherServletContext = servlet.getWebApplicationContext();
-		((AnnotationConfigWebApplicationContext) dispatcherServletContext).refresh();
+		WebApplicationContext wac = servlet.getWebApplicationContext();
+		((AnnotationConfigWebApplicationContext) wac).refresh();
 
-		assertTrue(dispatcherServletContext.containsBean("bean"));
-		assertTrue(dispatcherServletContext.getBean("bean") instanceof MyBean);
+		assertTrue(wac.containsBean("bean"));
+		assertTrue(wac.getBean("bean") instanceof MyBean);
 
 		assertEquals(1, servletRegistrations.size());
 		assertNotNull(servletRegistrations.get(SERVLET_NAME));
@@ -135,6 +136,32 @@ protected boolean isAsyncSupported() {
 				filterRegistration.getMappings().get(SERVLET_NAME));
 	}
 
+	// SPR-11357
+	@Test
+	public void rootContextOnly() throws ServletException {
+		initializer = new MyAnnotationConfigDispatcherServletInitializer() {
+			@Override
+			protected Class<?>[] getRootConfigClasses() {
+				return new Class<?>[] {MyConfiguration.class};
+			}
+			@Override
+			protected Class<?>[] getServletConfigClasses() {
+				return null;
+			}
+		};
+
+		initializer.onStartup(servletContext);
+
+		DispatcherServlet servlet = (DispatcherServlet) servlets.get(SERVLET_NAME);
+		servlet.init(new MockServletConfig(this.servletContext));
+
+		WebApplicationContext wac = servlet.getWebApplicationContext();
+		((AnnotationConfigWebApplicationContext) wac).refresh();
+
+		assertTrue(wac.containsBean("bean"));
+		assertTrue(wac.getBean("bean") instanceof MyBean);
+	}
+
 	@Test
 	public void noFilters() throws ServletException {
 		initializer = new MyAnnotationConfigDispatcherServletInitializer() {
@@ -152,6 +179,13 @@ protected Filter[] getServletFilters() {
 
 	private class MyMockServletContext extends MockServletContext {
 
+		@Override
+		public <T extends EventListener> void addListener(T t) {
+			if (t instanceof ServletContextListener) {
+				((ServletContextListener) t).contextInitialized(new ServletContextEvent(this));
+			}
+		}
+
 		@Override
 		public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) {
 			servlets.put(servletName, servlet);
@@ -169,6 +203,7 @@ public Dynamic addFilter(String filterName, Filter filter) {
 		}
 	}
 
+
 	private static class MyAnnotationConfigDispatcherServletInitializer
 			extends AbstractAnnotationConfigDispatcherServletInitializer {
 
@@ -179,7 +214,7 @@ protected String getServletName() {
 
 		@Override
 		protected Class<?>[] getServletConfigClasses() {
-			return new Class[]{MyConfiguration.class};
+			return new Class<?>[] {MyConfiguration.class};
 		}
 
 		@Override
@@ -201,25 +236,20 @@ protected void customizeRegistration(ServletRegistration.Dynamic registration) {
 		protected Class<?>[] getRootConfigClasses() {
 			return null;
 		}
-
 	}
 
-	private static class MyBean {
 
+	public static class MyBean {
 	}
 
-	@Configuration
-	@SuppressWarnings("unused")
-	private static class MyConfiguration {
 
-		public MyConfiguration() {
-		}
+	@Configuration
+	public static class MyConfiguration {
 
 		@Bean
 		public MyBean bean() {
 			return new MyBean();
 		}
-
 	}
 
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AbstractFlashMapManagerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java
similarity index 94%
rename from spring-webmvc/src/test/java/org/springframework/web/servlet/support/AbstractFlashMapManagerTests.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java
index 98564ae6c1..f0399ada7d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AbstractFlashMapManagerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,34 +16,30 @@
 
 package org.springframework.web.servlet.support;
 
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.servlet.FlashMap;
 import org.springframework.web.util.WebUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * Test fixture for testing {@link AbstractFlashMapManager} methods.
  *
  * @author Rossen Stoyanchev
  */
-public class AbstractFlashMapManagerTests {
+public class FlashMapManagerTests {
 
 	private TestFlashMapManager flashMapManager;
 
@@ -264,6 +260,8 @@ public void saveOutputFlashMapNormalizeTargetPath() throws InterruptedException
 		assertEquals("/once/only", flashMap.getTargetRequestPath());
 	}
 
+	// SPR-9657, SPR-11504
+
 	@Test
 	public void saveOutputFlashMapDecodeParameters() throws Exception {
 		this.request.setCharacterEncoding("UTF-8");
@@ -274,10 +272,12 @@ public void saveOutputFlashMapDecodeParameters() throws Exception {
 		flashMap.addTargetRequestParam("key", "%D0%90%D0%90");
 		flashMap.addTargetRequestParam("key", "%D0%91%D0%91");
 		flashMap.addTargetRequestParam("key", "%D0%92%D0%92");
+		flashMap.addTargetRequestParam("%3A%2F%3F%23%5B%5D%40", "value");
 		this.flashMapManager.saveOutputFlashMap(flashMap, this.request, this.response);
 
-		assertEquals(Arrays.asList("\u0410\u0410", "\u0411\u0411", "\u0412\u0412"),
-				flashMap.getTargetRequestParams().get("key"));
+		MultiValueMap<String,String> targetRequestParams = flashMap.getTargetRequestParams();
+		assertEquals(Arrays.asList("\u0410\u0410", "\u0411\u0411", "\u0412\u0412"), targetRequestParams.get("key"));
+		assertEquals(Arrays.asList("value"), targetRequestParams.get(":/?#[]@"));
 	}
 
 
@@ -303,8 +303,7 @@ protected List<FlashMap> retrieveFlashMaps(HttpServletRequest request) {
 		}
 
 		@Override
-		protected void updateFlashMaps(List<FlashMap> flashMaps, HttpServletRequest request,
-				HttpServletResponse response) {
+		protected void updateFlashMaps(List<FlashMap> flashMaps, HttpServletRequest request, HttpServletResponse response) {
 			this.flashMaps = flashMaps;
 		}
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java
index 02ee04662d..508c4a2448 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java
@@ -16,13 +16,14 @@
 
 package org.springframework.web.servlet.support;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.util.UriComponents;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Rossen Stoyanchev
@@ -93,6 +94,28 @@ public void fromRequestWithForwardedHostHeader() {
 		assertEquals("http://anotherHost/mvc-showcase/data/param?foo=123", result);
 	}
 
+	// SPR-10701
+
+	@Test
+	public void fromRequestWithForwardedHostAndPortHeader() {
+		request.addHeader("X-Forwarded-Host", "webtest.foo.bar.com:443");
+		request.setRequestURI("/mvc-showcase/data/param");
+		request.setQueryString("foo=123");
+		UriComponents result = ServletUriComponentsBuilder.fromRequest(request).build();
+
+		assertEquals("webtest.foo.bar.com", result.getHost());
+		assertEquals(443, result.getPort());
+	}
+
+	// SPR-11140
+
+	@Test
+	public void fromRequestWithForwardedHostMultiValuedHeader() {
+		this.request.addHeader("X-Forwarded-Host", "a.example.org, b.example.org, c.example.org");
+
+		assertEquals("a.example.org", ServletUriComponentsBuilder.fromRequest(this.request).build().getHost());
+	}
+
 	@Test
 	public void fromContextPath() {
 		request.setRequestURI("/mvc-showcase/data/param");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
index 1cec18763f..9accbc0a3a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
@@ -18,6 +18,7 @@
 
 import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.servlet.jsp.tagext.Tag;
@@ -26,6 +27,7 @@
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.format.annotation.NumberFormat;
 import org.springframework.format.annotation.NumberFormat.Style;
+import org.springframework.format.number.PercentFormatter;
 import org.springframework.format.support.FormattingConversionServiceFactoryBean;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.mock.web.test.MockPageContext;
@@ -70,12 +72,14 @@ public void testPrintNullAsEmptyString() throws Exception {
 	}
 
 	public void testPrintFormattedScopedAttributeResult() throws Exception {
+		PercentFormatter formatter = new PercentFormatter();
 		tag.setExpression("bean.formattable");
 		int action = tag.doStartTag();
 		assertEquals(Tag.EVAL_BODY_INCLUDE, action);
 		action = tag.doEndTag();
 		assertEquals(Tag.EVAL_PAGE, action);
-		assertEquals("25%", ((MockHttpServletResponse) context.getResponse()).getContentAsString());
+		assertEquals(formatter.print(new BigDecimal(".25"), Locale.getDefault()),
+				((MockHttpServletResponse) context.getResponse()).getContentAsString());
 	}
 
 	public void testPrintHtmlEscapedAttributeResult() throws Exception {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
index a687e1efc9..774825c4a0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
@@ -179,7 +179,7 @@ public void testPrependServletPath() throws Exception {
 		String onreset = "onreset";
 
 		this.tag.setCommandName(commandName);
-		this.tag.setAction(action);
+		this.tag.setServletRelativeAction(action);
 		this.tag.setMethod(method);
 		this.tag.setEnctype(enctype);
 		this.tag.setOnsubmit(onsubmit);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java
index fafea1c9d1..4911b5bb57 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java
@@ -46,6 +46,7 @@
 
 import static org.junit.Assert.*;
 import static org.mockito.BDDMockito.*;
+import static org.mockito.Mockito.*;
 
 /**
  * @author Arjen Poutsma
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java
index 62ba99fb7b..2a23e2485e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,17 +17,18 @@
 package org.springframework.web.servlet.view.document;
 
 import java.io.ByteArrayInputStream;
+import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import junit.framework.TestCase;
 import jxl.Cell;
 import jxl.Sheet;
 import jxl.Workbook;
+import jxl.WorkbookSettings;
+import jxl.read.biff.WorkbookParser;
 import jxl.write.Label;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
@@ -36,28 +37,37 @@
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.junit.Before;
+import org.junit.Test;
 
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.mock.web.test.MockServletContext;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.web.context.support.StaticWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.LocaleResolver;
 
+import static org.junit.Assert.*;
+
 /**
  * Tests for the AbstractExcelView and the AbstractJExcelView classes.
  *
  * @author Alef Arendsen
  * @author Bram Smeets
  */
-public class ExcelViewTests extends TestCase {
+public class ExcelViewTests {
 
 	private MockServletContext servletCtx;
+
 	private MockHttpServletRequest request;
+
 	private MockHttpServletResponse response;
+
 	private StaticWebApplicationContext webAppCtx;
 
-	@Override
+
+	@Before
 	public void setUp() {
 		servletCtx = new MockServletContext("org/springframework/web/servlet/view/document");
 		request = new MockHttpServletRequest(servletCtx);
@@ -66,15 +76,14 @@ public void setUp() {
 		webAppCtx.setServletContext(servletCtx);
 	}
 
+
+	@Test
 	public void testExcel() throws Exception {
 		AbstractExcelView excelView = new AbstractExcelView() {
 			@Override
-			protected void buildExcelDocument(Map model, HSSFWorkbook wb,
-					HttpServletRequest request, HttpServletResponse response)
-					throws Exception {
-				HSSFSheet sheet = wb.createSheet();
-				wb.setSheetName(0, "Test Sheet");
-
+			protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook wb,
+					HttpServletRequest request, HttpServletResponse response) throws Exception {
+				HSSFSheet sheet = wb.createSheet("Test Sheet");
 				// test all possible permutation of row or column not existing
 				HSSFCell cell = getCell(sheet, 2, 4);
 				cell.setCellValue("Test Value");
@@ -87,7 +96,7 @@ protected void buildExcelDocument(Map model, HSSFWorkbook wb,
 			}
 		};
 
-		excelView.render(new HashMap(), request, response);
+		excelView.render(new HashMap<String, Object>(), request, response);
 
 		POIFSFileSystem poiFs = new POIFSFileSystem(new ByteArrayInputStream(response.getContentAsByteArray()));
 		HSSFWorkbook wb = new HSSFWorkbook(poiFs);
@@ -98,17 +107,16 @@ protected void buildExcelDocument(Map model, HSSFWorkbook wb,
 		assertEquals("Test Value", cell.getStringCellValue());
 	}
 
+	@Test
 	public void testExcelWithTemplateNoLoc() throws Exception {
 		request.setAttribute(DispatcherServlet.LOCALE_RESOLVER_ATTRIBUTE,
 				newDummyLocaleResolver("nl", "nl"));
 
 		AbstractExcelView excelView = new AbstractExcelView() {
 			@Override
-			protected void buildExcelDocument(Map model, HSSFWorkbook wb,
-					HttpServletRequest request, HttpServletResponse response)
-					throws Exception {
+			protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook wb,
+					HttpServletRequest request, HttpServletResponse response) throws Exception {
 				HSSFSheet sheet = wb.getSheet("Sheet1");
-
 				// test all possible permutation of row or column not existing
 				HSSFCell cell = getCell(sheet, 2, 4);
 				cell.setCellValue("Test Value");
@@ -123,7 +131,7 @@ protected void buildExcelDocument(Map model, HSSFWorkbook wb,
 
 		excelView.setApplicationContext(webAppCtx);
 		excelView.setUrl("template");
-		excelView.render(new HashMap(), request, response);
+		excelView.render(new HashMap<String, Object>(), request, response);
 
 		POIFSFileSystem poiFs = new POIFSFileSystem(new ByteArrayInputStream(response.getContentAsByteArray()));
 		HSSFWorkbook wb = new HSSFWorkbook(poiFs);
@@ -133,17 +141,16 @@ protected void buildExcelDocument(Map model, HSSFWorkbook wb,
 		assertEquals("Test Template", cell.getStringCellValue());
 	}
 
+	@Test
 	public void testExcelWithTemplateAndCountryAndLanguage() throws Exception {
 		request.setAttribute(DispatcherServlet.LOCALE_RESOLVER_ATTRIBUTE,
 				newDummyLocaleResolver("en", "US"));
 
 		AbstractExcelView excelView = new AbstractExcelView() {
 			@Override
-			protected void buildExcelDocument(Map model, HSSFWorkbook wb,
-					HttpServletRequest request, HttpServletResponse response)
-					throws Exception {
+			protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook wb,
+					HttpServletRequest request, HttpServletResponse response) throws Exception {
 				HSSFSheet sheet = wb.getSheet("Sheet1");
-
 				// test all possible permutation of row or column not existing
 				HSSFCell cell = getCell(sheet, 2, 4);
 				cell.setCellValue("Test Value");
@@ -158,7 +165,7 @@ protected void buildExcelDocument(Map model, HSSFWorkbook wb,
 
 		excelView.setApplicationContext(webAppCtx);
 		excelView.setUrl("template");
-		excelView.render(new HashMap(), request, response);
+		excelView.render(new HashMap<String, Object>(), request, response);
 
 		POIFSFileSystem poiFs = new POIFSFileSystem(new ByteArrayInputStream(response.getContentAsByteArray()));
 		HSSFWorkbook wb = new HSSFWorkbook(poiFs);
@@ -168,17 +175,16 @@ protected void buildExcelDocument(Map model, HSSFWorkbook wb,
 		assertEquals("Test Template American English", cell.getStringCellValue());
 	}
 
+	@Test
 	public void testExcelWithTemplateAndLanguage() throws Exception {
 		request.setAttribute(DispatcherServlet.LOCALE_RESOLVER_ATTRIBUTE,
 				newDummyLocaleResolver("de", ""));
 
 		AbstractExcelView excelView = new AbstractExcelView() {
 			@Override
-			protected void buildExcelDocument(Map model, HSSFWorkbook wb,
-					HttpServletRequest request, HttpServletResponse response)
-					throws Exception {
+			protected void buildExcelDocument(Map<String, Object> model, HSSFWorkbook wb,
+					HttpServletRequest request, HttpServletResponse response) throws Exception {
 				HSSFSheet sheet = wb.getSheet("Sheet1");
-
 				// test all possible permutation of row or column not existing
 				HSSFCell cell = getCell(sheet, 2, 4);
 				cell.setCellValue("Test Value");
@@ -193,7 +199,7 @@ protected void buildExcelDocument(Map model, HSSFWorkbook wb,
 
 		excelView.setApplicationContext(webAppCtx);
 		excelView.setUrl("template");
-		excelView.render(new HashMap(), request, response);
+		excelView.render(new HashMap<String, Object>(), request, response);
 
 		POIFSFileSystem poiFs = new POIFSFileSystem(new ByteArrayInputStream(response.getContentAsByteArray()));
 		HSSFWorkbook wb = new HSSFWorkbook(poiFs);
@@ -203,16 +209,13 @@ protected void buildExcelDocument(Map model, HSSFWorkbook wb,
 		assertEquals("Test Template auf Deutsch", cell.getStringCellValue());
 	}
 
+	@Test
 	public void testJExcel() throws Exception {
-		AbstractJExcelView excelView = new AbstractJExcelView() {
+		AbstractJExcelView excelView = new UnixSafeAbstractJExcelView() {
 			@Override
-			protected void buildExcelDocument(Map model,
-					WritableWorkbook wb,
-					HttpServletRequest request,
-					HttpServletResponse response)
-					throws Exception {
+			protected void buildExcelDocument(Map<String, Object> model, WritableWorkbook wb,
+					HttpServletRequest request, HttpServletResponse response) throws Exception {
 				WritableSheet sheet = wb.createSheet("Test Sheet", 0);
-
 				// test all possible permutation of row or column not existing
 				sheet.addCell(new Label(2, 4, "Test Value"));
 				sheet.addCell(new Label(2, 3, "Test Value"));
@@ -221,7 +224,7 @@ protected void buildExcelDocument(Map model,
 			}
 		};
 
-		excelView.render(new HashMap(), request, response);
+		excelView.render(new HashMap<String, Object>(), request, response);
 
 		Workbook wb = Workbook.getWorkbook(new ByteArrayInputStream(response.getContentAsByteArray()));
 		assertEquals("Test Sheet", wb.getSheet(0).getName());
@@ -230,19 +233,16 @@ protected void buildExcelDocument(Map model,
 		assertEquals("Test Value", cell.getContents());
 	}
 
+	@Test
 	public void testJExcelWithTemplateNoLoc() throws Exception {
 		request.setAttribute(DispatcherServlet.LOCALE_RESOLVER_ATTRIBUTE,
 				newDummyLocaleResolver("nl", "nl"));
 
-		AbstractJExcelView excelView = new AbstractJExcelView() {
+		AbstractJExcelView excelView = new UnixSafeAbstractJExcelView() {
 			@Override
-			protected void buildExcelDocument(Map model,
-					WritableWorkbook wb,
-					HttpServletRequest request,
-					HttpServletResponse response)
-					throws Exception {
+			protected void buildExcelDocument(Map<String, Object> model, WritableWorkbook wb,
+					HttpServletRequest request, HttpServletResponse response) throws Exception {
 				WritableSheet sheet = wb.getSheet("Sheet1");
-
 				// test all possible permutation of row or column not existing
 				sheet.addCell(new Label(2, 4, "Test Value"));
 				sheet.addCell(new Label(2, 3, "Test Value"));
@@ -253,7 +253,7 @@ protected void buildExcelDocument(Map model,
 
 		excelView.setApplicationContext(webAppCtx);
 		excelView.setUrl("template");
-		excelView.render(new HashMap(), request, response);
+		excelView.render(new HashMap<String, Object>(), request, response);
 
 		Workbook wb = Workbook.getWorkbook(new ByteArrayInputStream(response.getContentAsByteArray()));
 		Sheet sheet = wb.getSheet("Sheet1");
@@ -261,19 +261,16 @@ protected void buildExcelDocument(Map model,
 		assertEquals("Test Template", cell.getContents());
 	}
 
+	@Test
 	public void testJExcelWithTemplateAndCountryAndLanguage() throws Exception {
 		request.setAttribute(DispatcherServlet.LOCALE_RESOLVER_ATTRIBUTE,
 				newDummyLocaleResolver("en", "US"));
 
-		AbstractJExcelView excelView = new AbstractJExcelView() {
+		AbstractJExcelView excelView = new UnixSafeAbstractJExcelView() {
 			@Override
-			protected void buildExcelDocument(Map model,
-					WritableWorkbook wb,
-					HttpServletRequest request,
-					HttpServletResponse response)
-					throws Exception {
+			protected void buildExcelDocument(Map<String, Object> model, WritableWorkbook wb,
+					HttpServletRequest request, HttpServletResponse response) throws Exception {
 				WritableSheet sheet = wb.getSheet("Sheet1");
-
 				// test all possible permutation of row or column not existing
 				sheet.addCell(new Label(2, 4, "Test Value"));
 				sheet.addCell(new Label(2, 3, "Test Value"));
@@ -284,7 +281,7 @@ protected void buildExcelDocument(Map model,
 
 		excelView.setApplicationContext(webAppCtx);
 		excelView.setUrl("template");
-		excelView.render(new HashMap(), request, response);
+		excelView.render(new HashMap<String, Object>(), request, response);
 
 		Workbook wb = Workbook.getWorkbook(new ByteArrayInputStream(response.getContentAsByteArray()));
 		Sheet sheet = wb.getSheet("Sheet1");
@@ -292,19 +289,16 @@ protected void buildExcelDocument(Map model,
 		assertEquals("Test Template American English", cell.getContents());
 	}
 
+	@Test
 	public void testJExcelWithTemplateAndLanguage() throws Exception {
 		request.setAttribute(DispatcherServlet.LOCALE_RESOLVER_ATTRIBUTE,
 				newDummyLocaleResolver("de", ""));
 
-		AbstractJExcelView excelView = new AbstractJExcelView() {
+		AbstractJExcelView excelView = new UnixSafeAbstractJExcelView() {
 			@Override
-			protected void buildExcelDocument(Map model,
-					WritableWorkbook wb,
-					HttpServletRequest request,
-					HttpServletResponse response)
-					throws Exception {
+			protected void buildExcelDocument(Map<String, Object> model, WritableWorkbook wb,
+					HttpServletRequest request, HttpServletResponse response) throws Exception {
 				WritableSheet sheet = wb.getSheet("Sheet1");
-
 				// test all possible permutation of row or column not existing
 				sheet.addCell(new Label(2, 4, "Test Value"));
 				sheet.addCell(new Label(2, 3, "Test Value"));
@@ -315,7 +309,7 @@ protected void buildExcelDocument(Map model,
 
 		excelView.setApplicationContext(webAppCtx);
 		excelView.setUrl("template");
-		excelView.render(new HashMap(), request, response);
+		excelView.render(new HashMap<String, Object>(), request, response);
 
 		Workbook wb = Workbook.getWorkbook(new ByteArrayInputStream(response.getContentAsByteArray()));
 		Sheet sheet = wb.getSheet("Sheet1");
@@ -323,20 +317,39 @@ protected void buildExcelDocument(Map model,
 		assertEquals("Test Template auf Deutsch", cell.getContents());
 	}
 
+
 	private LocaleResolver newDummyLocaleResolver(final String lang, final String country) {
 		return new LocaleResolver() {
 			@Override
 			public Locale resolveLocale(HttpServletRequest request) {
 				return new Locale(lang, country);
 			}
-
 			@Override
-			public void setLocale(HttpServletRequest request,
-					HttpServletResponse response, Locale locale) {
-				// not supported!
-
+			public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) {
+				// not supported
 			}
 		};
 	}
 
+
+	/**
+	 * Workaround JXL bug that causes ArrayIndexOutOfBounds exceptions when running in
+	 * *nix machines. Same bug as reported at http://jira.pentaho.com/browse/PDI-5031.
+	 * <p>We want to use the latest JXL code because it doesn't include log4j config files
+	 * inside the jar. Since the project appears to be abandoned, AbstractJExcelView will
+	 * eventually get deprecated.
+	 */
+	private static abstract class UnixSafeAbstractJExcelView extends AbstractJExcelView {
+
+		@Override
+		protected Workbook getTemplateSource(String url, HttpServletRequest request) throws Exception {
+			Workbook workbook = super.getTemplateSource(url, request);
+			Field field = WorkbookParser.class.getDeclaredField("settings");
+			field.setAccessible(true);
+			WorkbookSettings settings = (WorkbookSettings) ReflectionUtils.getField(field, workbook);
+			settings.setWriteAccess(null);
+			return workbook;
+		}
+	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java
deleted file mode 100644
index 933b8e0129..0000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.view.document;
-
-import java.io.ByteArrayOutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.lowagie.text.Document;
-import com.lowagie.text.PageSize;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfWriter;
-import junit.framework.TestCase;
-
-import org.springframework.mock.web.test.MockHttpServletRequest;
-import org.springframework.mock.web.test.MockHttpServletResponse;
-
-/**
- * @author Alef Arendsen
- * @author Juergen Hoeller
- */
-public class PdfViewTests extends TestCase {
-
-	public void testPdf() throws Exception {
-		final String text = "this should be in the PDF";
-		MockHttpServletRequest request = new MockHttpServletRequest();
-		MockHttpServletResponse response = new MockHttpServletResponse();
-
-		AbstractPdfView pdfView = new AbstractPdfView() {
-			@Override
-			protected void buildPdfDocument(Map model, Document document, PdfWriter writer,
-					HttpServletRequest request, HttpServletResponse response) throws Exception {
-				document.add(new Paragraph(text));
-			}
-		};
-
-		pdfView.render(new HashMap(), request, response);
-		byte[] pdfContent = response.getContentAsByteArray();
-		assertEquals("correct response content type", "application/pdf", response.getContentType());
-		assertEquals("correct response content length", pdfContent.length, response.getContentLength());
-
-		// rebuild iText document for comparison
-		Document document = new Document(PageSize.A4);
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		PdfWriter writer = PdfWriter.getInstance(document, baos);
-		writer.setViewerPreferences(PdfWriter.AllowPrinting | PdfWriter.PageLayoutSinglePage);
-		document.open();
-		document.add(new Paragraph(text));
-		document.close();
-		byte[] baosContent = baos.toByteArray();
-		assertEquals("correct size", pdfContent.length, baosContent.length);
-
-		int diffCount = 0;
-		for (int i = 0; i < pdfContent.length; i++) {
-			if (pdfContent[i] != baosContent[i]) {
-				diffCount++;
-			}
-		}
-		assertTrue("difference only in encryption", diffCount < 70);
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTest.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTests.java
similarity index 89%
rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTest.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTests.java
index 3827ebc2a9..015bf52eea 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTest.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/AtomFeedViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ${YEAR} the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 package org.springframework.web.servlet.view.feed;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
@@ -27,16 +27,20 @@
 import com.sun.syndication.feed.atom.Content;
 import com.sun.syndication.feed.atom.Entry;
 import com.sun.syndication.feed.atom.Feed;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import static org.custommonkey.xmlunit.XMLUnit.setIgnoreWhitespace;
-import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 
-public class AtomFeedViewTest {
+import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.custommonkey.xmlunit.XMLUnit.*;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Arjen Poutsma
+ */
+public class AtomFeedViewTests {
 
 	private AbstractAtomFeedView view;
 
@@ -51,9 +55,9 @@ public void render() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
-		Map<String, String> model = new HashMap<String, String>();
-		model.put("1", "This is entry 1");
+		Map<String, String> model = new LinkedHashMap<String, String>();
 		model.put("2", "This is entry 2");
+		model.put("1", "This is entry 1");
 
 		view.render(model, request, response);
 		assertEquals("Invalid content-type", "application/atom+xml", response.getContentType());
@@ -63,6 +67,7 @@ public void render() throws Exception {
 		assertXMLEqual(expected, response.getContentAsString());
 	}
 
+
 	private static class MyAtomFeedView extends AbstractAtomFeedView {
 
 		@Override
@@ -86,4 +91,5 @@ protected List<Entry> buildFeedEntries(Map model, HttpServletRequest request, Ht
 			return entries;
 		}
 	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTest.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTests.java
similarity index 82%
rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTest.java
rename to spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTests.java
index a662993bd8..0f15bcacef 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTest.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/feed/RssFeedViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ${YEAR} the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
 package org.springframework.web.servlet.view.feed;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
@@ -27,16 +26,20 @@
 import com.sun.syndication.feed.rss.Channel;
 import com.sun.syndication.feed.rss.Description;
 import com.sun.syndication.feed.rss.Item;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import static org.custommonkey.xmlunit.XMLUnit.setIgnoreWhitespace;
-import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 
-public class RssFeedViewTest {
+import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.custommonkey.xmlunit.XMLUnit.*;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Arjen Poutsma
+ */
+public class RssFeedViewTests {
 
 	private AbstractRssFeedView view;
 
@@ -44,7 +47,6 @@ public class RssFeedViewTest {
 	public void createView() throws Exception {
 		view = new MyRssFeedView();
 		setIgnoreWhitespace(true);
-
 	}
 
 	@Test
@@ -52,9 +54,9 @@ public void render() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
-		Map<String, String> model = new HashMap<String, String>();
-		model.put("1", "This is entry 1");
+		Map<String, String> model = new LinkedHashMap<String, String>();
 		model.put("2", "This is entry 2");
+		model.put("1", "This is entry 1");
 
 		view.render(model, request, response);
 		assertEquals("Invalid content-type", "application/rss+xml", response.getContentType());
@@ -65,6 +67,7 @@ public void render() throws Exception {
 		assertXMLEqual(expected, response.getContentAsString());
 	}
 
+
 	private static class MyRssFeedView extends AbstractRssFeedView {
 
 		@Override
@@ -75,11 +78,9 @@ protected void buildFeedMetadata(Map model, Channel channel, HttpServletRequest
 		}
 
 		@Override
-		protected List<Item> buildFeedItems(Map model, HttpServletRequest request, HttpServletResponse response)
-				throws Exception {
+		protected List<Item> buildFeedItems(Map<String, Object> model, HttpServletRequest request, HttpServletResponse response) throws Exception {
 			List<Item> items = new ArrayList<Item>();
-			for (Iterator iterator = model.keySet().iterator(); iterator.hasNext();) {
-				String name = (String) iterator.next();
+			for (String name : model.keySet()) {
 				Item item = new Item();
 				item.setTitle(name);
 				Description description = new Description();
@@ -90,4 +91,5 @@ protected List<Item> buildFeedItems(Map model, HttpServletRequest request, HttpS
 			return items;
 		}
 	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
index 9e4f320ef6..7c4b635afe 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,27 +16,26 @@
 
 package org.springframework.web.servlet.view.freemarker;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.FileWriter;
 import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
+import freemarker.template.Configuration;
+import freemarker.template.SimpleHash;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.tests.sample.beans.TestBean;
+
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.mock.web.test.MockServletContext;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.support.StaticWebApplicationContext;
@@ -47,10 +46,7 @@
 import org.springframework.web.servlet.theme.FixedThemeResolver;
 import org.springframework.web.servlet.view.DummyMacroRequestContext;
 
-import freemarker.template.Configuration;
-import freemarker.template.SimpleHash;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
+import static org.junit.Assert.*;
 
 /**
  * @author Darren Davison
@@ -69,6 +65,7 @@ public class FreeMarkerMacroTests {
 
 	private FreeMarkerConfigurer fc;
 
+
 	@Before
 	public void setUp() throws Exception {
 		wac = new StaticWebApplicationContext();
@@ -76,7 +73,7 @@ public void setUp() throws Exception {
 
 		// final Template expectedTemplate = new Template();
 		fc = new FreeMarkerConfigurer();
-		fc.setTemplateLoaderPaths(new String[] { "classpath:/", "file://" + System.getProperty("java.io.tmpdir") });
+		fc.setTemplateLoaderPaths("classpath:/", "file://" + System.getProperty("java.io.tmpdir"));
 		fc.afterPropertiesSet();
 
 		wac.getDefaultListableBeanFactory().registerSingleton("freeMarkerConfigurer", fc);
@@ -89,6 +86,7 @@ public void setUp() throws Exception {
 		response = new MockHttpServletResponse();
 	}
 
+
 	@Test
 	public void testExposeSpringMacroHelpers() throws Exception {
 		FreeMarkerView fv = new FreeMarkerView() {
@@ -131,7 +129,8 @@ protected void processTemplate(Template template, SimpleHash model, HttpServletR
 
 		try {
 			fv.render(model, request, response);
-		} catch (Exception ex) {
+		}
+		catch (Exception ex) {
 			assertTrue(ex instanceof ServletException);
 			assertTrue(ex.getMessage().contains(FreeMarkerView.SPRING_MACRO_REQUEST_CONTEXT_ATTRIBUTE));
 		}
@@ -219,6 +218,7 @@ public void testForm4() throws Exception {
 	}
 
 	// TODO verify remaining output (fix whitespace)
+
 	@Test
 	public void testForm9() throws Exception {
 		assertEquals("<input type=\"password\" id=\"name\" name=\"name\" value=\"\"     >", getMacroOutput("FORM9"));
@@ -272,8 +272,8 @@ public void testForm18() throws Exception {
 		assertTrue("Wrong output: " + output, output.contains("<input type=\"checkbox\" id=\"spouses0.jedi\" name=\"spouses[0].jedi\" checked=\"checked\" />"));
 	}
 
-	private String getMacroOutput(String name) throws Exception {
 
+	private String getMacroOutput(String name) throws Exception {
 		String macro = fetchMacro(name);
 		assertNotNull(macro);
 
@@ -296,6 +296,7 @@ private String getMacroOutput(String name) throws Exception {
 		fred.setJedi(true);
 		darren.setSpouse(fred);
 		darren.setJedi(true);
+		darren.setStringArray(new String[] {"John", "Fred"});
 		request.setAttribute("command", darren);
 
 		Map<String, String> names = new HashMap<String, String>();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
index 0131151f0e..330399afcb 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,14 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-
 import javax.servlet.http.HttpServletResponse;
 
+import freemarker.ext.servlet.AllHttpScopesHashModel;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
 import org.junit.Test;
+
 import org.springframework.context.ApplicationContextException;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
@@ -40,11 +44,6 @@
 import org.springframework.web.servlet.view.InternalResourceView;
 import org.springframework.web.servlet.view.RedirectView;
 
-import freemarker.ext.servlet.AllHttpScopesHashModel;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
-
 import static org.junit.Assert.*;
 import static org.mockito.BDDMockito.*;
 
@@ -70,7 +69,7 @@ public void testNoFreeMarkerConfig() throws Exception {
 		}
 		catch (ApplicationContextException ex) {
 			// Check there's a helpful error message
-			assertTrue(ex.getMessage().indexOf("FreeMarkerConfig") != -1);
+			assertTrue(ex.getMessage().contains("FreeMarkerConfig"));
 		}
 	}
 
@@ -83,7 +82,7 @@ public void testNoTemplateName() throws Exception {
 		}
 		catch (IllegalArgumentException ex) {
 			// Check there's a helpful error message
-			assertTrue(ex.getMessage().indexOf("url") != -1);
+			assertTrue(ex.getMessage().contains("url"));
 		}
 	}
 
@@ -94,7 +93,7 @@ public void testValidTemplateName() throws Exception {
 		WebApplicationContext wac = mock(WebApplicationContext.class);
 		MockServletContext sc = new MockServletContext();
 
-		Map configs = new HashMap();
+		Map<String, FreeMarkerConfig> configs = new HashMap<String, FreeMarkerConfig>();
 		FreeMarkerConfigurer configurer = new FreeMarkerConfigurer();
 		configurer.setConfiguration(new TestConfiguration());
 		configs.put("configurer", configurer);
@@ -110,7 +109,7 @@ public void testValidTemplateName() throws Exception {
 		request.setAttribute(DispatcherServlet.LOCALE_RESOLVER_ATTRIBUTE, new AcceptHeaderLocaleResolver());
 		HttpServletResponse response = new MockHttpServletResponse();
 
-		Map model = new HashMap();
+		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("myattr", "myvalue");
 		fv.render(model, request, response);
 
@@ -124,7 +123,7 @@ public void testKeepExistingContentType() throws Exception {
 		WebApplicationContext wac = mock(WebApplicationContext.class);
 		MockServletContext sc = new MockServletContext();
 
-		Map configs = new HashMap();
+		Map<String, FreeMarkerConfig> configs = new HashMap<String, FreeMarkerConfig>();
 		FreeMarkerConfigurer configurer = new FreeMarkerConfigurer();
 		configurer.setConfiguration(new TestConfiguration());
 		configs.put("configurer", configurer);
@@ -141,7 +140,7 @@ public void testKeepExistingContentType() throws Exception {
 		HttpServletResponse response = new MockHttpServletResponse();
 		response.setContentType("myContentType");
 
-		Map model = new HashMap();
+		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("myattr", "myvalue");
 		fv.render(model, request, response);
 
@@ -185,7 +184,7 @@ private class TestConfiguration extends Configuration {
 		@Override
 		public Template getTemplate(String name, final Locale locale) throws IOException {
 			if (name.equals("templateName") || name.equals("prefix_test_suffix")) {
-				return new Template(name, new StringReader("test")) {
+				return new Template(name, new StringReader("test"), this) {
 					@Override
 					public void process(Object model, Writer writer) throws TemplateException, IOException {
 						assertEquals(Locale.US, locale);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/test.ftl b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/test.ftl
index b1e0156186..b6fb4caf4e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/test.ftl
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/test.ftl
@@ -61,7 +61,7 @@ FORM7
 <@spring.formRadioButtons "command.name", nameOptionMap, " ", ""/>
 
 FORM8
-<@spring.formCheckboxes "command.spouses", nameOptionMap, " ", ""/>
+<@spring.formCheckboxes "command.stringArray", nameOptionMap, " ", ""/>
 
 FORM9
 <@spring.formPasswordInput "command.name", ""/>
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractConfigurableJasperReportsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractConfigurableJasperReportsViewTests.java
deleted file mode 100644
index 9dbdfb3122..0000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractConfigurableJasperReportsViewTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2002-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.view.jasperreports;
-
-import org.springframework.context.support.StaticApplicationContext;
-
-/**
- * @author Rob Harrop
- */
-public abstract class AbstractConfigurableJasperReportsViewTests extends AbstractJasperReportsViewTests {
-
-	public void testNoConfiguredExporter() throws Exception {
-		ConfigurableJasperReportsView view = new ConfigurableJasperReportsView();
-		view.setUrl(COMPILED_REPORT);
-		try {
-			view.setApplicationContext(new StaticApplicationContext());
-			fail("Should not be able to setup view class without an exporter class.");
-		}
-		catch (IllegalArgumentException e) {
-			// success
-		}
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java
deleted file mode 100644
index f78a5f1b02..0000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.view.jasperreports;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import junit.framework.TestCase;
-import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
-
-import org.springframework.mock.web.test.MockHttpServletRequest;
-import org.springframework.mock.web.test.MockHttpServletResponse;
-import org.springframework.ui.jasperreports.PersonBean;
-import org.springframework.ui.jasperreports.ProductBean;
-import org.springframework.util.ClassUtils;
-import org.springframework.web.servlet.DispatcherServlet;
-import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
-
-/**
- * @author Rob Harrop
- * @author Juergen Hoeller
- */
-public abstract class AbstractJasperReportsTests extends TestCase {
-
-	protected static final String COMPILED_REPORT = "/org/springframework/ui/jasperreports/DataSourceReport.jasper";
-
-	protected static final String UNCOMPILED_REPORT = "/org/springframework/ui/jasperreports/DataSourceReport.jrxml";
-
-	protected static final String SUB_REPORT_PARENT = "/org/springframework/ui/jasperreports/subReportParent.jrxml";
-
-	protected static final boolean canCompileReport = ClassUtils.isPresent(
-			"org.eclipse.jdt.internal.compiler.Compiler", AbstractJasperReportsTests.class.getClassLoader());
-
-
-	protected MockHttpServletRequest request;
-
-	protected MockHttpServletResponse response;
-
-
-	@Override
-	public void setUp() {
-		request = new MockHttpServletRequest();
-		response = new MockHttpServletResponse();
-
-		request.setAttribute(DispatcherServlet.LOCALE_RESOLVER_ATTRIBUTE, new AcceptHeaderLocaleResolver());
-		request.addPreferredLocale(Locale.GERMAN);
-	}
-
-
-	protected Map<String, Object> getModel() {
-		Map model = new HashMap();
-		model.put("ReportTitle", "Dear Lord!");
-		model.put("dataSource", new JRBeanCollectionDataSource(getData()));
-		extendModel(model);
-		return model;
-	}
-
-	/**
-	 * Subclasses can extend the model if they need to.
-	 */
-	protected void extendModel(Map<String, Object> model) {
-	}
-
-	protected List getData() {
-		List list = new ArrayList();
-		for (int x = 0; x < 10; x++) {
-			PersonBean bean = new PersonBean();
-			bean.setId(x);
-			bean.setName("Rob Harrop");
-			bean.setStreet("foo");
-			list.add(bean);
-		}
-		return list;
-	}
-
-	protected List getProductData() {
-		List list = new ArrayList();
-		for (int x = 0; x < 10; x++) {
-			ProductBean bean = new ProductBean();
-			bean.setId(x);
-			bean.setName("Foo Bar");
-			bean.setPrice(1.9f);
-			bean.setQuantity(1.0f);
-
-			list.add(bean);
-		}
-		return list;
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java
deleted file mode 100755
index 463fe47d28..0000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.view.jasperreports;
-
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.sql.DataSource;
-
-import net.sf.jasperreports.engine.JRDataSource;
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JRExporterParameter;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.data.JRAbstractBeanDataSourceProvider;
-import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
-
-import org.junit.Ignore;
-import org.springframework.context.ApplicationContextException;
-import org.springframework.mock.web.test.MockServletContext;
-import org.springframework.ui.jasperreports.PersonBean;
-import org.springframework.web.context.support.StaticWebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
-
-import static org.mockito.BDDMockito.*;
-
-/**
- * @author Rob Harrop
- * @author Juergen Hoeller
- */
-public abstract class AbstractJasperReportsViewTests extends AbstractJasperReportsTests {
-
-	protected AbstractJasperReportsView getView(String url) throws Exception {
-		AbstractJasperReportsView view = getViewImplementation();
-		view.setUrl(url);
-		StaticWebApplicationContext ac = new StaticWebApplicationContext();
-		ac.setServletContext(new MockServletContext());
-		ac.addMessage("page", Locale.GERMAN, "MeineSeite");
-		ac.refresh();
-		request.setAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE, ac);
-		view.setApplicationContext(ac);
-		return view;
-	}
-
-	/**
-	 * Simple test to see if compiled report succeeds.
-	 */
-	public void testCompiledReport() throws Exception {
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.render(getModel(), request, response);
-		assertTrue(response.getContentAsByteArray().length > 0);
-		if (view instanceof AbstractJasperReportsSingleFormatView &&
-				((AbstractJasperReportsSingleFormatView) view).useWriter()) {
-			String output = response.getContentAsString();
-			assertTrue("Output should contain 'MeineSeite'", output.contains("MeineSeite"));
-		}
-	}
-
-	public void testUncompiledReport() throws Exception {
-		if (!canCompileReport) {
-			return;
-		}
-
-		AbstractJasperReportsView view = getView(UNCOMPILED_REPORT);
-		view.render(getModel(), request, response);
-		assertTrue(response.getContentAsByteArray().length > 0);
-	}
-
-	public void testWithInvalidPath() throws Exception {
-		try {
-			getView("foo.jasper");
-			fail("Invalid path should throw ApplicationContextException");
-		}
-		catch (ApplicationContextException ex) {
-			// good!
-		}
-	}
-
-	public void testInvalidExtension() throws Exception {
-		try {
-			getView("foo.bar");
-			fail("Invalid extension should throw IllegalArgumentException");
-		}
-		catch (IllegalArgumentException ex) {
-			// expected
-		}
-	}
-
-	public void testContentType() throws Exception {
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.render(getModel(), request, response);
-		assertEquals("Response content type is incorrect", getDesiredContentType(), response.getContentType());
-	}
-
-	public void testWithoutDatasource() throws Exception {
-		Map model = getModel();
-		model.remove("dataSource");
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.render(model, request, response);
-		assertTrue(response.getStatus() == HttpServletResponse.SC_OK);
-	}
-
-	public void testWithCollection() throws Exception {
-		Map model = getModel();
-		model.remove("dataSource");
-		model.put("reportData", getData());
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.render(model, request, response);
-		assertTrue(response.getContentAsByteArray().length > 0);
-	}
-
-	public void testWithMultipleCollections() throws Exception {
-		Map model = getModel();
-		model.remove("dataSource");
-		model.put("reportData", getData());
-		model.put("otherData", new LinkedList());
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.render(model, request, response);
-		// no clear data source found
-	}
-
-	public void testWithJRDataSourceProvider() throws Exception {
-		Map model = getModel();
-		model.remove("dataSource");
-		model.put("dataSource", new MockDataSourceProvider(PersonBean.class));
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.render(model, request, response);
-		assertTrue(response.getContentAsByteArray().length > 0);
-	}
-
-	public void testWithSpecificCollection() throws Exception {
-		Map model = getModel();
-		model.remove("dataSource");
-		model.put("reportData", getData());
-		model.put("otherData", new LinkedList());
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.setReportDataKey("reportData");
-		view.render(model, request, response);
-		assertTrue(response.getContentAsByteArray().length > 0);
-	}
-
-	public void testWithArray() throws Exception {
-		Map model = getModel();
-		model.remove("dataSource");
-		model.put("reportData", getData().toArray());
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.render(model, request, response);
-		assertTrue(response.getContentAsByteArray().length > 0);
-	}
-
-	public void testWithMultipleArrays() throws Exception {
-		Map model = getModel();
-		model.remove("dataSource");
-		model.put("reportData", getData().toArray());
-		model.put("otherData", new String[0]);
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.render(model, request, response);
-		// no clear data source found
-	}
-
-	public void testWithSpecificArray() throws Exception {
-		Map model = getModel();
-		model.remove("dataSource");
-		model.put("reportData", getData().toArray());
-		model.put("otherData", new String[0]);
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.setReportDataKey("reportData");
-		view.render(model, request, response);
-		assertTrue(response.getContentAsByteArray().length > 0);
-	}
-
-	public void testWithSubReport() throws Exception {
-		if (!canCompileReport) {
-			return;
-		}
-
-		Map model = getModel();
-		model.put("SubReportData", getProductData());
-
-		Properties subReports = new Properties();
-		subReports.put("ProductsSubReport", "/org/springframework/ui/jasperreports/subReportChild.jrxml");
-
-		AbstractJasperReportsView view = getView(SUB_REPORT_PARENT);
-		view.setReportDataKey("dataSource");
-		view.setSubReportUrls(subReports);
-		view.setSubReportDataKeys(new String[]{"SubReportData"});
-		view.initApplicationContext();
-		view.render(model, request, response);
-
-		assertTrue(response.getContentAsByteArray().length > 0);
-	}
-
-	public void testWithNonExistentSubReport() throws Exception {
-		if (!canCompileReport) {
-			return;
-		}
-
-		Map model = getModel();
-		model.put("SubReportData", getProductData());
-
-		Properties subReports = new Properties();
-		subReports.put("ProductsSubReport", "org/springframework/ui/jasperreports/subReportChildFalse.jrxml");
-
-		AbstractJasperReportsView view = getView(SUB_REPORT_PARENT);
-		view.setReportDataKey("dataSource");
-		view.setSubReportUrls(subReports);
-		view.setSubReportDataKeys(new String[]{"SubReportData"});
-
-		try {
-			view.initApplicationContext();
-			fail("Invalid report URL should throw ApplicationContext Exception");
-		}
-		catch (ApplicationContextException ex) {
-			// success
-		}
-	}
-
-	@Ignore
-	public void ignoreTestOverrideExporterParameters() throws Exception {
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-
-		if (!(view instanceof AbstractJasperReportsSingleFormatView) || !((AbstractJasperReportsSingleFormatView) view).useWriter()) {
-			return;
-		}
-
-		String characterEncoding = "UTF-8";
-		String overiddenCharacterEncoding = "ASCII";
-
-		Map parameters = new HashMap();
-		parameters.put(JRExporterParameter.CHARACTER_ENCODING, characterEncoding);
-
-		view.setExporterParameters(parameters);
-		view.convertExporterParameters();
-
-		Map model = getModel();
-		model.put(JRExporterParameter.CHARACTER_ENCODING, overiddenCharacterEncoding);
-
-		view.render(model, this.request, this.response);
-
-		assertEquals(overiddenCharacterEncoding, this.response.getCharacterEncoding());
-	}
-
-	public void testSubReportWithUnspecifiedParentDataSource() throws Exception {
-		if (!canCompileReport) {
-			return;
-		}
-
-		Map model = getModel();
-		model.put("SubReportData", getProductData());
-
-		Properties subReports = new Properties();
-		subReports.put("ProductsSubReport", "org/springframework/ui/jasperreports/subReportChildFalse.jrxml");
-
-		AbstractJasperReportsView view = getView(SUB_REPORT_PARENT);
-		view.setSubReportUrls(subReports);
-		view.setSubReportDataKeys(new String[]{"SubReportData"});
-
-		try {
-			view.initApplicationContext();
-			fail("Unspecified reportDataKey should throw exception when subReportDataSources is specified");
-		}
-		catch (ApplicationContextException ex) {
-			// success
-		}
-	}
-
-	public void testContentDisposition() throws Exception {
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.render(getModel(), request, response);
-		assertEquals("Invalid content type", "inline", response.getHeader("Content-Disposition"));
-
-	}
-
-	public void testOverrideContentDisposition() throws Exception {
-		Properties headers = new Properties();
-		String cd = "attachment";
-		headers.setProperty("Content-Disposition", cd);
-
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.setHeaders(headers);
-		view.render(getModel(), request, response);
-		assertEquals("Invalid content type", cd, response.getHeader("Content-Disposition"));
-	}
-
-	public void testSetCustomHeaders() throws Exception {
-		Properties headers = new Properties();
-
-		String key = "foo";
-		String value = "bar";
-
-		headers.setProperty(key, value);
-
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-		view.setHeaders(headers);
-		view.render(getModel(), request, response);
-
-		assertNotNull("Header not present", response.getHeader(key));
-		assertEquals("Invalid header value", value, response.getHeader(key));
-	}
-
-	public void testWithJdbcDataSource() throws Exception {
-		if (!canCompileReport) {
-			return;
-		}
-
-		AbstractJasperReportsView view = getView(UNCOMPILED_REPORT);
-		view.setJdbcDataSource(getMockJdbcDataSource());
-
-		Map model = getModel();
-		model.remove("dataSource");
-
-		try {
-			view.render(model, request, response);
-			fail("DataSource was not used as report DataSource");
-		}
-		catch (SQLException ex) {
-			// expected
-		}
-	}
-
-	public void testWithJdbcDataSourceInModel() throws Exception {
-		if (!canCompileReport) {
-			return;
-		}
-
-		AbstractJasperReportsView view = getView(UNCOMPILED_REPORT);
-
-		Map model = getModel();
-		model.remove("dataSource");
-		model.put("someKey", getMockJdbcDataSource());
-
-		try {
-			view.render(model, request, response);
-			fail("DataSource was not used as report DataSource");
-		}
-		catch (SQLException ex) {
-			// expected
-		}
-	}
-
-	public void testJRDataSourceOverridesJdbcDataSource() throws Exception {
-		if (!canCompileReport) {
-			return;
-		}
-
-		AbstractJasperReportsView view = getView(UNCOMPILED_REPORT);
-		view.setJdbcDataSource(getMockJdbcDataSource());
-
-		try {
-			view.render(getModel(), request, response);
-		}
-		catch (SQLException ex) {
-			fail("javax.sql.DataSource was used when JRDataSource should have overridden it");
-		}
-	}
-
-	private DataSource getMockJdbcDataSource() throws SQLException {
-		DataSource ds = mock(DataSource.class);
-		given(ds.getConnection()).willThrow(new SQLException());
-		return ds;
-	}
-
-	public void testWithCharacterEncoding() throws Exception {
-		AbstractJasperReportsView view = getView(COMPILED_REPORT);
-
-		if (!(view instanceof AbstractJasperReportsSingleFormatView) || !((AbstractJasperReportsSingleFormatView) view).useWriter()) {
-			return;
-		}
-
-		String characterEncoding = "UTF-8";
-
-		Map parameters = new HashMap();
-		parameters.put(JRExporterParameter.CHARACTER_ENCODING, characterEncoding);
-
-		view.setExporterParameters(parameters);
-		view.convertExporterParameters();
-
-		view.render(getModel(), this.request, this.response);
-		assertEquals(characterEncoding, this.response.getCharacterEncoding());
-	}
-
-
-	protected abstract AbstractJasperReportsView getViewImplementation();
-
-	protected abstract String getDesiredContentType();
-
-
-	private class MockDataSourceProvider extends JRAbstractBeanDataSourceProvider {
-
-		public MockDataSourceProvider(Class clazz) {
-			super(clazz);
-		}
-
-		@Override
-		public JRDataSource create(JasperReport jasperReport) throws JRException {
-			return new JRBeanCollectionDataSource(getData());
-		}
-
-		@Override
-		public void dispose(JRDataSource jrDataSource) throws JRException {
-
-		}
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java
deleted file mode 100644
index 3f248d1931..0000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.view.jasperreports;
-
-import net.sf.jasperreports.engine.export.JRHtmlExporter;
-
-/**
- * @author Rob Harrop
- */
-public class ConfigurableJasperReportsViewWithStreamTests extends AbstractConfigurableJasperReportsViewTests {
-
-	@Override
-	protected AbstractJasperReportsView getViewImplementation() {
-		ConfigurableJasperReportsView view = new ConfigurableJasperReportsView();
-		view.setExporterClass(JRHtmlExporter.class);
-		view.setUseWriter(true);
-		view.setContentType("application/pdf");
-		return view;
-	}
-
-	@Override
-	protected String getDesiredContentType() {
-		return "application/pdf";
-	}
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java
deleted file mode 100644
index 2c509c4973..0000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.view.jasperreports;
-
-import net.sf.jasperreports.engine.export.JRPdfExporter;
-
-/**
- * @author Rob Harrop
- */
-public class ConfigurableJasperReportsViewWithWriterTests extends AbstractConfigurableJasperReportsViewTests {
-
-	@Override
-	protected AbstractJasperReportsView getViewImplementation() {
-		ConfigurableJasperReportsView view = new ConfigurableJasperReportsView();
-		view.setExporterClass(JRPdfExporter.class);
-		view.setUseWriter(false);
-		view.setContentType("text/html");
-		return view;
-	}
-
-	@Override
-	protected String getDesiredContentType() {
-		return "text/html";
-	}
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java
deleted file mode 100755
index 0cd2f131f2..0000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.view.jasperreports;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.jasperreports.engine.JRExporterParameter;
-import net.sf.jasperreports.engine.JasperPrint;
-import net.sf.jasperreports.engine.export.JRHtmlExporterParameter;
-
-import org.springframework.mock.web.test.MockServletContext;
-import org.springframework.web.context.support.StaticWebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
-
-/**
- * @author Rob Harrop
- */
-public class ExporterParameterTests extends AbstractJasperReportsTests {
-
-	public void testParameterParsing() throws Exception {
-		Map params = new HashMap();
-		params.put("net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI", "/foo/bar");
-
-		AbstractJasperReportsView view = new AbstractJasperReportsView() {
-			@Override
-			protected void renderReport(JasperPrint filledReport, Map model, HttpServletResponse response)
-					throws Exception {
-
-				assertEquals("Invalid number of exporter parameters", 1, getConvertedExporterParameters().size());
-
-				JRExporterParameter key = JRHtmlExporterParameter.IMAGES_URI;
-				Object value = getConvertedExporterParameters().get(key);
-
-				assertNotNull("Value not mapped to correct key", value);
-				assertEquals("Incorrect value for parameter", "/foo/bar", value);
-			}
-
-			/**
-			 * Merges the configured {@link net.sf.jasperreports.engine.JRExporterParameter JRExporterParameters} with any specified
-			 * in the supplied model data. {@link net.sf.jasperreports.engine.JRExporterParameter JRExporterParameters} in the model
-			 * override those specified in the configuration.
-			 * @see #setExporterParameters(java.util.Map)
-			 */
-			protected Map mergeExporterParameters(Map model) {
-				Map mergedParameters = new HashMap(getConvertedExporterParameters());
-				for (Iterator iterator = model.keySet().iterator(); iterator.hasNext();) {
-					Object key = iterator.next();
-
-					if (key instanceof JRExporterParameter) {
-						Object value = model.get(key);
-						if (value instanceof String) {
-							mergedParameters.put(key, value);
-						}
-						else {
-							logger.warn("Ignoring exporter parameter [" + key + "]. Value is not a String.");
-						}
-					}
-				}
-				return mergedParameters;
-			}
-		};
-
-		view.setExporterParameters(params);
-		setViewProperties(view);
-		view.render(getModel(), request, response);
-	}
-
-	public void testInvalidClass() throws Exception {
-		Map params = new HashMap();
-		params.put("foo.net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI", "/foo");
-
-		AbstractJasperReportsView view = new JasperReportsHtmlView();
-		setViewProperties(view);
-
-		try {
-			view.setExporterParameters(params);
-			view.convertExporterParameters();
-			fail("Should have thrown IllegalArgumentException");
-		}
-		catch (IllegalArgumentException ex) {
-			// expected
-		}
-	}
-
-	public void testInvalidField() {
-		Map params = new HashMap();
-		params.put("net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI_FOO", "/foo");
-
-		AbstractJasperReportsView view = new JasperReportsHtmlView();
-		setViewProperties(view);
-
-		try {
-			view.setExporterParameters(params);
-			view.convertExporterParameters();
-			fail("Should have thrown IllegalArgumentException");
-		}
-		catch (IllegalArgumentException ex) {
-			// expected
-		}
-	}
-
-	public void testInvalidType() {
-		Map params = new HashMap();
-		params.put("java.lang.Boolean.TRUE", "/foo");
-
-		AbstractJasperReportsView view = new JasperReportsHtmlView();
-		setViewProperties(view);
-
-		try {
-			view.setExporterParameters(params);
-			view.convertExporterParameters();
-			fail("Should have thrown IllegalArgumentException");
-		}
-		catch (IllegalArgumentException ex) {
-			// expected
-		}
-	}
-
-
-	public void testTypeConversion() {
-		Map params = new HashMap();
-		params.put("net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IS_USING_IMAGES_TO_ALIGN", "true");
-
-		AbstractJasperReportsView view = new JasperReportsHtmlView();
-		setViewProperties(view);
-
-		view.setExporterParameters(params);
-		view.convertExporterParameters();
-		Object value = view.getConvertedExporterParameters().get(JRHtmlExporterParameter.IS_USING_IMAGES_TO_ALIGN);
-		assertEquals(Boolean.TRUE, value);
-	}
-
-	private void setViewProperties(AbstractJasperReportsView view) {
-		view.setUrl("/org/springframework/ui/jasperreports/DataSourceReport.jasper");
-		StaticWebApplicationContext ac = new StaticWebApplicationContext();
-		ac.setServletContext(new MockServletContext());
-		ac.addMessage("page", Locale.GERMAN, "MeineSeite");
-		ac.refresh();
-		request.setAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE, ac);
-		view.setApplicationContext(ac);
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportViewResolverTests.java
deleted file mode 100644
index c743d6254c..0000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportViewResolverTests.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2002-2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.view.jasperreports;
-
-import java.util.Locale;
-
-import junit.framework.TestCase;
-
-import org.springframework.context.support.StaticApplicationContext;
-import org.springframework.web.servlet.view.velocity.VelocityView;
-
-/**
- * @author Rob Harrop
- */
-public class JasperReportViewResolverTests extends TestCase {
-
-	public void testResolveView() throws Exception {
-		StaticApplicationContext ctx = new StaticApplicationContext();
-
-		String prefix = "org/springframework/ui/jasperreports/";
-		String suffix = ".jasper";
-		String viewName = "DataSourceReport";
-
-		JasperReportsViewResolver viewResolver = new JasperReportsViewResolver();
-		viewResolver.setViewClass(JasperReportsHtmlView.class);
-		viewResolver.setPrefix(prefix);
-		viewResolver.setSuffix(suffix);
-		viewResolver.setApplicationContext(ctx);
-
-		AbstractJasperReportsView view =
-				(AbstractJasperReportsView) viewResolver.resolveViewName(viewName, Locale.ENGLISH);
-		assertNotNull("View should not be null", view);
-		assertEquals("Incorrect URL", prefix + viewName + suffix, view.getUrl());
-	}
-
-	public void testSetIncorrectViewClass() {
-		try {
-			new JasperReportsViewResolver().setViewClass(VelocityView.class);
-			fail("Should not be able to set view class to a class that does not extend AbstractJasperReportsView");
-		}
-		catch (IllegalArgumentException ex) {
-			// success
-		}
-	}
-
-	public void testWithViewNamesAndEndsWithPattern() throws Exception {
-		doViewNamesTest(new String[]{"DataSource*"});
-	}
-
-	public void testWithViewNamesAndStartsWithPattern() throws Exception {
-		doViewNamesTest(new String[]{"*Report"});
-	}
-
-	public void testWithViewNamesAndStatic() throws Exception {
-		doViewNamesTest(new String[]{"DataSourceReport"});
-	}
-
-	private void doViewNamesTest(String[] viewNames) throws Exception {
-		 StaticApplicationContext ctx = new StaticApplicationContext();
-
-		String prefix = "org/springframework/ui/jasperreports/";
-		String suffix = ".jasper";
-		String viewName = "DataSourceReport";
-
-		JasperReportsViewResolver viewResolver = new JasperReportsViewResolver();
-		viewResolver.setViewClass(JasperReportsHtmlView.class);
-		viewResolver.setPrefix(prefix);
-		viewResolver.setSuffix(suffix);
-		viewResolver.setViewNames(viewNames);
-		viewResolver.setApplicationContext(ctx);
-
-		AbstractJasperReportsView view =
-				(AbstractJasperReportsView) viewResolver.resolveViewName(viewName, Locale.ENGLISH);
-		assertNotNull("View should not be null", view);
-		assertEquals("Incorrect URL", prefix + viewName + suffix, view.getUrl());
-		assertNull(viewResolver.resolveViewName("foo", Locale.ENGLISH));
-	}
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java
deleted file mode 100644
index 88d83e4fcb..0000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.view.jasperreports;
-
-import net.sf.jasperreports.engine.export.JRHtmlExporterParameter;
-
-import org.springframework.beans.factory.support.BeanDefinitionReader;
-import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.mock.web.test.MockServletContext;
-import org.springframework.web.context.support.GenericWebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
-
-/**
- * @author Rob Harrop
- */
-public class JasperReportsHtmlViewTests extends AbstractJasperReportsViewTests {
-
-	@Override
-	protected AbstractJasperReportsView getViewImplementation() {
-		return new JasperReportsHtmlView();
-	}
-
-	@Override
-	protected String getDesiredContentType() {
-		return "text/html";
-	}
-
-	public void testConfigureExporterParametersWithEncodingFromPropertiesFile() throws Exception {
-		GenericWebApplicationContext ac = new GenericWebApplicationContext();
-		ac.setServletContext(new MockServletContext());
-		BeanDefinitionReader reader = new PropertiesBeanDefinitionReader(ac);
-		reader.loadBeanDefinitions(new ClassPathResource("view.properties", getClass()));
-		ac.refresh();
-
-		AbstractJasperReportsView view = (AbstractJasperReportsView) ac.getBean("report");
-		String encoding = (String) view.getConvertedExporterParameters().get(JRHtmlExporterParameter.CHARACTER_ENCODING);
-		assertEquals("UTF-8", encoding);
-
-		request.setAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE, ac);
-		view.render(getModel(), request, response);
-		assertEquals("Response content type is incorrect", "text/html;charset=UTF-8", response.getContentType());
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java
deleted file mode 100644
index bbb12663c2..0000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.view.jasperreports;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.jasperreports.engine.JasperPrint;
-
-/**
- * @author Rob Harrop
- * @author Juergen Hoeller
- */
-public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsViewTests {
-
-	@Override
-	protected void extendModel(Map<String, Object> model) {
-		model.put(getDiscriminatorKey(), "csv");
-	}
-
-	public void testSimpleHtmlRender() throws Exception {
-		if (!canCompileReport) {
-			return;
-		}
-
-		AbstractJasperReportsView view = getView(UNCOMPILED_REPORT);
-
-		Map<String, Object> model = getBaseModel();
-		model.put(getDiscriminatorKey(), "html");
-
-		view.render(model, request, response);
-
-		assertEquals("Invalid content type", "text/html", response.getContentType());
-	}
-
-	@Override
-	public void testOverrideContentDisposition() throws Exception {
-		if (!canCompileReport) {
-			return;
-		}
-
-		AbstractJasperReportsView view = getView(UNCOMPILED_REPORT);
-
-		Map<String, Object> model = getBaseModel();
-		model.put(getDiscriminatorKey(), "csv");
-
-		String headerValue = "inline; filename=foo.txt";
-
-		Properties mappings = new Properties();
-		mappings.put("csv", headerValue);
-
-		((JasperReportsMultiFormatView) view).setContentDispositionMappings(mappings);
-
-		view.render(model, request, response);
-
-		assertEquals("Invalid Content-Disposition header value", headerValue,
-				response.getHeader("Content-Disposition"));
-	}
-
-	public void testExporterParametersAreCarriedAcross() throws Exception {
-		if (!canCompileReport) {
-			return;
-		}
-
-		JasperReportsMultiFormatView view = (JasperReportsMultiFormatView) getView(UNCOMPILED_REPORT);
-
-		Map<String, Class<? extends AbstractJasperReportsView>> mappings =
-				new HashMap<String, Class<? extends AbstractJasperReportsView>>();
-		mappings.put("test", ExporterParameterTestView.class);
-
-		Map<String, String> exporterParameters = new HashMap<String, String>();
-
-		// test view class performs the assertions - robh
-		exporterParameters.put(ExporterParameterTestView.TEST_PARAM, "foo");
-
-		view.setExporterParameters(exporterParameters);
-		view.setFormatMappings(mappings);
-		view.initApplicationContext();
-
-		Map<String, Object> model = getBaseModel();
-		model.put(getDiscriminatorKey(), "test");
-
-		view.render(model, request, response);
-	}
-
-	protected String getDiscriminatorKey() {
-		return "format";
-	}
-
-	@Override
-	protected AbstractJasperReportsView getViewImplementation() {
-		return new JasperReportsMultiFormatView();
-	}
-
-	@Override
-	protected String getDesiredContentType() {
-		return "text/csv";
-	}
-
-	private Map<String, Object> getBaseModel() {
-		Map<String, Object> model = new HashMap<String, Object>();
-		model.put("ReportTitle", "Foo");
-		model.put("dataSource", getData());
-		return model;
-	}
-
-
-	public static class ExporterParameterTestView extends AbstractJasperReportsView {
-
-		public static final String TEST_PARAM = "net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI";
-
-		@Override
-		protected void renderReport(JasperPrint filledReport, Map parameters, HttpServletResponse response) {
-			assertNotNull("Exporter parameters are null", getExporterParameters());
-			assertEquals("Incorrect number of exporter parameters", 1, getExporterParameters().size());
-		}
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java
deleted file mode 100644
index 0ad16202a3..0000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.view.jasperreports;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Rob Harrop
- * @author Juergen Hoeller
- */
-public class JasperReportsMultiFormatViewWithCustomMappingsTests extends JasperReportsMultiFormatViewTests {
-
-	@Override
-	protected AbstractJasperReportsView getViewImplementation() {
-		JasperReportsMultiFormatView view = new JasperReportsMultiFormatView();
-		view.setFormatKey("fmt");
-		Map<String, Class<? extends AbstractJasperReportsView>> mappings =
-				new HashMap<String, Class<? extends AbstractJasperReportsView>>();
-		mappings.put("csv", JasperReportsCsvView.class);
-		mappings.put("comma-separated", JasperReportsCsvView.class);
-		mappings.put("html", JasperReportsHtmlView.class);
-		view.setFormatMappings(mappings);
-		return view;
-	}
-
-	@Override
-	protected String getDiscriminatorKey() {
-		return "fmt";
-	}
-
-	@Override
-	protected void extendModel(Map<String, Object> model) {
-		model.put(getDiscriminatorKey(), "comma-separated");
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/view.properties b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/view.properties
deleted file mode 100644
index b7df658ab0..0000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/view.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-report.(class)=org.springframework.web.servlet.view.jasperreports.JasperReportsHtmlView
-report.url=/org/springframework/ui/jasperreports/DataSourceReport.jasper
-report.exporterParameters[net.sf.jasperreports.engine.export.JRHtmlExporterParameter.CHARACTER_ENCODING]=UTF-8
-report.exporterParameters[net.sf.jasperreports.engine.JRExporterParameter.PAGE_INDEX]=0
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJacksonJsonViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJacksonJsonViewTests.java
index 1e2f9eda5e..b79b963ee6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJacksonJsonViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJacksonJsonViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import java.util.Set;
 
 import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.map.BeanProperty;
 import org.codehaus.jackson.map.JsonSerializer;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializationConfig;
@@ -31,18 +32,20 @@
 import org.codehaus.jackson.map.SerializerProvider;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.codehaus.jackson.map.ser.BeanSerializerFactory;
+import org.codehaus.jackson.type.JavaType;
 import org.junit.Before;
 import org.junit.Test;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.ContextFactory;
 import org.mozilla.javascript.ScriptableObject;
+
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.BindingResult;
 
 import static org.junit.Assert.*;
-import static org.mockito.BDDMockito.*;
+import static org.mockito.Mockito.*;
 
 /**
  * @author Jeremy Grelle
@@ -60,17 +63,17 @@ public class MappingJacksonJsonViewTests {
 
 	private ScriptableObject jsScope;
 
+
 	@Before
 	public void setUp() {
 		request = new MockHttpServletRequest();
 		response = new MockHttpServletResponse();
-
 		jsContext = ContextFactory.getGlobal().enterContext();
 		jsScope = jsContext.initStandardObjects();
-
 		view = new MappingJacksonJsonView();
 	}
 
+
 	@Test
 	public void isExposePathVars() {
 		assertEquals("Must not expose path variables", false, view.isExposePathVariables());
@@ -78,7 +81,6 @@ public void isExposePathVars() {
 
 	@Test
 	public void renderSimpleMap() throws Exception {
-
 		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("bindingResult", mock(BindingResult.class, "binding_result"));
 		model.put("foo", "bar");
@@ -89,13 +91,11 @@ public void renderSimpleMap() throws Exception {
 		assertEquals("no-cache", response.getHeader("Pragma"));
 		assertEquals("no-cache, no-store, max-age=0", response.getHeader("Cache-Control"));
 		assertNotNull(response.getHeader("Expires"));
-
 		assertEquals(MappingJacksonJsonView.DEFAULT_CONTENT_TYPE, response.getContentType());
 
 		String jsonResult = response.getContentAsString();
 		assertTrue(jsonResult.length() > 0);
 		assertEquals(jsonResult.length(), response.getContentLength());
-
 		validateResult();
 	}
 
@@ -106,7 +106,6 @@ public void renderCaching() throws Exception {
 		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("bindingResult", mock(BindingResult.class, "binding_result"));
 		model.put("foo", "bar");
-
 		view.render(model, request, response);
 
 		assertNull(response.getHeader("Pragma"));
@@ -122,61 +121,58 @@ public void renderSimpleMapPrefixed() throws Exception {
 
 	@Test
 	public void renderSimpleBean() throws Exception {
-
 		Object bean = new TestBeanSimple();
 		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("bindingResult", mock(BindingResult.class, "binding_result"));
 		model.put("foo", bean);
-
 		view.setUpdateContentLength(true);
 		view.render(model, request, response);
 
 		assertTrue(response.getContentAsString().length() > 0);
 		assertEquals(response.getContentAsString().length(), response.getContentLength());
-
 		validateResult();
 	}
 
 	@Test
 	public void renderWithPrettyPrint() throws Exception {
-
 		ModelMap model = new ModelMap("foo", new TestBeanSimple());
-
 		view.setPrettyPrint(true);
 		view.render(model, request, response);
 
 		String result = response.getContentAsString().replace("\r\n", "\n");
 		assertTrue("Pretty printing not applied:\n" + result, result.startsWith("{\n  \"foo\" : {\n    "));
-
 		validateResult();
 	}
 
 	@Test
 	public void renderSimpleBeanPrefixed() throws Exception {
-
 		view.setPrefixJson(true);
 		renderSimpleBean();
+		assertTrue(response.getContentAsString().startsWith("{} && "));
 	}
 
 	@Test
-	public void renderWithCustomSerializerLocatedByAnnotation() throws Exception {
+	public void renderSimpleBeanNotPrefixed() throws Exception {
+		view.setPrefixJson(false);
+		renderSimpleBean();
+		assertFalse(response.getContentAsString().startsWith("{} && "));
+	}
 
+	@Test
+	public void renderWithCustomSerializerLocatedByAnnotation() throws Exception {
 		Object bean = new TestBeanSimpleAnnotated();
 		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("foo", bean);
-
 		view.render(model, request, response);
 
 		assertTrue(response.getContentAsString().length() > 0);
 		assertEquals("{\"foo\":{\"testBeanSimple\":\"custom\"}}", response.getContentAsString());
-
 		validateResult();
 	}
 
 	@Test
 	public void renderWithCustomSerializerLocatedByFactory() throws Exception {
-
-		SerializerFactory factory = new DelegatingSerializerFactory();
+		SerializerFactory factory = new DelegatingSerializerFactory(null);
 		ObjectMapper mapper = new ObjectMapper();
 		mapper.setSerializerFactory(factory);
 		view.setObjectMapper(mapper);
@@ -185,19 +181,16 @@ public void renderWithCustomSerializerLocatedByFactory() throws Exception {
 		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("foo", bean);
 		model.put("bar", new TestChildBean());
-
 		view.render(model, request, response);
 
 		String result = response.getContentAsString();
 		assertTrue(result.length() > 0);
 		assertTrue(result.contains("\"foo\":{\"testBeanSimple\":\"custom\"}"));
-
 		validateResult();
 	}
 
 	@Test
 	public void renderOnlyIncludedAttributes() throws Exception {
-
 		Set<String> attrs = new HashSet<String>();
 		attrs.add("foo");
 		attrs.add("baz");
@@ -208,14 +201,12 @@ public void renderOnlyIncludedAttributes() throws Exception {
 		model.put("foo", "foo");
 		model.put("bar", "bar");
 		model.put("baz", "baz");
-
 		view.render(model, request, response);
 
 		String result = response.getContentAsString();
 		assertTrue(result.length() > 0);
 		assertTrue(result.contains("\"foo\":\"foo\""));
 		assertTrue(result.contains("\"baz\":\"baz\""));
-
 		validateResult();
 	}
 
@@ -226,7 +217,6 @@ public void filterSingleKeyModel() throws Exception {
 		Map<String, Object> model = new HashMap<String, Object>();
 		TestBeanSimple bean = new TestBeanSimple();
 		model.put("foo", bean);
-
 		Object actual = view.filterModel(model);
 
 		assertSame(bean, actual);
@@ -288,11 +278,12 @@ public TestChildBean getChild() {
 		}
 	}
 
-	@JsonSerialize(using=TestBeanSimpleSerializer.class)
-	public static class TestBeanSimpleAnnotated extends TestBeanSimple {
 
+	@JsonSerialize(using = TestBeanSimpleSerializer.class)
+	public static class TestBeanSimpleAnnotated extends TestBeanSimple {
 	}
 
+
 	public static class TestChildBean {
 
 		private String value = "bar";
@@ -318,12 +309,11 @@ public void setParent(TestBeanSimple parent) {
 		}
 	}
 
-	public static class TestBeanSimpleSerializer extends JsonSerializer<TestBeanSimple> {
 
-		@Override
-		public void serialize(TestBeanSimple value, JsonGenerator jgen, SerializerProvider provider)
-				throws IOException {
+	public static class TestBeanSimpleSerializer extends JsonSerializer<Object> {
 
+		@Override
+		public void serialize(Object value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
 			jgen.writeStartObject();
 			jgen.writeFieldName("testBeanSimple");
 			jgen.writeString("custom");
@@ -332,19 +322,22 @@ public void serialize(TestBeanSimple value, JsonGenerator jgen, SerializerProvid
 		}
 	}
 
-	public static class DelegatingSerializerFactory extends SerializerFactory {
 
-		private SerializerFactory delegate = BeanSerializerFactory.instance;
+	public static class DelegatingSerializerFactory extends BeanSerializerFactory {
+
+		public DelegatingSerializerFactory(Config config) {
+			super(config);
+		}
 
 		@Override
-		@SuppressWarnings("unchecked")
-		public <T> JsonSerializer<T> createSerializer(Class<T> type, SerializationConfig config) {
-			if (type == TestBeanSimple.class) {
-				return (JsonSerializer<T>) new TestBeanSimpleSerializer();
+		public JsonSerializer<Object> createSerializer(SerializationConfig config, JavaType baseType, BeanProperty property) {
+			if (baseType.getRawClass() == TestBeanSimple.class) {
+				return new TestBeanSimpleSerializer();
 			}
 			else {
-				return delegate.createSerializer(type, config);
+				return super.createSerializer(config, baseType, property);
 			}
 		}
 	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java
index d17372979a..a018949908 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ public class TilesConfigurerTests {
 	public void simpleBootstrap() {
 		MockServletContext sc = new MockServletContext();
 		TilesConfigurer tc = new TilesConfigurer();
-		tc.setDefinitions(new String[] {"/org/springframework/web/servlet/view/tiles2/tiles-definitions.xml"});
+		tc.setDefinitions("/org/springframework/web/servlet/view/tiles2/tiles-definitions.xml");
 		tc.setCheckRefresh(true);
 		tc.setServletContext(sc);
 		tc.afterPropertiesSet();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java
index 04c8497df3..d79048789f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
@@ -27,10 +26,10 @@
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.context.Context;
 
-import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.mock.web.test.MockServletContext;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.support.StaticWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
@@ -94,7 +93,7 @@ protected void mergeTemplate(Template template, Context context, HttpServletResp
 		vv.setApplicationContext(wac);
 		vv.setExposeSpringMacroHelpers(true);
 
-		Map model = new HashMap();
+		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("tb", new TestBean("juergen", 99));
 		vv.render(model, request, response);
 	}
@@ -112,7 +111,7 @@ protected void mergeTemplate(Template template, Context context, HttpServletResp
 		vv.setApplicationContext(wac);
 		vv.setExposeSpringMacroHelpers(true);
 
-		Map model = new HashMap();
+		Map<String, Object> model = new HashMap<String, Object>();
 		model.put(VelocityView.SPRING_MACRO_REQUEST_CONTEXT_ATTRIBUTE, helperTool);
 
 		try {
@@ -126,11 +125,11 @@ protected void mergeTemplate(Template template, Context context, HttpServletResp
 
 	public void testAllMacros() throws Exception {
 		DummyMacroRequestContext rc = new DummyMacroRequestContext(request);
-		Map msgMap = new HashMap();
+		Map<String, String> msgMap = new HashMap<String, String>();
 		msgMap.put("hello", "Howdy");
 		msgMap.put("world", "Mundo");
 		rc.setMessageMap(msgMap);
-		Map themeMsgMap = new HashMap();
+		Map<String, String> themeMsgMap = new HashMap<String, String>();
 		themeMsgMap.put("hello", "Howdy!");
 		themeMsgMap.put("world", "Mundo!");
 		rc.setThemeMessageMap(themeMsgMap);
@@ -138,9 +137,10 @@ public void testAllMacros() throws Exception {
 
 		TestBean tb = new TestBean("Darren", 99);
 		tb.setJedi(true);
+		tb.setStringArray(new String[] {"John", "Fred"});
 		request.setAttribute("command", tb);
 
-		HashMap names = new HashMap();
+		Map<String, String> names = new HashMap<String, String>();
 		names.put("Darren", "Darren Davison");
 		names.put("John", "John Doe");
 		names.put("Fred", "Fred Bloggs");
@@ -149,7 +149,7 @@ public void testAllMacros() throws Exception {
 		vc.setPreferFileSystemAccess(false);
 		VelocityEngine ve = vc.createVelocityEngine();
 
-		Map model = new HashMap();
+		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("command", tb);
 		model.put("springMacroRequestContext", rc);
 		model.put("nameOptionMap", names);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/test.vm b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/test.vm
index 401b74134a..e125e5efed 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/test.vm
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/test.vm
@@ -45,7 +45,7 @@ FORM7
 #springFormRadioButtons("command.name" $nameOptionMap " " "")
 
 FORM8
-#springFormCheckboxes("command.spouses" $nameOptionMap " " "")
+#springFormCheckboxes("command.stringArray" $nameOptionMap " " "")
 
 FORM9
 #springFormPasswordInput("command.name" "")
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
index 6b767c7f78..1c1d3a9978 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MarshallingViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,16 +17,19 @@
 package org.springframework.web.servlet.view.xml;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
-
 import javax.servlet.ServletException;
 import javax.xml.transform.stream.StreamResult;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.oxm.Marshaller;
+import org.springframework.validation.BeanPropertyBindingResult;
+import org.springframework.validation.BindingResult;
 
 import static org.junit.Assert.*;
 import static org.mockito.BDDMockito.*;
@@ -36,9 +39,10 @@
  */
 public class MarshallingViewTests {
 
+	private Marshaller marshallerMock;
+
 	private MarshallingView view;
 
-	private Marshaller marshallerMock;
 
 	@Before
 	public void createView() throws Exception {
@@ -46,6 +50,7 @@ public void createView() throws Exception {
 		view = new MarshallingView(marshallerMock);
 	}
 
+
 	@Test
 	public void getContentType() {
 		assertEquals("Invalid content type", "application/xml", view.getContentType());
@@ -160,6 +165,26 @@ public void renderNoModelKey() throws Exception {
 		verify(marshallerMock).marshal(eq(toBeMarshalled), isA(StreamResult.class));
 	}
 
+	@Test
+	public void renderNoModelKeyAndBindingResultFirst() throws Exception {
+		Object toBeMarshalled = new Object();
+		String modelKey = "key";
+		Map<String, Object> model = new LinkedHashMap<String, Object>();
+		model.put(BindingResult.MODEL_KEY_PREFIX + modelKey, new BeanPropertyBindingResult(toBeMarshalled, modelKey));
+		model.put(modelKey, toBeMarshalled);
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		given(marshallerMock.supports(BeanPropertyBindingResult.class)).willReturn(true);
+		given(marshallerMock.supports(Object.class)).willReturn(true);
+
+		view.render(model, request, response);
+		assertEquals("Invalid content type", "application/xml", response.getContentType());
+		assertEquals("Invalid content length", 0, response.getContentLength());
+		verify(marshallerMock).marshal(eq(toBeMarshalled), isA(StreamResult.class));
+	}
+
 	@Test
 	public void testRenderUnsupportedModel() throws Exception {
 		Object toBeMarshalled = new Object();
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml
index 910b765ea8..6efe9e1557 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator.xml
@@ -3,9 +3,10 @@
     xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
 
-	<mvc:annotation-driven validator="validator" ignoreDefaultModelOnRedirect="true" />
+	<mvc:annotation-driven validator="validator" 
+		ignoreDefaultModelOnRedirect="true" enableMatrixVariables="true" />
 	
 	<bean id="validator" class="org.springframework.web.servlet.config.MvcNamespaceTests$TestValidator" />
 	
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching-mappings.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching-mappings.xml
new file mode 100644
index 0000000000..875672b2f4
--- /dev/null
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching-mappings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+    <mvc:resources mapping="/resources/**" location="/, classpath:/META-INF/" />
+
+    <mvc:annotation-driven>
+        <mvc:path-matching
+                path-helper="pathHelper"
+                path-matcher="pathMatcher" />
+    </mvc:annotation-driven>
+
+    <mvc:view-controller path="/" view-name="home"/>
+    <mvc:view-controller path="/test" view-name="test"/>
+
+    <bean id="pathMatcher" class="org.springframework.web.servlet.config.MvcNamespaceTests$TestPathMatcher" />
+    <bean id="pathHelper" class="org.springframework.web.servlet.config.MvcNamespaceTests$TestPathHelper" />
+
+</beans>
\ No newline at end of file
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching.xml
new file mode 100644
index 0000000000..8b27fa26f5
--- /dev/null
+++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+    <mvc:annotation-driven content-negotiation-manager="contentNegotiationManager">
+        <mvc:path-matching
+                suffix-pattern="true"
+                trailing-slash="false"
+                registered-suffixes-only="true"
+                path-helper="pathHelper"
+                path-matcher="pathMatcher" />
+    </mvc:annotation-driven>
+
+    <bean id="pathMatcher" class="org.springframework.web.servlet.config.TestPathMatcher" />
+    <bean id="pathHelper" class="org.springframework.web.servlet.config.TestPathHelper" />
+    <bean id="contentNegotiationManager" class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
+        <property name="mediaTypes">
+            <value>
+                xml=application/rss+xml
+            </value>
+        </property>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/src/dist/changelog.txt b/src/dist/changelog.txt
index f5ba5b533c..563dbfa711 100644
--- a/src/dist/changelog.txt
+++ b/src/dist/changelog.txt
@@ -1,15 +1,434 @@
 SPRING FRAMEWORK CHANGELOG
 ===========================
-http://www.springsource.org
+http://www.spring.io
 
+Changes in version 3.2.18 (2016-12-21)
+-------------------------------------
+fixed Constructor sets the source incorrectly in org.springframework.beans.PropertyValue (SPR-8337)
+fixed ObjectToObjectConverter should be able to use constructors on non-public classes (SPR-14304)
+fixed Async advisor retrieval blocks when triggered by singleton init method (SPR-14324)
+fixed Deadlock while creating a new thread on bean initialization with transactional code invocation (SPR-14388)
+fixed CronSequenceGenerator causes StackOverflowError with reversed range values (SPR-14462)
+fixed Ineffective synchronization in StandardTypeConverter constructor (SPR-14465)
+fixed ResourcePatternUtils.getResourcePatternResolver does not accept null arg (SPR-14500)
+fixed LinkedCaseInsensitiveMap doesn't override HashMap.clone() (SPR-14509)
+fixed StackOverflowError for advisor search against factory-bean reference to FactoryBean (SPR-14551)
+fixed StringUtils.parseLocaleString(): does not parse locale string in java 7 for Serbian (Latin) (SPR-14718)
+fixed Concurrency problem in DeferredResult: potential double execution of handleResult (SPR-14978)
+fixed MBeanExporter fails against null beans (SPR-15031)
+improved ModelAndViewResolver still refers to raw Class type (SPR-7860)
+improved Allow method inlining of ObjectUtils.nullSafeEquals() (SPR-14349)
+improved Normalize resource URL in ResourceServlet (SPR-14946)
+improved documentation for @Bean(autowire=NO) (SPR-14282)
+improved documentation Label "for" attribute is wrongly documented as required (SPR-14287)
+improved documentation of SpEL behavior when comparing value to null (SPR-14361) 
+improved documentation of cache abstraction (SPR-14399)
+improved documentation og SpEL and Date Literals (SPR-14987)
+
+
+Changes in version 3.2.17 (2016-05-06)
+-------------------------------------
+fixed AbstractRequestLoggingFilter appends null query string (SPR-14244)
+fixed Deadlock possible with AspectJ aspects and multi-threading (SPR-14241)
+fixed NPE thrown when calling methods with an empty @Caching annotation (SPR-14162)
+fixed @RequestHeader HttpHeaders fails with NPE against null header value (SPR-14091)
+fixed ModelAndView is replaced when a RedirectView is used (SPR-14045)
+fixed Scripted beans not updated after a script compilation error in getScriptedObjectType (SPR-14007)
+fixed TimerManagerTaskScheduler.TimerScheduledFuture.getDelay is inverted (SPR-13977)
+fixed AbstractMarshaller's DocumentBuilderFactory instance may be used by several threads simultaneously (SPR-13935)
+fixed ReflectiveMethodResolver chooses parent class over child for static methods (SPR-13918)
+fixed NullPointerException while building error message in InvocableHandlerMethod (SPR-13917)
+fixed Handle RejectedExecutionException in WebAsyncManager (SPR-13836)
+improved MVC config path config options (SPR-14186)
+improved local resolution of Quartz XSD (SPR-13706)
+improved SimpleTriggerFactoryBean and CronTriggerFactoryBean usage without jobDetail (SPR-13604)
+improved XML example javadoc of @EnableScheduling (SPR-14145)
+improved documentation example of MessageSource (SPR-14003)
+improved documentation of ResponseEntityExceptionHandler.handleExceptionInternal (SPR-13869)
+improved documentation at section 17.4 Handler mappings (SPR-13832)
+
+
+Changes in version 3.2.16 (2015-12-17)
+-------------------------------------
+
+fixed Jdbc4SqlXmlHandler should return null instead of NPE (SPR-13782)
+fixed AbstractApplicationContext.isRunning throws IllegalStateException when called too early (SPR-13667)
+fixed CommonsMultipartFile.getOriginalFilename() does not strip file path properly (SPR-13662)
+fixed Content-Disposition added for @ResponseBody methods explicitly mapped to ".html" or other extensions (SPR-13629)
+fixed AbstractJdbcCall's compiled variable should be declared as volatile (SPR-13617)
+fixed Content-Disposition header causes download in browser for Spring Boot Actuator endpoints (SPR-13587)
+improved support for Microsoft SQL Server driver version 4 and above (SPR-13772)
+improved BeanFactoryAnnotationUtils.qualifiedBeanOfType should not instantiate all beans of given type before checking qualifier (SPR-13741)
+improved BeansException warn logging after startup failure (SPR-13663)
+improved Content-Disposition with fixed file name "f.txt" so that it's less confusing (SPR-13643)
+improved CallMetaDataContext to avoid NPE for anonymous SqlParameter (SPR-13628)
+improved Content-Disposition header to be skipped when status != 2xx (SPR-13588)
+improved documentation of Jackson2ObjectMapperFactoryBean (SPR-13765)
+improved fix cron trigger example in reference documentation (SPR-10474)
+
+
+Changes in version 3.2.15 (2015-10-15)
+-------------------------------------
+
+protect against RFD exploits, see http://pivotal.io/security/cve-2015-5211 (SPR-13548)
+fixed whether HttpInputMessage.getBody() is allowed to return null (SPR-13563)
+fixed JCacheCache doesn't recognize null values in other JVMs (SPR-13553)
+fixed AbstractEmbeddedDatabaseConfigurer.shutdown does not close JDBC resources (SPR-13474)
+fixed DeferredResult not thread-safe for isSetOrExpired call (SPR-13451)
+fixed ConcurrentModificationException when doing a merge on AbstractEnvironment (SPR-13213)
+avoid ambiguous property warning for setter methods with multiple parameters (SPR-13349)
+improved documentation of ContentNegotiationManager reference in MVC chapter (SPR-13558)
+improved documentation on readonly and disabled flags in spring-form.tld (SPR-13397)
+improved documentation of AUTO_ACKNOWLEDGE semantics with SimpleMessageListenerContainer (SPR-13278)
+
+
+Changes in version 3.2.14 (2015-06-30)
+-------------------------------------
+
+fixed disable DTD by default when parsing untrusted XML input (SPR-13136)
+fixed remoting over JMS with receiveTimeout blocks service forever (SPR-13052)
+fixed NPE when using @args as pointcut (SPR-13102)
+fixed NPE for alias resolved to null in SimpleAliasRegistry (SPR-13106)
+fixed NPE if CustomBooleanEditor is configured with allowEmpty=false (SPR-13010)
+fixed infinite loop in PatternMatchUtils (SPR-12971)
+fixed infinite loop when CronSequenceGenerator constructor is called with invalid increments (SPR-12871)
+fixed incorrect value in InvalidPropertyException message from BeanWrapperImpl.setPropertyValue (SPR-12866)
+fixed SpEL chooses wrong method to invoke when varargs method is present (SPR-12803)
+fixed StandardMultipartHttpServletRequest.StandardMultipartFile not serializable (SPR-12975)
+fixed EncodedResource does not include charset in equals() implementation (SPR-12767)
+fixed Specified MVC resource at root level not considered "under location" (SPR-12747)
+fixed deadlock publishing event while creating listener bean (SPR-12739)
+fixed NPE in ServletUriComponentsBuilder#initFromRequest (SPR-12723)
+fixed @Scheduled handling with multiple proxied target classes implementing the same interface (SPR-12709)
+upgraded to ASM 5.0.4 (SPR-13039)
+improved documentation of Lifecycle callbacks (SPR-12855)
+improved documentation of null handling in Converter (SPR-12870)
+improved documentation of acknowledgment modes (SPR-12705)
+improved javadoc of ModelAttributeMethodProcessor.validateIfApplicable (SPR-12655)
+improved documentation of SimpleJdbcInsert (SPR-12639)
+
+
+Changes in version 3.2.13 (2014-12-30)
+-------------------------------------
+
+fixed Java 8 bridge method handling can lead to false positive detection of autowired annotations (SPR-12187)
+fixed webjar stops working (SPR-12432)
+fixed introspection with BeanUtils started failing against java.awt.Window (SPR-12434)
+fixed embedded derby database uses derby.log (SPR-12437)
+fixed use of the same configuration annotation of javaconfig (SPR-12442)
+fixed NPE in org.springframework.core.MethodParameter.getParameterName (SPR-12453)
+fixed unable to initialize WebAsyncTask with executorName (SPR-12457)
+fixed problem with static methods conflicting with instance methods (SPR-12502)
+fixed prototype with changing bean class does not get populated with dependencies after type switch (SPR-12526)
+fixed hashCode method of AbstractFallbackTransactionAttributeSource.DefaultCacheKey doesn't take targetClass into account (SPR-12536)
+fixed AbstractApplicationEventMulticaster "lost" application listener (SPR-12545)
+fixed duplicated interceptors in HandlerExecutionChain after intermediate getInterceptors() call (SPR-12566)
+update consistent bridge method handling in annotation post-processors (SPR-12495)
+improved misleading documentation for SqlRowSet (SPR-12476)
+improved documentation after SPR-3542 (SPR-12570)
+
+Changes in version 3.2.12 (2014-11-11)
+-------------------------------------
+
+fixed directory traversal with static resource handling (CVE-2014-3625) (SPR-12354)
+log context cache statistics in the TestContext framework (SPR-12409)
+fixed ConfigurationClassUtils fails to introspect inner classes with dot name syntax (SPR-12390)
+fixed ResponseStatusExceptionResolver does not get a MessageSource injected in the MVC Java config (SPR-12380)
+fixed NPE inTilesConfigurer when no definitions found (SPR-12363)
+fixed @Import in another annotation results in double scan (SPR-12334)
+fixed private @Scheduled methods end up on 'empty' proxy instance in case of CGLIB auto-proxying (SPR-12308)
+fixed Provider<...> declaration for @Value method argument fails with TypeMismatchException (SPR-12297)
+fixed DataSourceTransactionManager closes JDBC connection on doBegin failure but leaves it attached to transaction object (SPR-12280)
+fixed web Async responses force concurrentResult.toString() call (SPR-12253)
+fixed LiveBeansView.generateJson generates invalid JSON when resources already double-quoted (SPR-12252)
+allow for further locking optimizations for the retrieval of non-singleton beans (SPR-12250)
+improved error messages for MockRestServiceServer (SPR-12230)
+allow spring HTTP clients to enforce RFC 6265 (cookies in a single header) (SPR-12196)
+fixed @Qualifier resolution with Spring Batch parent/child context arrangement (SPR-12191)
+improved Scheduled/JmsListenerAnnotationBeanPostProcessor to not scan every scoped instance (SPR-12189)
+fixed HttpHeaders should accept empty Content-Type header (SPR-12173)
+add log warning for single optional constructor when no default constructor to fall back to (SPR-12161)
+fixed util:map does not recognize the attribute of value-type (SPR-10994)
+removed outdated ContextLoaderServlet from the documentation reference (SPR-7725)
+
+Changes in version 3.2.11 (2014-09-04)
+-------------------------------------
 
-Changes in version 3.2.3 (2013-05-02)
+fixed cachingConnectionFactory should catch exceptions on logical close (SPR-12148)
+allow Cache.get(Object key, Class<T> type) to be more explicit about what to do in case of a type mismatch (SPR-12145)
+fixed plain FactoryBean declaration on @Bean method leads to early call (pre injection) (SPR-12141)
+fixed performance issue on ResolvableType cache (SPR-12122)
+fixed GuavaCacheManager ignores cache specification due to eager initialization of internal cache map with static cache names (SPR-12120)
+fixed mockMvc security filters causes FileUploadException: the request was rejected because no multipart boundary was found (SPR-12114)
+fixed ServerEndpointExporter causes application context refresh to fail with an NPE when used in a Spring Boot app (SPR-12109)
+update Apache HttpComponents to 4.3.5 - CVE-2014-3577: Apache HttpComponents client: Hostname verification susceptible to MITM attack (SPR-12100)
+fixed shallowEtagHeaderFilter doesn't support Servlet 3.1 setContentLengthLong (SPR-12097)
+exclude spring-framework-bom artifacts from release distributions (SPR-12087)
+include all source artifacts in published sources jars (SPR-12085)
+fixed BeanNameViewResolver should not try to use non-View beans (SPR-12079)
+updated tiles 3 TilesViewResolver to accept custom TilesView subclasses (SPR-12075)
+fixed includeFilters and excludeFilters of @ComponentScan cause failures when used in meta-annotations (SPR-12065)
+allow AbstractTypeHierarchyTraversingFilter to be more lenient when loading types (SPR-12042)
+fixed incorrect documentation for AbstractAnnotationConfigDispatcherServletInitializer.getServletConfigClasses() (SPR-12028)
+fixed ConcurrentMapCacheManager has interdependent setters (SPR-12026)
+fixed documentation typo (SPR-12020)
+fixed Spring may invoke @Bean methods too early in case of a circular reference (SPR-12018)
+fixed RestTemplate with InputStreamResource does not work if Content-Length is not set (SPR-12017)
+fixed AbstractMessageListenerContainer#doExecuteListener can cause a dropped message if using CLIENT_ACKNOWLEDGE and the container is stopped and subsequently started again. (SPR-12015)
+fixed exceptions thrown during AbstractApplicationContext.refresh() not being logged right when they are caught (SPR-12010)
+fixed changes to AbstractApplicationEventMulticaster in 3.2.9 break HttpSessionEventPublisher in Google AppEngine Runtime (SPR-12002)
+fixed NPE in SelectedValueComparator with null bound value (SPR-12001)
+fixed StaxStreamXMLReader ignores significant whitespace (SPR-12000)
+fixed user destinations docs are missing the brokerPrefix (SPR-11992)
+revert (SPR-11973) when bugfix verified in JDK 1.8.0_20 (SPR-11974)
+fixed UriComponentsBuilder.fromUriString may not parse correctly when there is no path (SPR-11970)
+fixed getBean(Object.class) fails when introspecting Environment bean (SPR-10542)
+fixed injecting EXTENDED @PersistenceContext into JUnit 4 test class causes NoSuchBeanDefinitionException (SPR-8834)
+fixed XmlBeanDefinitionReader runs 10x slower due to resetBeanDefinition check (SPR-8318)
+remove outdated IDE, JIRA and Tomcat references (SPR-7521)
+
+Changes in version 3.2.10 (2014-07-15)
 -------------------------------------
 
+restored backward compatibility in RestTemplate's messageConverters (SPR-11962)
+consistent declaration of private static final logger variables	(SPR-11905)
+fixed documentation links (SPR-11935)
+allow HttpHeaders to return getAllow() if it was previously set to an empty collection (SPR-11917)
+improved performance of ReflectionUtils.isCglibRenamedMethod	(SPR-11894)
+provide compatibility with Java 8 (SPR-11979, SPR-11889)
+fixed MBeanExportConfiguration.SpecificPlatform issue (SPR-11877)
+allow manually registered transaction manager to be recognized by qualifiedBeanOfType (SPR-11915)
+fixed misleading exception message for using JPA with custom IsolationLevels (SPR-8325)
+prevented Objects created by FactoryBeans from being processed multiple times by BeanPostProcessors if beans are created lazily (SPR-11937)
+fixed performance regression for custom autowireBean calls with many properties	(SPR-11875)
+fixed ReflectionUtils slow down application startup on WebSphere (SPR-11882)
+revisit class cache in CachedIntrospectionResults (SPR-11867)
+fixed JBoss EAP 5.1.1 VFS compatibility (SPR-11887)
+fixed various Portlet issues (SPR-11295, SPR-11816)
+removed shared state from URIComponentsBuilder across calls of .build() (SPR-11885)
+improved unclear error message on BeanPostProcessor returning null (SPR-11951)
+fixed isGlobalRollbackOnly always returns 'false' with WebSphereUOWTransactionManager (SPR-11876)
+
+
+Changes in version 3.2.9 (2014-05-20)
+-------------------------------------
+
+added basic Java 8 bytecode compatibility for Spring 3.2.x through ASM 5.0.2 (SPR-11656, SPR-11719)
+fixed potential excessive memory and CPU usage (SPR-11545, SPR-11520, SPR-11606, SPR-11720, SPR-9274)
+fixed cache key issues for methods with arguments of array types (SPR-11505)
+fixed FlashMap retrieval when target parameters are encoded (SPR-11504)
+fixed SpringBeanELResolver.setValue throws PropertyNotWritableException issue (SPR-11502)
+optimized handling of @Bean method override regression with return type narrowing on JDK 8 (SPR-11718)
+prevented double evaluation of method arguments in SpEL (SPR-11445)
+fixed reinjection of Servlet mocks into test instance between TestNG test methods (SPR-11626)
+fixed If-Modified-Since header is parsed as HTTP-date; but IE 10 sends length (SPR-11727)
+fixed unsafe fallback pointcut construction in AspectJExpressionPointcut (SPR-9335)
+updated UrlResource.exists() to properly detect JBoss vfszip resources (SPR-11676)
+fixed potential NPE with SpringProperties, ConstructorResolver and JRubyScriptUtils (SPR-11721, SPR-11517, SPR-11747)
+consider parent definitions with overriding bean definition message (SPR-9671(
+improved exception message for failed property access in SpEL (SPR-11535)
+fixed Spring MVC Test async result timing issue (SPR-11516)
+treat empty log config refresh interval as infinite interval in Log4jWebConfigurer (SPR-11507)
+improve CollectionToCollectionConverter.convert() for untyped collections (SPR-11479)
+fixed XmlValidationModeDetector length of a string is always greater than index of any of its characters (SPR-11477)
+improve memory consumption with MarshallingView (SPR-11646)
+fixed SpEL issues when working with Maps (SPR-11609, SPR-9861)
+add ResizableByteArrayOutputStream and ByteArrayOutputStream capacities (SPR-11594)
+logged Forging in DispatcherServlet via requestURI (SPR-11591)
+fixed BufferedImageHttpMessageConverter to no longer fail if JAI is installed (SPR-11581)
+updated AbstractMarshaller to avoid SAXSource workaround when processExternalEntities=true (SPR-11737)
+close Resource's input stream when using ResourceHttpRequestHandler (SPR-11644)
+consider proxy interfaces in AbstractAdvisingBeanPostProcessor.isEligible(...) (SPR-11725)
+protect against security exploits via system identifier in DTD declaration (SPR-11768)
+fixed Access Denied exception within Spring MVC application on WebSphere 8.x (SPR-11758)
+fixed servlet 3 multipart parameter binding on Weblogic12c (SPR-11074)
+updated ConfigurationClassParser.invokeAwareMethods(...) to consider EnvironmentAware (SPR-11744)
+fixed JDBC findColumn result in the case of duplicate column labels (SPR-11786)
+improved prefix detection in StringUtils.cleanPath (SPR-11793)
+fixed JMS problem with Oracle AQ when underlying DataSource is decorated (SPR-11791, SPR-10829)
+support lazy resolution with StandardServletMultipartResolver (SPR-11730)
+fixed StringUtils.parseLocaleString issue where locale variant cannot contain country code (SPR-11806)
+detected NoClassDefFoundError within BeanInstantiationException for getTestExecutionListeners (SPR-11804)
+
+
+Changes in version 3.2.8 (2014-02-18)
+-------------------------------------
+
+* fixed potential LinkageError with aop:scoped-proxy (SPR-11398)
+* fixed various memory leaks (SPR-11440, SPR-10785)
+* added processExternalEntities support to OXM (SPR-11376)
+* fixed URL mapping issue (SPR-11101)
+* prevented unwanted side-effects from PreparedStatements (SPR-11386)
+* restore correct equals/hashCode for AbstractBeanDefinition (SPR-11420)
+* fixed various HTML form issues (SPR-10837, SPR-11426)
+* wraped runtime-registered EhCacheCacheManager caches with TransactionAwareCacheDecorator (SPR-11407)
+* fixed StringIndexOutOfBoundsException in AbstractErrors for class-level JSR-303 validator (SPR-11374)
+* fixed off-by-one regression in AbstractMethodMockingControl (SPR-11385)
+* fixed potential ClassCastException in RequestContextListener when destroying the request object (SPR-11378)
+* fixed various stream closing issues (SPR-11411, SPR-11413)
+* fixed broken documentation links (SPR-11404)
+* improved error reporting for issues related to @Controller types requiring AOP proxing (SPR-11281)
+* consider nonPublicAccessAllowed flag and SecurityManager with resolveFactoryMethodIfPossible method (SPR-11422)
+* don't lazily populate a hash field for Objects with multi-threaded access (SPR-11428)
+* fixed locale specific unit test failures (SPR-11392)
+* explicitly skip BindingResult when searching for a model object in MarshallingView (SPR-11417)
+* fixes potential malformed JSON from LiveBeansView (SPR-11366)
+
+
+Changes in version 3.2.7 (2013-12-12)
+-------------------------------------
+
+* fixed memory leaks with @Async (SPR-11275, SPR-11276)
+* restored full Java 5 compatibility (SPR-11313, SPR-11349, SPR-11321)
+* fixed various dependency compatibility issues (SPR-11359, SPR-11265, SPR-11362, SPR-11284)
+* improved performance and reduced memory consumption for some edge cases (SPR-11343, SPR-9014, SPR-11344, SPR-11304)
+* fixed WebSphere compatibility issue (SPR-11341, SPR-11297)
+* fixed ServletWebRequest.checkNotModified() methods to treat HEAD identically to GET (SPR-11317)
+* fixed various regression issues (SPR-11320, SPR-11246, SPR-11231)
+* fixed theme resolution fails with "IllegalArgumentException" issue (SPR-11128)
+* fixed @Enable registrars subclass issues (SPR-11251)
+* allowed consolidation of all configuration into the "root" context with AbstractAnnotationConfigDispatcherServletInitializer (SPR-11357)
+* provided alternative RestTemplate constructor to avoid default MessageConverter creation (SPR-11351)
+* handle NoClassDefFoundError for TestExecutionListeners consistently (SPR-11347)
+* fixed @Bean meta-annotation detection when using ASM (SPR-10488)
+* provide access to SimpleTriggerFactoryBean property startTime (SPR-10940)
+* added patch() to MockMvcRequestBuilders (SPR-11299)
+* provided a mechanism for adding ApplicationContextInitializers to DispatcherServlet's ApplicationContext (SPR-11314)
+* fixed various documentation issues (SPR-3983, SPR-11364, SPR-11331)
+* enabled ServletTestExecutionListener by default in abstract base test classes (SPR-11340)
+* fixed type comparison in ReflectionHelper.getTypeDifferenceWeight (SPR-11306)
+* improved logging and exception information (SPR-11346, SPR-11333)
+* fixed read/write method mismatch problems with BeanWrapper (SPR-11361)
+* fixed context:component-scan element in the mvc-cofig.xml (SPR-11221)
+* fixed XMLEventStreamWriter handleing for writeEmptyElement() followed by writeAttribute() (SPR-11254)
+* fixed CronTriggerFactoryBean to allow calendar name and description to be specified (SPR-9771)
+
+
+Changes in version 3.2.6 (2013-12-12)
+-------------------------------------
+
+* added Maven bill-of-materials POM
+* fixed BeanUtils.copyProperties() issue caused by recently changes to GenericTypeAwarePropertyDescriptor (SPR-11209)
+* fixed issue with ServletTestExecutionListener breaking existing code (SPR-11144)
+* fixed SpEL ReflectivePropertyAccessor to not consider "is" methods with non boolean returns (SPR-11142)
+* support multiple comma-separated values in X-Forwarded-Host header (SPR-11140)
+* fixed tests related to java.beans.BeanInfo changes in JDK8-b117 (SPR-11139)
+* added synchronization to EhCacheFactoryBean.afterPropertiesSet (SPR-11132)
+* fixed dependency injection issue when using ManagedMap or ManagedList in BeanDefinitionParser (SPR-11131)
+* fixed support for combining multiple @Cacheable within @Caching annotation (SPR-11124)
+* allow autowire qualified scoped-proxy @Bean definitions (SPR-11116)
+* fixed type resolution fails for uninitialized factory-method declaration issue (SPR-11112)
+* fixed "CglibAopProxy: Unable to proxy method" warning when bean class contains static final method (SPR-11107)
+* improved performance for repeated JDBC 3.0 getParameterType calls in StatementCreatorUtils (SPR-11100)
+* fixed minor issue with prior fix for CVE 2010-1622 (SPR-11098)
+* added mapping for additional Sybase error code to DataIntegrityViolationException (SPR-11097)
+* fixed issue with "!profile" selector XML (SPR-11093)
+* fixed set statistics issues with EhCache (SPR-11092, SPR-11080)
+* fixed classpath scanning issue on private meta-attributes (SPR-11091)
+* fixed potential NPE when calling stored procedures (SPR-11076)
+* added synchronization to MBeanExporter & MBeanRegistrationSupport (SPR-11002)
+* removed integer conversion from JmsListenerContainerParser (SPR-10986)
+* fixed @ResourceMapping issue with Portlets (SPR-10791)
+
+
+Changes in version 3.2.5 (2013-11-06)
+-------------------------------------
+
+* fixed type prediction for generic factory method with conversion of method arguments (SPR-10411)
+* fixed GenericTypeResolver issues relating to ParameterizedType (SPR-10819)
+* allow indexed constructors to be used with @Autowire resolution (SPR-11019)
+* refined JavaConfig overrides algorithm (SPR-10988, SPR-10992)
+* fixed multiple calls to @Autowire setters when defining several beans of the same class (SPR-11027)
+* provided more lenient fallback checks for setter injection (SPR-10995)
+* allowed AnnotationConfigWebApplicationContext.register to be called multiple times (SPR-10852)
+* fixed various SpEL issues (SPR-9495, SPR-10452, SPR-10928, SPR-10884, SPR-10953, SPR-10716, SPR-10486, SPR-11031)
+* added XStream catch-all converter (SPR-10821)
+* fixed issue with AOP Advisor being silently skipped during creation (SPR-10430)
+* fixed use of configured prefix for Jackson message converters (SPR-10817)
+* fixed SimpleJdbcCall function return issues (SPR-10606)
+* protected against memory leak in AntPathMatcher (SPR-10803)
+* fixed memory leak in AbstractBeanFactory (SPR-10896)
+* fixed Ehcache RMI replication issue (SPR-10904)
+* fixed ArrayStoreException with ASM reading of enum subclass (SPR-10914)
+* prevented duplicate scan of @Import annotations (SPR-10918) 
+* fixed issues using non-shareable @Resource (SPR-10931)
+* ensured malformed content type is translated to 415 status code (SPR-10982)
+* fixed issues when converting a single element array to object (SPR-10996)
+* allow override of @ContextConfiguration initializer when using @ContextHierarchy (SPR-10997)
+* fixed issue with ordering of @PropertySource values (SPR-10820)
+* fixed parsing issues with JNDI variables (SPR-11039)
+* fixed MockHttpServletRequestBuilder handling parameter without value (SPR-11043)
+* fixed ClasspathXmlApplicationContext inherit/merge of parent context environment (SPR-11068)
+* fixed wrong translation of MS SQL error code (SPR-10902)
+* fixed JMSTemplate issues when used with Oracle AQ (SPR-10829)
+* fixed AbstractMethodMockingControl off-by-one error (SPR-10885)
+* fixed potential NPE with JaxB2Marshaller (SPR-10828)
+* fixed potential NPE with RestTemplate (SPR-10848)
+* fixed potential NPE in AbstractApplicationEventMulticaster (SPR-10945)
+* fixed potential NPE with RedirectView (SPR-10937)
+* fixed NPE with ExtendedBeanInfo on IBM J9 VM (SPR-10862)
+* improved subclassing support for RequestMappingHandlerMapping (SPR-10950)
+* made AnnotationConfigUtils.processCommonDefinitionAnnotations public (SPR-11032)
+* removed unnecessary char[] allocation with NamedParameterUtils (SPR-11042)
+* refined logging output (SPR-10974, SPR-11017)
+* minor documentation updates (SPR-10798, SPR-10850, SPR-10927)
+
+
+Changes in version 3.2.4 (2013-08-06)
+-------------------------------------
+
+* fixed potential security risk when using Spring OXM with JAXB (SPR-10806)
+* support for Quartz 2.2 (SPR-10775)
+* updated spring-instrument manifest to include JDK 7 redefine/retransform attributes (SPR-10731)
+* TypeDescriptor class is marked as Serializable now (SPR-10631)
+* ConfigurationClassPostProcessor is Ordered.HIGHEST_PRECEDENCE now (SPR-10645)
+* @ImportResource supports ${...} placeholders as well (SPR-10686)
+* BeanFactory's getBeansWithAnnotation ignores abstract bean definitions (SPR-10672)
+* fixed regression with non-String value attributes on custom stereotypes (SPR-10580)
+* fixed regression in nested placeholder resolution in case of ignoreUnresolvablePlaceholders (SPR-10549)
+* fixed SpEL's MethodExecutor to correctly cache overloaded methods (SPR-10684)
+* fixed ClassFilterAwareUnionMethodMatcher equals implementation (SPR-10604)
+* introduced latest CGLIB UndeclaredThrowableStrategy changes for better memory usage (SPR-10709)
+* fixed regression with AspectJ-based @Async handling in case of no executor set (SPR-10715)
+* proper parsing of JPA's "exclude-unlisted-classes" element with a nested "true"/"false" value (SPR-10767)
+* resource-based PlatformTransactionManager implementations defensively handle Errors on begin (SPR-10755)
+* re-introduced RmiInvocationWrapperRTD.xml for WebLogic which has been missing in 3.2 (SPR-10649)
+* Jaxb2Marshaller scans for @XmlRegistry annotation as well (SPR-10714)
+* XStreamMarshaller's "getXStream() method is non-final again (SPR-10421)
+* DelegatingFilterProxy avoids synchronization for pre-resolved delegate (SPR-10413)
+* fixed regression in @RequestParam empty value handling (SPR-10578)
+* fixed ResourceHttpRequestHandler's locations-list-empty warn log (SPR-10780)
+* fixed ContentNegotiatingViewResolver regression in case of no content type requested (SPR-10683)
+* fixed MappingJackson(2)JsonView's handling of a prefixJson="false" value (SPR-10752)
+* added configurable JSON prefix handling to MappingJackson(2)HttpMessageConverter (SPR-10627)
+* several UriComponentsBuilder refinements (SPR-10779, SPR-10701)
+* several HttpHeaders refinements (SPR-10713, SPR-10648)
+
+
+Changes in version 3.2.3 (2013-05-17)
+-------------------------------------
+
+* compatibility with OpenJDK 8 for target 1.5/1.6/1.7 compiled Spring Framework 3.2.x applications (SPR-9639)
+* compatibility with OSGI-style use of generics in source code that got compiled to 1.4 byte code (SPR-10559)
+* consistent detection of Order annotation in superclasses and interfaces (SPR-10514)
+* fixed regression with type detection for child bean definitions (SPR-10374)
+* fixed configuration class overriding in terms of superclasses (SPR-10546)
+* minimized ASM usage during configuration class processing (SPR-10292)
+* added public "getName()" accessor to MethodReference (SPR-10422)
 * fixed ReflectiveMethodResolver to avoid potential UnsupportedOperationException on sort (SPR-10392)
-* fixed Jaxb2Marshaller's partial unmarshalling feature to consistently apply to all sources (SPR-10282)
 * JdbcTemplate defensively uses JDBC 3.0 getParameterType call for Oracle driver compatibility (SPR-10385)
 * introduced public ArgumentPreparedStatementSetter and ArgumentTypePreparedStatementSetter classes (SPR-10375)
+* fixed BeanPropertyRowMapper to only prefix actual upper-case letters with underscores (SPR-10547)
+* HibernateJpaDialect supports Hibernate 4.2 as a JPA provider now (SPR-10395)
+* fixed Jaxb2Marshaller's partial unmarshalling feature to consistently apply to all sources (SPR-10282)
+* ContentNegotiationManager properly handles HttpMessageConverter checking for Accept header "*/*" (SPR-10513)
+* SimpleMappingExceptionResolver prefers longer mapping expression in case of same exception depth (SPR-9639)
+* ServletContextResourcePatternResolver supports Tomcat-style "foo#bar.war" deployment unit names (SPR-10471)
+* fixed potential deadlock with DeferredResult timeout handling on Tomcat (SPR-10485)
+* fixed regression with ResourceHttpMessageConverter accidentally not closing underlying files (SPR-10460)
+* fixed regression with JSP form tag prepending the context/servlet path (broke use for Portlets; SPR-10382)
+* added "jsonPrefix" property to MappingJackson(2)JsonView, allowing for a custom prefix (SPR-10567)
+* changed MappingJackson(2)JsonView's "writeContent" template method to include "jsonPrefix" String (SPR-10567)
 
 
 Changes in version 3.2.2 (2013-03-14)
diff --git a/src/dist/license.txt b/src/dist/license.txt
index 51003b54f1..2fb79ea53c 100644
--- a/src/dist/license.txt
+++ b/src/dist/license.txt
@@ -265,15 +265,15 @@ components and modifications thereto, if any, (the "Source Files"), by
 downloading the Source Files from http://www.springsource.org/download, or by
 sending a request, with your name and address to:
 
-    VMware, Inc., 3401 Hillview Avenue
-    Palo Alto, CA 94304
+    Pivotal, Inc., 875 Howard St,
+    San Francisco, CA 94103
     United States of America
 
-or email info@vmware.com.  All such requests should clearly specify:
+or email info@gopivotal.com.  All such requests should clearly specify:
 
     OPEN SOURCE FILES REQUEST
     Attention General Counsel
 
-VMware shall mail a copy of the Source Files to you on a CD or equivalent
+Pivotal shall mail a copy of the Source Files to you on a CD or equivalent
 physical medium. This offer to obtain a copy of the Source Files is valid for
 three years from the date you acquired this Software product.
diff --git a/src/dist/notice.txt b/src/dist/notice.txt
index 501109ecd7..225eeb95d5 100644
--- a/src/dist/notice.txt
+++ b/src/dist/notice.txt
@@ -1,5 +1,5 @@
 Spring Framework ${version}
-Copyright (c) 2002-${copyright} SpringSource, a division of VMware, Inc.
+Copyright (c) 2002-${copyright} Pivotal, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0
 (the "License"). You may not use this product except in compliance with
diff --git a/src/dist/readme.txt b/src/dist/readme.txt
index c58486a587..c51de83e35 100644
--- a/src/dist/readme.txt
+++ b/src/dist/readme.txt
@@ -1,5 +1,5 @@
 Spring Framework version ${version}
-================================================================================
+==================================================================================
 
 To find out what has changed since any earlier releases, see 'docs/changelog.txt'.
 
diff --git a/src/reference/docbook/beans-context-additional.xml b/src/reference/docbook/beans-context-additional.xml
index ead3945dce..8cf19e31ad 100644
--- a/src/reference/docbook/beans-context-additional.xml
+++ b/src/reference/docbook/beans-context-additional.xml
@@ -150,7 +150,7 @@
 message=Alligators rock!</programlisting>
 
     <programlisting language="java"><lineannotation># in exceptions.properties</lineannotation>
-argument.required=The '{0}' argument is required.</programlisting>
+argument.required=The {0} argument is required.</programlisting>
 
     <para>A program to execute the <classname>MessageSource</classname>
       functionality is shown in the next example. Remember that all
@@ -219,7 +219,7 @@ argument.required=The '{0}' argument is required.</programlisting>
     <programlisting>The userDao argument is required.</programlisting>
 
     <para>With regard to internationalization (i18n), Spring's various
-      <classname>MessageResource</classname> implementations follow the same
+      <classname>MessageSource</classname> implementations follow the same
       locale resolution and fallback rules as the standard JDK
       <classname>ResourceBundle</classname>. In short, and continuing with the
       example <literal>messageSource</literal> defined previously, if you want
@@ -233,7 +233,7 @@ argument.required=The '{0}' argument is required.</programlisting>
       messages will be resolved is specified manually.</para>
 
     <programlisting><lineannotation># in exceptions_en_GB.properties</lineannotation>
-argument.required=Ebagum lad, the '{0}' argument is required, I say, required.</programlisting>
+argument.required=Ebagum lad, the {0} argument is required, I say, required.</programlisting>
 
     <programlisting language="java">public static void main(final String[] args) {
   MessageSource resources = new ClassPathXmlApplicationContext("beans.xml");
@@ -563,20 +563,6 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.</
       programmatically by using one of the
       <interfacename>ApplicationContext</interfacename> implementations.</para>
 
-    <para>The <classname>ContextLoader</classname> mechanism comes in two
-      flavors: the <classname>ContextLoaderListener</classname> and the
-      <classname>ContextLoaderServlet</classname>. They have the same
-      functionality but differ in that the listener version is not reliable in
-      Servlet 2.3 containers. In the Servlet 2.4 specification, Servlet context
-      listeners must execute immediately after the Servlet context for the web
-      application is created and is available to service the first request (and
-      also when the Servlet context is about to be shut down). As such a Servlet
-      context listener is an ideal place to initialize the Spring
-      <interfacename>ApplicationContext</interfacename>. All things being equal,
-      you should probably prefer <classname>ContextLoaderListener</classname>;
-      for more information on compatibility, have a look at the Javadoc for the
-      <classname>ContextLoaderServlet</classname>.</para>
-
     <para>You can register an <interfacename>ApplicationContext</interfacename>
       using the <classname>ContextLoaderListener</classname> as follows:</para>
 
@@ -587,15 +573,7 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.</
 
 &lt;listener&gt;
 &lt;listener-class&gt;org.springframework.web.context.ContextLoaderListener&lt;/listener-class&gt;
-&lt;/listener&gt;
-
-<lineannotation>&lt;!-- or use the ContextLoaderServlet instead of the above listener</lineannotation><emphasis>
-&lt;servlet&gt;
-&lt;servlet-name&gt;context&lt;/servlet-name&gt;
-&lt;servlet-class&gt;org.springframework.web.context.ContextLoaderServlet&lt;/servlet-class&gt;
-&lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
-&lt;/servlet&gt;
---</emphasis>&gt;</programlisting>
+&lt;/listener&gt;</programlisting>
 
     <para>The listener inspects the <literal>contextConfigLocation</literal>
       parameter. If the parameter does not exist, the listener uses
@@ -608,11 +586,6 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.</
       with "Context.xml", residing in the "WEB-INF" directory, and
       <literal>/WEB-INF/**/*Context.xml</literal>, for all such files in any
       subdirectory of "WEB-INF".</para>
-
-    <para>You can use <classname>ContextLoaderServlet</classname> instead of
-      <classname>ContextLoaderListener</classname>. The Servlet uses the
-      <literal>contextConfigLocation</literal> parameter just as the listener
-      does.</para>
   </section>
 
   <section xml:id="context-deploy-rar">
diff --git a/src/reference/docbook/beans.xml b/src/reference/docbook/beans.xml
index 73764d81cf..c164c1440b 100644
--- a/src/reference/docbook/beans.xml
+++ b/src/reference/docbook/beans.xml
@@ -885,17 +885,16 @@ List userList = service.getUsernameList();
       child bean class must be compatible with the parent, that is, it must
       accept the parent's property values.</para>
 
-    <para>A child bean definition inherits constructor argument values, property
-      values, and method overrides from the parent, with the option to add new
-      values. Any initialization method, destroy method, and/or
+    <para>A child bean definition inherits scope, constructor argument values,
+      property values, and method overrides from the parent, with the option to
+      add new values. Any scope, initialization method, destroy method, and/or
       <literal>static</literal> factory method settings that you specify will
       override the corresponding parent settings.</para>
 
     <para>The remaining settings are <emphasis>always</emphasis> taken from the
       child definition: <emphasis>depends on</emphasis>, <emphasis>autowire
       mode</emphasis>, <emphasis>dependency check</emphasis>,
-      <emphasis>singleton</emphasis>, <emphasis>scope</emphasis>, <emphasis>lazy
-      init</emphasis>.</para>
+      <emphasis>singleton</emphasis>, <emphasis>lazy init</emphasis>.</para>
 
     <para>The preceding example explicitly marks the parent bean definition as
       abstract by using the <literal>abstract</literal> attribute. If the parent
diff --git a/src/reference/docbook/cache.xml b/src/reference/docbook/cache.xml
index 01fa2d5a87..040b6fa5e3 100644
--- a/src/reference/docbook/cache.xml
+++ b/src/reference/docbook/cache.xml
@@ -147,7 +147,7 @@ public Book findBook(ISBN isbn, boolean checkWarehouse, boolean includeUsed)</pr
 
             <para>Sometimes, a method might not be suitable for caching all the time (for example, it might depend on the given arguments). The cache annotations support such functionality
             through the <literal>conditional</literal> parameter which takes a <literal>SpEL</literal> expression that is evaluated to either <literal>true</literal> or <literal>false</literal>.
-            If <literal>true</literal>, the method is cached - if not, it behaves as if the method is not cached, that is executed every since time no matter what values are in the cache or what
+            If <literal>true</literal>, the method is cached - if not, it behaves as if the method is not cached, that is executed every time no matter what values are in the cache or what
             arguments are used. A quick example - the following method will be cached, only if the argument <literal>name</literal> has a length shorter then 32:</para>
 
             <programlisting language="java"><![CDATA[@Cacheable(value="book", condition="#name.length < 32")
diff --git a/src/reference/docbook/expressions.xml b/src/reference/docbook/expressions.xml
index 5dcafe7e14..d13951a5f3 100644
--- a/src/reference/docbook/expressions.xml
+++ b/src/reference/docbook/expressions.xml
@@ -458,7 +458,7 @@ Boolean b = simple.booleanList.get(0);
 
   @Autowired
   public void configure(MovieFinder movieFinder,
-                        @Value("#{ systemProperties['user.region'] }"} String defaultLocale) {
+                        @Value("#{ systemProperties['user.region'] }") String defaultLocale) {
       this.movieFinder = movieFinder;
       this.defaultLocale = defaultLocale;
   }
@@ -474,7 +474,7 @@ Boolean b = simple.booleanList.get(0);
 
   @Autowired
   public MovieRecommender(CustomerPreferenceDao customerPreferenceDao,
-                          @Value("#{systemProperties['user.country']}"} String defaultLocale) {
+                          @Value("#{systemProperties['user.country']}") String defaultLocale) {
       this.customerPreferenceDao = customerPreferenceDao;
       this.defaultLocale = defaultLocale;
   }
@@ -490,13 +490,12 @@ Boolean b = simple.booleanList.get(0);
     <section xml:id="expressions-ref-literal">
       <title>Literal expressions</title>
 
-      <para>The types of literal expressions supported are strings, dates,
-      numeric values (int, real, and hex), boolean and null. Strings are
-      delimited by single quotes. To put a single quote itself in a string use
-      two single quote characters. The following listing shows simple usage of
-      literals. Typically they would not be used in isolation like this, but
-      as part of a more complex expression, for example using a literal on one
-      side of a logical comparison operator.</para>
+      <para>The types of literal expressions supported are strings, numeric values
+      (int, real, hex), boolean and null. Strings are delimited by single quotes.
+      To put a single quote itself in a string, use two single quote characters.
+      The following listing shows simple usage of literals. Typically they would not
+      be used in isolation like this but rather as part of a more complex expression,
+      for example using a literal on one side of a logical comparison operator.</para>
 
       <programlisting language="java">ExpressionParser parser = new SpelExpressionParser();
 
@@ -626,8 +625,8 @@ int[][] numbers3 = (int[][]) parser.parseExpression("new int[4][5]").getValue(co
 String c = parser.parseExpression("'abc'.substring(2, 3)").getValue(String.class);
 
 // evaluates to true
-boolean isMember = parser.parseExpression("isMember('Mihajlo Pupin')").getValue(societyContext,
-                                                                                Boolean.class);</programlisting>
+boolean isMember = parser.parseExpression("isMember('Mihajlo Pupin')").getValue(societyContext, Boolean.class);
+      </programlisting>
     </section>
 
     <section xml:id="expressions-operators">
@@ -640,15 +639,24 @@ boolean isMember = parser.parseExpression("isMember('Mihajlo Pupin')").getValue(
         or equal, greater than, and greater than or equal are supported using
         standard operator notation.</para>
 
-        <para><programlisting language="java">// evaluates to true
+        <programlisting language="java">// evaluates to true
 boolean trueValue = parser.parseExpression("2 == 2").getValue(Boolean.class);
 
 // evaluates to false
 boolean falseValue = parser.parseExpression("2 &lt; -5.0").getValue(Boolean.class);
 
 // evaluates to true
-boolean trueValue = parser.parseExpression("'black' &lt; 'block'").getValue(Boolean.class);</programlisting>
-        In addition to standard relational operators SpEL supports the
+boolean trueValue = parser.parseExpression("'black' &lt; 'block'").getValue(Boolean.class);
+        </programlisting>
+
+        <para>Greater/less-than comparisons against `null` follow a simple rule: `null`
+        is treated as nothing here (i.e. NOT as zero). As a consequence, any other value
+        is always greater than `null` (`X &gt; null` is always `true`) and no other value
+        is ever less than nothing (`X &lt; null` is always `false`). If you prefer numeric
+        comparisons instead, please avoid number-based `null` comparisons in favor of
+        comparisons against zero (e.g. `X &gt; 0` or `X &lt; 0`).</para>
+
+        <para>In addition to standard relational operators SpEL supports the
         'instanceof' and regular expression based 'matches' operator.</para>
 
         <programlisting language="java">// evaluates to false
@@ -661,14 +669,13 @@ boolean trueValue =
 //evaluates to false
 boolean falseValue =
      parser.parseExpression("'5.0067' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean.class);
+        </programlisting>
 
-</programlisting>
-      <para>Each symbolic operator can also be specified as a purely alphabetic equivalent.  This avoids
-      problems where the symbols used have special meaning for the document type in which
-      the expression is embedded (eg. an XML document).  The textual equivalents are shown
-      here: lt ('&lt;'), gt ('&gt;'), le ('&lt;='), ge ('&gt;='),
-      eq ('=='), ne ('!='), div ('/'), mod ('%'), not ('!').
-      These are case insensitive.</para>
+        <para>Each symbolic operator can also be specified as a purely alphabetic equivalent.
+        This avoids problems where the symbols used have special meaning for the document type
+        in which the expression is embedded (eg. an XML document). The textual equivalents are
+        shown here: lt ('&lt;'), gt ('&gt;'), le ('&lt;='), ge ('&gt;='), eq ('=='), ne ('!='),
+        div ('/'), mod ('%'), not ('!'). These are case insensitive.</para>
       </section>
 
       <section xml:id="expressions-operators-logical">
@@ -980,7 +987,7 @@ StandardEvaluationContext context = new StandardEvaluationContext(tesla);
 
 String name = parser.parseExpression("Name?:'Elvis Presley'").getValue(context, String.class);
 
-System.out.println(name); // Mike Tesla
+System.out.println(name); // Nikola Tesla
 
 tesla.setName(null);
 
diff --git a/src/reference/docbook/index.xml b/src/reference/docbook/index.xml
index f11a32aaee..a3e2c92d5c 100644
--- a/src/reference/docbook/index.xml
+++ b/src/reference/docbook/index.xml
@@ -160,7 +160,7 @@
     </authorgroup>
 
     <copyright>
-      <year>2004-2013</year>
+      <year>2004-2016</year>
     </copyright>
 
     <legalnotice>
diff --git a/src/reference/docbook/jdbc.xml b/src/reference/docbook/jdbc.xml
index f4af0e3b23..6c87dd8adb 100644
--- a/src/reference/docbook/jdbc.xml
+++ b/src/reference/docbook/jdbc.xml
@@ -304,12 +304,12 @@
           <para>Here is a simple query for getting the number of rows in a
           relation:</para>
 
-          <programlisting language="java">int rowCount = this.jdbcTemplate.queryForInt("select count(*) from t_actor");</programlisting>
+          <programlisting language="java">int rowCount = this.jdbcTemplate.queryForObject("select count(*) from t_actor", int.class);</programlisting>
 
           <para>A simple query using a bind variable:</para>
 
-          <programlisting language="java">int countOfActorsNamedJoe = this.jdbcTemplate.queryForInt(
-        "select count(*) from t_actor where first_name = ?", "Joe");</programlisting>
+          <programlisting language="java">int countOfActorsNamedJoe = this.jdbcTemplate.queryForObject(
+        "select count(*) from t_actor where first_name = ?", int.class, "Joe");</programlisting>
 
           <para>Querying for a <classname>String</classname>:</para>
 
@@ -383,7 +383,7 @@ private static final class ActorMapper implements RowMapper&lt;Actor&gt; {
         "Leonor", "Watling");</programlisting>
 
           <programlisting language="java">this.jdbcTemplate.update(
-        "update t_actor set = ? where id = ?",
+        "update t_actor set last_name = ? where id = ?",
         "Banjo", 5276L);</programlisting>
 
           <programlisting language="java">this.jdbcTemplate.update(
@@ -567,7 +567,7 @@ public int countOfActorsByFirstName(String firstName) {
 
     SqlParameterSource namedParameters = new MapSqlParameterSource("first_name", firstName);
 
-    return namedParameterJdbcTemplate.queryForInt(sql, namedParameters);
+    return this.namedParameterJdbcTemplate.queryForObject(sql, int.class, namedParameters);
 }</programlisting>
 
       <para>Notice the use of the named parameter notation in the value
@@ -598,9 +598,9 @@ public int countOfActorsByFirstName(String firstName) {
 
     String sql = "select count(*) from T_ACTOR where first_name = :first_name";
 
-    Map namedParameters = Collections.singletonMap("first_name", firstName);
+    Map&lt;String, String&gt; namedParameters = Collections.singletonMap("first_name", firstName);
 
-    return this.namedParameterJdbcTemplate.queryForInt(sql, namedParameters);
+    return this.namedParameterJdbcTemplate.queryForObject(sql, int.class, namedParameters);
 }</programlisting>
 
       <para>One nice feature related to the
@@ -664,7 +664,7 @@ public int countOfActors(Actor exampleActor) {
 
     SqlParameterSource namedParameters = new BeanPropertySqlParameterSource(exampleActor);
 
-    return this.namedParameterJdbcTemplate.queryForInt(sql, namedParameters);
+    return this.namedParameterJdbcTemplate.queryForObject(sql, int.class, namedParameters);
 }</programlisting>
 
       <para>Remember that the
@@ -838,10 +838,8 @@ public class ExecuteAStatement {
     <section xml:id="jdbc-statements-querying">
       <title>Running queries</title>
 
-      <para>Some query methods return a single value. To retrieve a count or a
-      specific value from one row, use
-      <methodname>queryForInt(..)</methodname>,
-      <methodname>queryForLong(..)</methodname> or
+      <para>Some query methods return a single value. To retrieve a count or
+      a specific value from one row, use
       <methodname>queryForObject(..)</methodname>. The latter converts the
       returned JDBC <classname>Type</classname> to the Java class that is
       passed in as an argument. If the type conversion is invalid, then an
@@ -862,11 +860,11 @@ public class RunAQuery {
     }
 
     public int getCount() {
-        return this.jdbcTemplate.queryForInt("select count(*) from mytable");
+        return this.jdbcTemplate.queryForObject("select count(*) from mytable", int.class);
     }
 
     public String getName() {
-        return (String) this.jdbcTemplate.queryForObject("select name from mytable", String.class);
+        return this.jdbcTemplate.queryForObject("select name from mytable", String.class);
     }
 
     public void setDataSource(DataSource dataSource) {
@@ -1527,14 +1525,14 @@ TR: Revised, please review.-->For this example, the initializing method is the
     //  ... additional methods
 }</programlisting>The main difference when executing the insert by this second
       approach is that you do not add the id to the Map and you call the
-      <literal>executeReturningKey</literal> method. This returns a
+      <literal>executeAndReturnKey</literal> method. This returns a
       <literal>java.lang.Number</literal> object with which you can create an
       instance of the numerical type that is used in our domain class.You
       cannot rely on all databases to return a specific Java class here;
       <literal>java.lang.Number</literal> is the base class that you can rely
       on. If you have multiple auto-generated columns, or the generated values
       are non-numeric, then you can use a <literal>KeyHolder</literal> that is
-      returned from the <literal>executeReturningKeyHolder</literal>
+      returned from the <literal>executeAndReturnKeyHolder</literal>
       method.</para>
     </section>
 
@@ -2603,19 +2601,19 @@ clobReader.close();]]></programlisting>
       that must be implemented. This interface is used as part of the
       declaration of an <classname>SqlOutParameter</classname>.</para>
 
-      <para><programlisting language="java">final TestItem - new TestItem(123L, "A test item",
-        new SimpleDateFormat("yyyy-M-d").parse("2010-12-31"););
+      <para><programlisting language="java">final TestItem = new TestItem(123L, "A test item",
+        new SimpleDateFormat("yyyy-M-d").parse("2010-12-31"));
 
 declareParameter(new SqlOutParameter("item", OracleTypes.STRUCT, "ITEM_TYPE",
     new SqlReturnType() {
       public Object getTypeValue(CallableStatement cs, int colIndx, int sqlType, String typeName)
           throws SQLException {
-        STRUCT struct = (STRUCT)cs.getObject(colIndx);
+        STRUCT struct = (STRUCT) cs.getObject(colIndx);
         Object[] attr = struct.getAttributes();
         TestItem item = new TestItem();
         item.setId(((Number) attr[0]).longValue());
-        item.setDescription((String)attr[1]);
-        item.setExpirationDate((java.util.Date)attr[2]);
+        item.setDescription((String) attr[1]);
+        item.setExpirationDate((java.util.Date) attr[2]);
         return item;
       }
     }));</programlisting>You use the <classname>SqlTypeValue</classname> to
@@ -2628,8 +2626,8 @@ declareParameter(new SqlOutParameter("item", OracleTypes.STRUCT, "ITEM_TYPE",
       <classname>StructDescriptor</classname>s, as shown in the following
       example, or <classname>ArrayDescriptor</classname>s.<!--Rewording of preceding ok? The example is showing human participation, I assume. ;-) TR: Yes :), OK.--></para>
 
-      <para><programlisting language="java">final TestItem - new TestItem(123L, "A test item",
-        new SimpleDateFormat("yyyy-M-d").parse("2010-12-31"););
+      <para><programlisting language="java">final TestItem = new TestItem(123L, "A test item",
+        new SimpleDateFormat("yyyy-M-d").parse("2010-12-31"));
 
 SqlTypeValue value = new AbstractSqlTypeValue() {
   protected Object createTypeValue(Connection conn, int sqlType, String typeName) throws SQLException {
diff --git a/src/reference/docbook/mvc.xml b/src/reference/docbook/mvc.xml
index a9e8489af3..6d1101cf03 100644
--- a/src/reference/docbook/mvc.xml
+++ b/src/reference/docbook/mvc.xml
@@ -1173,10 +1173,11 @@ public void findPet(
         <para>Note that to enable the use of matrix variables, you must set the
         <classname>removeSemicolonContent</classname> property of
         <classname>RequestMappingHandlerMapping</classname> to <code>false</code>.
-        By default it is set to <code>true</code> with the exception of the
-        MVC namespace and the MVC Java config both of which automatically enable
-        the use of matrix variables.</para>
+        By default it is set to <code>false</code>.</para>
 
+        <para>In the MVC namespace, the `mvc:annotation-driven` element has an
+        `enableMatrixVariables` attribute that should be set to `true`. By default
+        it is set to `false`.</para>
       </section>
 
       <section xml:id="mvc-ann-requestmapping-consumes">
@@ -2750,7 +2751,7 @@ deferredResult.setResult(data);
     <para>The following example shows how to configure an interceptor:</para>
 
     <programlisting language="xml">&lt;beans&gt;
-  &lt;bean id="handlerMapping" class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping"&gt;
+  &lt;bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping"&gt;
     &lt;property name="interceptors"&gt;
       &lt;bean class="example.MyInterceptor"/&gt;
     &lt;/property&gt;
@@ -4269,7 +4270,7 @@ public class SimpleController {
         response for example when providing a REST API. You can prepare a
         <classname>ModelAndView</classname> and
         render error content through view resolution -- i.e. by configuring a
-        <classname>ContentNeogitatingViewResolver</classname>,
+        <classname>ContentNegotiatingViewResolver</classname>,
         <classname>MappingJacksonJsonView</classname>, and so on. However, you
         may prefer to use <interfacename>@ExceptionHandler</interfacename>
         methods instead.</para>
@@ -5149,7 +5150,7 @@ public class WebConfig extends WebMvcConfigurerAdapter {
       content negotiation purposes.</para>
 
       <para>Note that <classname>ContentNegotiatingViewResolver</classname>
-      now can also be configured with a <code>ContentNegotiatingViewResolver</code>,
+      now can also be configured with a <classname>ContentNegotiationManager</classname>,
       so you can use one instance throughout Spring MVC.</para>
 
       <para>In more advanced cases, it may be useful to configure
diff --git a/src/reference/docbook/oxm.xml b/src/reference/docbook/oxm.xml
index 1a7cbac17c..608b847f26 100644
--- a/src/reference/docbook/oxm.xml
+++ b/src/reference/docbook/oxm.xml
@@ -766,6 +766,9 @@ public class Application {
                 <para>
                   Additionally, you can register <link xl:href="http://static.springsource.org/spring/docs/current/api/org/springframework/oxm/xstream/XStreamMarshaller.html#setConverters(com.thoughtworks.xstream.converters.ConverterMatcher[])">
                   custom converters</link> to make sure that only your supported classes can be unmarshalled.
+                  You might want to add a <classname>CatchAllConverter</classname> as the last converter in the list,
+                  in addition to converters that explicitly support the domain classes that should be supported.
+                  As a result, default XStream converters with lower priorities and possible security vulnerabilities do not get invoked.
                 </para>
             </warning>
           <note>
diff --git a/src/reference/docbook/portlet.xml b/src/reference/docbook/portlet.xml
index 313b2bfeca..b658ab2e8c 100644
--- a/src/reference/docbook/portlet.xml
+++ b/src/reference/docbook/portlet.xml
@@ -13,16 +13,13 @@
     <title>Introduction</title>
 
     <sidebar>
-      <title>JSR-168 The Java Portlet Specification</title>
-      <para>For more general information about portlet development, please
-      review a whitepaper from Sun entitled
-      <link xl:href="http://developers.sun.com/prodtech/portalserver/reference/techart/jsr168/">"Introduction to JSR 168"</link>,
-      and of course the
-      <link xl:href="http://jcp.org/aboutJava/communityprocess/final/jsr168/">JSR-168 Specification</link> itself.</para>
+      <title>JSR-286 The Java Portlet Specification</title>
+      <para>For more general information about portlet development, please review the
+      <link xl:href="https://jcp.org/en/jsr/detail?id=286">JSR-286 Specification</link>.</para>
     </sidebar>
 
     <para>In addition to supporting conventional (servlet-based) Web development,
-    Spring also supports JSR-168 Portlet development. As much as possible, the
+    Spring also supports JSR-286 Portlet development. As much as possible, the
     Portlet MVC framework is a mirror image of the Web MVC framework, and also
     uses the same underlying view abstractions and integration technology. So, be
     sure to review the chapters entitled <xref linkend="mvc"/> and
@@ -31,7 +28,7 @@
     <note>
       <para>Bear in mind that while the concepts of Spring MVC are the
       same in Spring Portlet MVC, there are some notable differences
-      created by the unique workflow of JSR-168 portlets.</para>
+      created by the unique workflow of JSR-286 portlets.</para>
     </note>
 
     <para>The main way in which portlet workflow differs from servlet
@@ -50,7 +47,7 @@
     <xi:include href="swf-sidebar.xml"/>
 
     <para>The dual phases of portlet requests are one of the real strengths
-    of the JSR-168 specification. For example, dynamic search results can be
+    of the JSR-286 specification. For example, dynamic search results can be
     updated routinely on the display without the user explicitly rerunning
     the search. Most other portlet MVC frameworks attempt to completely
     hide the two phases from the developer and make it look as much like
@@ -670,7 +667,7 @@ public class SampleController extends AbstractController {
 
       <para>This can be very valuable since you can then use interceptors
       to pre-process and post-process requests going to these portlets.
-      Since JSR-168 does not support any kind of filter mechanism, this is
+      Since JSR-286 does not support any kind of filter mechanism, this is
       quite handy. For example, this can be used to wrap the Hibernate
       <classname>OpenSessionInViewInterceptor</classname> around a MyFaces
       JSF Portlet.</para>
@@ -1017,7 +1014,7 @@ public class SampleController extends AbstractController {
       <classname>CommonsMultipartResolver</classname>, you need to use
       <literal>commons-fileupload.jar</literal>. Be sure to use at least
       version 1.1 of Commons FileUpload as previous versions do not
-      support JSR-168 Portlet applications.</para>
+      support JSR-286 Portlet applications.</para>
 
       <para>Now that you have seen how to set Portlet MVC up to handle
       multipart requests, let's talk about how to actually use it. When
@@ -1776,7 +1773,7 @@ public class MyFormController {
     <title>Portlet application deployment</title>
 
     <para>The process of deploying a Spring Portlet MVC application is no
-    different than deploying any JSR-168 Portlet application. However, this
+    different than deploying any JSR-286 Portlet application. However, this
     area is confusing enough in general that it is worth talking about here
     briefly.</para>
 
@@ -1787,7 +1784,7 @@ public class MyFormController {
     well-known servlet that provides access to the portlet services defined
     in your <literal>portlet.xml</literal> file.</para>
 
-    <para>The JSR-168 specification does not specify exactly how this should
+    <para>The JSR-286 specification does not specify exactly how this should
     happen, so each portlet container has its own mechanism for this, which
     usually involves some kind of “deployment process” that makes changes to
     the portlet webapp itself and then registers the portlets within the
diff --git a/src/reference/docbook/remoting.xml b/src/reference/docbook/remoting.xml
index f642f9d653..643221af8e 100644
--- a/src/reference/docbook/remoting.xml
+++ b/src/reference/docbook/remoting.xml
@@ -929,8 +929,8 @@ public class AccountServiceEndpoint {
       beans (through the use of <literal>@Autowired</literal>, as shown
       above).</para>
 
-      <para>Check out <link
-      xl:href="https://jax-ws-commons.dev.java.net/spring/">https://jax-ws-commons.dev.java.net/spring/</link>
+      <para>Check out
+      <link xl:href="https://jax-ws-commons.java.net/spring/">https://jax-ws-commons.java.net/spring/</link>
       for the details on setup and usage style.</para>
     </section>
 
diff --git a/src/reference/docbook/scheduling.xml b/src/reference/docbook/scheduling.xml
index a30a0f7d99..55c36cbc1b 100644
--- a/src/reference/docbook/scheduling.xml
+++ b/src/reference/docbook/scheduling.xml
@@ -311,11 +311,11 @@ public class TaskExecutorExample {
       <para>Spring provides two implementations of the
       <interfacename>Trigger</interfacename> interface. The most interesting
       one is the <classname>CronTrigger</classname>. It enables the scheduling
-      of tasks based on cron expressions. For example the following task is
+      of tasks based on cron expressions. For example, the following task is
       being scheduled to run 15 minutes past each hour but only during the
       9-to-5 "business hours" on weekdays.</para>
 
-      <programlisting language="java">scheduler.schedule(task, new CronTrigger("* 15 9-17 * * MON-FRI"));</programlisting>
+      <programlisting language="java">scheduler.schedule(task, new CronTrigger("0 15 9-17 * * MON-FRI"));</programlisting>
 
       <para>The other out-of-the-box implementation is a
       <classname>PeriodicTrigger</classname> that accepts a fixed period, an
@@ -331,7 +331,7 @@ public class TaskExecutorExample {
       custom trigger implementations to be used interchangeably. Such a
       component could take advantage of dependency injection so that such
       <interfacename>Triggers</interfacename> could be configured
-      externally.</para>
+      externally and therefore easily modified or extended.</para>
     </section>
 
     <section xml:id="scheduling-task-scheduler-implementations">
@@ -380,7 +380,7 @@ public class TaskExecutorExample {
 
       <programlisting language="java">@Configuration
 @EnableAsync
-@EnableSCheduling
+@EnableScheduling
 public class AppConfig {
 }</programlisting>
 
diff --git a/src/reference/docbook/spring.tld.xml b/src/reference/docbook/spring.tld.xml
index 49d89ec433..0ae0a49ea3 100644
--- a/src/reference/docbook/spring.tld.xml
+++ b/src/reference/docbook/spring.tld.xml
@@ -772,7 +772,7 @@
             <tbody>
                <row>
                   <entry>
-                     <para>url</para>
+                     <para>value</para>
                   </entry>
                   <entry>
                      <para>true</para>
diff --git a/src/reference/docbook/testing.xml b/src/reference/docbook/testing.xml
index bb26dc0c54..e1ff6a7dda 100644
--- a/src/reference/docbook/testing.xml
+++ b/src/reference/docbook/testing.xml
@@ -3177,10 +3177,10 @@ public class ExampleTests {
 
     @Test
     public void getAccount() throws Exception {
-        this.mockMvc.perform(get("/accounts/1").accept("application/json;charset=UTF-8"))
+        this.mockMvc.perform(get("/accounts/1").accept(MediaType.parseMediaType("application/json;charset=UTF-8")))
           .andExpect(status().isOk())
           .andExpect(content().contentType("application/json"))
-          .andExpect(jsonPath("$.name").value("Lee");
+          .andExpect(jsonPath("$.name").value("Lee"));
     }
 
 }</programlisting>
diff --git a/src/reference/docbook/transaction.xml b/src/reference/docbook/transaction.xml
index a852bf8f91..2faac4652e 100644
--- a/src/reference/docbook/transaction.xml
+++ b/src/reference/docbook/transaction.xml
@@ -1720,7 +1720,7 @@ public class DefaultFooService implements FooService {
                 </row>
 
                 <row>
-                  <entry><literal>rollbackForClassname</literal></entry>
+                  <entry><literal>rollbackForClassName</literal></entry>
 
                   <entry>Array of class names. Classes must be derived from
                   <classname>Throwable.</classname></entry>
@@ -1742,7 +1742,7 @@ public class DefaultFooService implements FooService {
                 </row>
 
                 <row>
-                  <entry><literal>noRollbackForClassname</literal></entry>
+                  <entry><literal>noRollbackForClassName</literal></entry>
 
                   <entry>Array of <classname>String</classname> class names,
                   which must be derived from
diff --git a/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java b/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java
index 0f0fc64ac8..39d221b78e 100644
--- a/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java
+++ b/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,11 @@
 
 package org.springframework.cache.annotation;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Collections;
 import java.util.List;
 
 import org.junit.Test;
+
 import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
@@ -36,6 +33,9 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Repository;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Integration tests for the @EnableCaching annotation.
  *
@@ -60,11 +60,12 @@ public void repositoryUsesAspectJAdviceMode() {
 		ctx.register(Config.class, AspectJCacheConfig.class);
 		try {
 			ctx.refresh();
-		} catch (Exception ex) {
+		}
+		catch (Exception ex) {
 			// this test is a bit fragile, but gets the job done, proving that an
 			// attempt was made to look up the AJ aspect. It's due to classpath issues
 			// in .integration-tests that it's not found.
-			assertTrue(ex.getMessage().endsWith("AspectJCachingConfiguration.class] cannot be opened because it does not exist"));
+			assertTrue(ex.getMessage().contains("AspectJCachingConfiguration"));
 		}
 	}
 
diff --git a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java
index f30afd1ca1..6795d24ab9 100644
--- a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java
+++ b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,7 +67,6 @@
 import static org.springframework.context.ConfigurableApplicationContext.*;
 import static org.springframework.core.env.EnvironmentIntegrationTests.Constants.*;
 
-
 /**
  * Integration tests for container support of {@link Environment}
  * interface.
@@ -84,29 +83,15 @@
  *
  * @author Chris Beams
  */
+@SuppressWarnings("resource")
 public class EnvironmentIntegrationTests {
 
 	private ConfigurableEnvironment prodEnv;
-	private ConfigurableEnvironment devEnv;
-	private ConfigurableEnvironment prodWebEnv;
-
-	/**
-	 * Constants used both locally and in scan* sub-packages
-	 */
-	public static class Constants {
-		public static final String XML_PATH = "org/springframework/core/env/EnvironmentIntegrationTests-context.xml";
 
-		public static final String ENVIRONMENT_AWARE_BEAN_NAME = "envAwareBean";
+	private ConfigurableEnvironment devEnv;
 
-		public static final String PROD_BEAN_NAME = "prodBean";
-		public static final String DEV_BEAN_NAME = "devBean";
-		public static final String DERIVED_DEV_BEAN_NAME = "derivedDevBean";
-		public static final String TRANSITIVE_BEAN_NAME = "transitiveBean";
+	private ConfigurableEnvironment prodWebEnv;
 
-		public static final String PROD_ENV_NAME = "prod";
-		public static final String DEV_ENV_NAME = "dev";
-		public static final String DERIVED_DEV_ENV_NAME = "derivedDev";
-	}
 
 	@Before
 	public void setUp() {
@@ -122,9 +107,7 @@ public void setUp() {
 
 	@Test
 	public void genericApplicationContext_standardEnv() {
-		ConfigurableApplicationContext ctx =
-			new GenericApplicationContext(newBeanFactoryWithEnvironmentAwareBean());
-
+		ConfigurableApplicationContext ctx = new GenericApplicationContext(newBeanFactoryWithEnvironmentAwareBean());
 		ctx.refresh();
 
 		assertHasStandardEnvironment(ctx);
@@ -134,8 +117,7 @@ public void genericApplicationContext_standardEnv() {
 
 	@Test
 	public void genericApplicationContext_customEnv() {
-		GenericApplicationContext ctx =
-			new GenericApplicationContext(newBeanFactoryWithEnvironmentAwareBean());
+		GenericApplicationContext ctx = new GenericApplicationContext(newBeanFactoryWithEnvironmentAwareBean());
 		ctx.setEnvironment(prodEnv);
 		ctx.refresh();
 
@@ -191,11 +173,8 @@ public void classPathBeanDefinitionScanner_inheritsEnvironmentFromEnvironmentCap
 	@Test
 	public void genericXmlApplicationContext() {
 		GenericXmlApplicationContext ctx = new GenericXmlApplicationContext();
-
 		assertHasStandardEnvironment(ctx);
-
 		ctx.setEnvironment(prodEnv);
-
 		ctx.load(XML_PATH);
 		ctx.refresh();
 
@@ -208,8 +187,7 @@ public void genericXmlApplicationContext() {
 
 	@Test
 	public void classPathXmlApplicationContext() {
-		ConfigurableApplicationContext ctx =
-			new ClassPathXmlApplicationContext(new String[] { XML_PATH });
+		ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext(XML_PATH);
 		ctx.setEnvironment(prodEnv);
 		ctx.refresh();
 
@@ -228,7 +206,7 @@ public void fileSystemXmlApplicationContext() throws IOException {
 
 		// strange - FSXAC strips leading '/' unless prefixed with 'file:'
 		ConfigurableApplicationContext ctx =
-			new FileSystemXmlApplicationContext(new String[] { "file:"+tmpFile.getPath() }, false);
+				new FileSystemXmlApplicationContext(new String[] {"file:" + tmpFile.getPath()}, false);
 		ctx.setEnvironment(prodEnv);
 		ctx.refresh();
 		assertEnvironmentBeanRegistered(ctx);
@@ -336,11 +314,8 @@ public void mostSpecificDerivedClassDrivesEnvironment_withDevEnvAndDerivedDevCon
 
 	@Test
 	public void webApplicationContext() {
-		GenericWebApplicationContext ctx =
-			new GenericWebApplicationContext(newBeanFactoryWithEnvironmentAwareBean());
-
+		GenericWebApplicationContext ctx = new GenericWebApplicationContext(newBeanFactoryWithEnvironmentAwareBean());
 		assertHasStandardServletEnvironment(ctx);
-
 		ctx.setEnvironment(prodWebEnv);
 		ctx.refresh();
 
@@ -588,7 +563,8 @@ public void abstractApplicationContextValidatesRequiredPropertiesOnRefresh() {
 			try {
 				ctx.refresh();
 				fail("expected missing property exception");
-			} catch (MissingRequiredPropertiesException ex) {
+			}
+			catch (MissingRequiredPropertiesException ex) {
 			}
 		}
 
@@ -598,7 +574,6 @@ public void abstractApplicationContextValidatesRequiredPropertiesOnRefresh() {
 			ctx.setEnvironment(new MockEnvironment().withProperty("foo", "fooValue"));
 			ctx.refresh(); // should succeed
 		}
-
 	}
 
 
@@ -652,6 +627,7 @@ private void assertEnvironmentAwareInvoked(ConfigurableApplicationContext ctx, E
 		assertThat(ctx.getBean(EnvironmentAwareBean.class).environment, is(expectedEnv));
 	}
 
+
 	private static class EnvironmentAwareBean implements EnvironmentAware {
 
 		public Environment environment;
@@ -660,9 +636,9 @@ private static class EnvironmentAwareBean implements EnvironmentAware {
 		public void setEnvironment(Environment environment) {
 			this.environment = environment;
 		}
-
 	}
 
+
 	/**
 	 * Mirrors the structure of beans and environment-specific config files
 	 * in EnvironmentIntegrationTests-context.xml
@@ -711,4 +687,25 @@ public Object derivedDevBean() {
 			return new Object();
 		}
 	}
+
+
+	/**
+	 * Constants used both locally and in scan* sub-packages
+	 */
+	public static class Constants {
+
+		public static final String XML_PATH = "org/springframework/core/env/EnvironmentIntegrationTests-context.xml";
+
+		public static final String ENVIRONMENT_AWARE_BEAN_NAME = "envAwareBean";
+
+		public static final String PROD_BEAN_NAME = "prodBean";
+		public static final String DEV_BEAN_NAME = "devBean";
+		public static final String DERIVED_DEV_BEAN_NAME = "derivedDevBean";
+		public static final String TRANSITIVE_BEAN_NAME = "transitiveBean";
+
+		public static final String PROD_ENV_NAME = "prod";
+		public static final String DEV_ENV_NAME = "dev";
+		public static final String DERIVED_DEV_ENV_NAME = "derivedDev";
+	}
+
 }
diff --git a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
index 8468024f99..1a0f250d86 100644
--- a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
+++ b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -47,6 +48,7 @@
  * @author Chris Beams
  * @since 3.1
  */
+@SuppressWarnings("resource")
 public class ScheduledAndTransactionalAnnotationIntegrationTests {
 
 	@Before
@@ -54,13 +56,14 @@ public void setUp() {
 		Assume.group(TestGroup.PERFORMANCE);
 	}
 
+
 	@Test
 	public void failsWhenJdkProxyAndScheduledMethodNotPresentOnInterface() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(Config.class, JdkProxyTxConfig.class, RepoConfigA.class);
 		try {
 			ctx.refresh();
-			fail("expected exception");
+			fail("Should have thrown BeanCreationException");
 		}
 		catch (BeanCreationException ex) {
 			assertTrue(ex.getRootCause().getMessage().startsWith("@Scheduled method 'scheduled' found"));
@@ -100,28 +103,36 @@ public void succeedsWhenJdkProxyAndScheduledMethodIsPresentOnInterface() throws
 
 	@Configuration
 	@EnableTransactionManagement
-	static class JdkProxyTxConfig { }
+	static class JdkProxyTxConfig {
+	}
+
 
 	@Configuration
 	@EnableTransactionManagement(proxyTargetClass=true)
-	static class SubclassProxyTxConfig { }
+	static class SubclassProxyTxConfig {
+	}
+
 
 	@Configuration
 	static class RepoConfigA {
+
 		@Bean
 		public MyRepository repository() {
 			return new MyRepositoryImpl();
 		}
 	}
 
+
 	@Configuration
 	static class RepoConfigB {
+
 		@Bean
 		public MyRepositoryWithScheduledMethod repository() {
 			return new MyRepositoryWithScheduledMethodImpl();
 		}
 	}
 
+
 	@Configuration
 	@EnableScheduling
 	static class Config {
@@ -138,15 +149,17 @@ public PlatformTransactionManager txManager() {
 
 		@Bean
 		public PersistenceExceptionTranslator peTranslator() {
-			PersistenceExceptionTranslator txlator = mock(PersistenceExceptionTranslator.class);
-			return txlator;
+			return mock(PersistenceExceptionTranslator.class);
 		}
 	}
 
+
 	public interface MyRepository {
+
 		int getInvocationCount();
 	}
 
+
 	@Repository
 	static class MyRepositoryImpl implements MyRepository {
 
@@ -164,11 +177,15 @@ public int getInvocationCount() {
 		}
 	}
 
+
 	public interface MyRepositoryWithScheduledMethod {
+
 		int getInvocationCount();
-		public void scheduled();
+
+		void scheduled();
 	}
 
+
 	@Repository
 	static class MyRepositoryWithScheduledMethodImpl implements MyRepositoryWithScheduledMethod {
 
diff --git a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
index 54511e7e7b..b5eb2f8e1b 100644
--- a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
+++ b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
@@ -115,11 +115,12 @@ public void repositoryUsesAspectJAdviceMode() {
 		ctx.register(Config.class, AspectJTxConfig.class);
 		try {
 			ctx.refresh();
-		} catch (Exception ex) {
+		}
+		catch (Exception ex) {
 			// this test is a bit fragile, but gets the job done, proving that an
 			// attempt was made to look up the AJ aspect. It's due to classpath issues
 			// in .integration-tests that it's not found.
-			assertTrue(ex.getMessage().endsWith("AspectJTransactionManagementConfiguration.class] cannot be opened because it does not exist"));
+			assertTrue(ex.getMessage().contains("AspectJTransactionManagementConfiguration"));
 		}
 	}